spree_core 0.30.2 → 0.40.0

data/public/javascripts/jsTree/themes/apple/style.css

@@ -1,34 +1,60 @@
-/* BACKGROUND */
-.tree-apple .ltr, .tree-apple .rtl { background:url("bg.jpg") left top repeat; min-width:100%; _width:100%; margin-left:0; margin-right:0; display:table; }
-.tree-apple .ltr > li.leaf, .tree-apple .rtl > li.leaf { background-image:none; }
-
-/* LOCKED */
-.tree-apple .locked li a { color:gray; }
-/* DOTS */
-.tree-apple ul { background-position:6px 1px; background-repeat:repeat-y; background-image:url(data:image/gif;base64,R0lGODlhAgACAIAAAB4dGf///yH5BAEAAAEALAAAAAACAAIAAAICRF4AOw==); _background-image:url("dot_for_ie.gif"); *background-image:url("dot_for_ie.gif"); }
-.tree-apple li { background-position:-64px -16px; background-repeat:no-repeat; background-image:url("icons.png"); }
-/* NO DOTS */
-.tree-apple .no_dots, .tree-apple .no_dots ul { background:transparent; }
-.tree-apple .no_dots li.leaf { background-image:none; background-color:transparent; }
-/* OPEN or CLOSED */
-.tree-apple li.open { background:url("icons.png") -32px -48px no-repeat; }
-.tree-apple li.closed, #jstree-dragged.tree-apple li li.open { background:url("icons.png") -48px -32px no-repeat; }
-#jstree-marker { background-image:url("icons.png"); }
-/* DEFAULT, HOVER, CLICKED, LOADING STATES */
-.tree-apple li a, .tree-apple li span { border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px; }
-.tree-apple li a:hover, .tree-apple li a.hover, .tree-apple li span { background: #e7f4f9; border:1px solid #d8f0fa; padding:0px 3px 0px 3px; }
-.tree-apple li a.clicked, .tree-apple li a.clicked:hover, .tree-apple li span.clicked { background: #beebff; border:1px solid #99defd; padding:0px 3px 0px 3px; }
-/* ICONS */
-.tree-apple ins { background-image:url("icons.png"); background-position:0 0; background-repeat:no-repeat; }
-.tree-apple ul li a.loading ins { background-image:url("throbber.gif") !important; background-position:0 0 !important; } /* UL is added to make selector stronger */
-.tree-apple li a ins.forbidden { background-position:-16px -16px; }
-.tree-apple .locked li a ins { background-position:0 -48px; }
-.tree-apple li span ins { background-position:-16px 0; }
-#jstree-dragged.tree-apple ins { background:url("icons.png") -16px -32px no-repeat; }
-#jstree-dragged.tree-apple ins.forbidden { background:url("icons.png") -16px -16px no-repeat; }
-
-/* CONTEXT MENU */
-.tree-apple-context a ins { background-image:url("icons.png"); background-repeat:no-repeat; background-position:-64px -64px; }
-.tree-apple-context a ins.create { background-position:0 -16px; }
-.tree-apple-context a ins.rename { background-position:-16px 0px; }
-.tree-apple-context a ins.remove { background-position:0 -32px; }
+/*
+ * jsTree apple theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-apple > ul { background:url("bg.jpg") left top repeat; }
+.jstree-apple li, 
+.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-apple li.jstree-last { background:transparent; }
+.jstree-apple .jstree-open > ins { background-position:-72px 0; }
+.jstree-apple .jstree-closed > ins { background-position:-54px 0; }
+.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
+.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
+.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
+.jstree-apple a .jstree-icon { background-position:-56px -20px; }
+.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-apple.jstree-focused { background:white; }
+
+.jstree-apple .jstree-no-dots li, 
+.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-apple .jstree-search { font-style:italic; }
+
+.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
+.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-apple ins { background:transparent !important; }
+#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; }
+
+.jstree-apple a.jstree-search { color:aqua; }
+
+#vakata-contextmenu.jstree-apple-context, 
+#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-apple-context li { }
+#vakata-contextmenu.jstree-apple-context a { color:black; }
+#vakata-contextmenu.jstree-apple-context a:hover, 
+#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
+#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
+
+/* TODO: IE6 support - the `>` selectors */

data/public/javascripts/taxonomy.js

@@ -1,191 +1,190 @@
 var base_url = "/admin/taxonomies/" + taxonomy_id + "/taxons/";
 var child_url = "/admin/taxonomies/" + taxonomy_id + "/get_children.json"
-var creating = false;
-var delete_confirmed = false;
+var is_cut = false;
 var last_rollback = null;
 
 var handle_ajax_error = function(XMLHttpRequest, textStatus, errorThrown){
-  jQuery.tree.rollback(last_rollback);
-
+  jQuery.jstree.rollback(last_rollback);
   jQuery("#ajax_error").show().html("<strong>" + server_error + "</strong><br/>" + taxonomy_tree_error);
 };
 
-var handle_move = function(li, target, droppped, tree, rb) {
-  last_rollback = rb;
-  var position = jQuery(li).prevAll().length;
-
-  var parent = -1;
-
-  if(droppped=='inside'){
-    parent = target;
-  }else if(droppped=='after'){
-    parent = jQuery(target).parents()[1];
-  }else if(droppped=='before'){
-    parent = jQuery(target).parents()[1];
-  }
+//var handle_move = function(li, target, droppped, tree, rb) {
+var handle_move = function(e, data) {
+  last_rollback = data.rlbk;
+  var position = data.rslt.cp;
+  var node = data.rslt.o;
+  var new_parent = data.rslt.np;
 
   jQuery.ajax({
     type: "POST",
-    url: base_url + li.id + ".json",
-    data: ({_method: "put", "taxon[parent_id]": parent.id, "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
+    url: base_url + node.attr("id") + ".json",
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
     error: handle_ajax_error
   });
 
   return true
 };
 
-var handle_dblclick = function(li, tree) {
-  tree.rename();
-};
-
-var handle_create = function(parent, sib, created, tree, rb){
-  last_rollback = rb;
-  creating=true;
-};
-
-var handle_created = function(id,result) {
-  jQuery.tree.reference('taxonomy_tree').selected.attr('id', id);
-}
-
-var handle_rename = function(li, tree, rb) {
-  var name = jQuery(li).children(":first").text();
-  name = jQuery.trim(name);
-
-  if (creating){
-    //actually creating new
-    var position = jQuery(li).prevAll().length;
-    var parent = jQuery(li).parents()[1];
-
-    jQuery.ajax({
-      type: "POST",
-      url: base_url,
-      data: ({"taxon[name]": name, "taxon[parent_id]": parent.id, "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
-      error: handle_ajax_error,
-      success: handle_created
-    });
-
-    creating = false;
-  }else{
-    //just renaming
-    last_rollback = rb;
-
-    jQuery.ajax({
-      type: "POST",
-      url: base_url + li.id + ".json",
-      data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}),
-      error: handle_ajax_error
-    });
-  }
-};
+var handle_create = function(e, data) {
+  last_rollback = data.rlbk;
+  var node = data.rslt.obj;
+  var name = data.rslt.name;
+  var position = data.rslt.position;
+  var new_parent = data.rslt.parent;
 
-var handle_before_delete = function(li){
-  if (!delete_confirmed){
-    jConfirm('Are you sure you want to delete this taxon?', 'Confirm Taxon Deletion', function(r) {
-      if(r){
-        delete_confirmed = true;
-        jQuery.tree.reference('taxonomy_tree').remove(li);
-      }
-    });
-  }
+  jQuery.ajax({
+    type: "POST",
+    url: base_url,
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position, authenticity_token: AUTH_TOKEN}),
+    error: handle_ajax_error,
+    success: function(id,result) {
+      node.attr('id', id);
+    }
+  });
 
-  return delete_confirmed;
 };
 
-var handle_delete = function(li, tree, rb){
-  last_rollback = rb;
+var handle_rename = function(e, data) {
+  last_rollback = data.rlbk;
+  var node = data.rslt.obj;
+  var name = data.rslt.new_name;
 
   jQuery.ajax({
     type: "POST",
-    url: base_url + li.id,
-    data: ({_method: "delete", authenticity_token: AUTH_TOKEN}),
+    url: base_url + node.attr("id") + ".json",
+    data: ({_method: "put", "taxon[name]": name, authenticity_token: AUTH_TOKEN}),
     error: handle_ajax_error
   });
+ };
+
+var handle_delete = function(e, data){
+  last_rollback = data.rlbk;
+  var node = data.rslt.obj;
+
+  jConfirm('Are you sure you want to delete this taxon?', 'Confirm Taxon Deletion', function(r) {
+    if(r){
+      jQuery.ajax({
+        type: "POST",
+        url: base_url + node.attr("id"),
+        data: ({_method: "delete", authenticity_token: AUTH_TOKEN}),
+        error: handle_ajax_error
+      });
+    }else{
+      jQuery.jstree.rollback(last_rollback);
+      last_rollback = null;
+    }
+  });
 
-  delete_confirmed = false;
 };
 
 jQuery(document).ready(function(){
-  conf = {
-    data : {
-      type : "json",
-      async : true,
-      opts : {
-        method : "GET",
-        url : child_url
-      }
-    },
-    ui : {
-      theme_name : "apple"
-    },
-    lang : {
-        new_node    : new_taxon,
-        loading     : loading + "..."
-      },
-    plugins : {
-      contextmenu : {
-        items : {
-          // get rid of the remove item
-          remove :{
-            visible : function (NODE, TREE_OBJ) { if(jQuery(NODE[0]).attr('rel')=="root") return false; return TREE_OBJ.check("renameable", NODE); },
-          },
-          rename :{
-            visible : function (NODE, TREE_OBJ) { if(jQuery(NODE[0]).attr('rel')=="root") return false; return TREE_OBJ.check("renameable", NODE); },
-          },
-          cut :{
-              id      : "cut",
-              label   : "Cut",
-              visible : function (NODE, TREE_OBJ) { if(NODE.length != 1 || NODE[0].id == 'root') return false; return true; },
-              action  : function (NODE, TREE_OBJ) { TREE_OBJ.cut(NODE); jQuery(NODE).hide(); },
-              separator_before : true
-          },
-          paste :{
-              id      : "paste",
-              label   : "Paste",
-              visible : function (NODE, TREE_OBJ) { if(NODE.length != 1 || NODE[0].id == 'root') return false; return true; },
-              action  : function (NODE, TREE_OBJ) { TREE_OBJ.open_branch(NODE); TREE_OBJ.paste(NODE, "inside"); jQuery(NODE).find("li").show(); }
-          },
-          edit :{
-              id      : "edit",
-              label   : "Edit",
-              visible : function (NODE, TREE_OBJ) { if(NODE.length != 1 || NODE[0].id == 'root') return false; return TREE_OBJ.check("renameable", NODE); },
-              action  : function (NODE, TREE_OBJ) { jQuery.each(NODE, function () { window.location = base_url + this.id + "/edit/"; }); }
-          }
-
+  var conf = {
+    json_data : {
+      "data" : initial,
+      "ajax" : {
+        "url" : child_url,
+        "data" : function (n) {
+          return { parent_id : n.attr ? n.attr("id") : 0 };
         }
       }
     },
-    rules : {
-      // only nodes of type root can be top level nodes
-      valid_children : [ "root" ]
+    "themes" : {
+      "theme" : "apple",
+      "url" : "/javascripts/jsTree/themes/apple/style.css"
+    },
+    "strings" : {
+      "new_node" : new_taxon,
+      "loading" : loading + "..."
     },
-    types : {
-      // all node types inherit the "default" node type
-      "taxon" : {},
-      "root" : {
-        deletable : false,
-        renameable : false,
-        draggable : false,
-        valid_children : [ "taxon" ]
+		"crrm" : {
+			"move" : {
+				"check_move" : function (m) {
+          var position = m.cp;
+          var node = m.o;
+          var new_parent = m.np;
+
+          if(!new_parent) return false; //no parent
+
+          if(node.attr("rel")=="root") return false; //can't drag root
+
+          if(new_parent.attr("id")=="taxonomy_tree" && position==0) return false; // can't drop before root
+
+          return true;
+
+				}
+			}
+		},
+    "contextmenu" : {
+       "items" : function(obj) {
+          var id_of_node = obj.attr("id");
+          var type_of_node = obj.attr("rel");
+          var menu = {};
+          if(type_of_node == "root") {
+            menu = {
+              "create" : {
+                "label"            : "Create",
+                "action"           : function (obj) { this.create(obj); }
+              },
+               "paste" : {
+                 "separator_before" : true,
+                 "label"            : "Paste",
+                 "action"           : function (obj) { is_cut = false; this.paste(obj); },
+                 "_disabled"        : is_cut == false
+              },
+              "edit" : {
+                "separator_before" : true,
+                "label"            : "Edit",
+                "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
+              }
+            }
+          } else {
+            menu =  {
+              "create" : {
+                "label"            : "Create",
+                "action"           : function (obj) { this.create(obj); }
+              },
+              "rename" : {
+                "label"            : "Rename",
+                "action"           : function (obj) { this.rename(obj); }
+              },
+              "remove" : {
+                "label"            : "Remove",
+                "action"           : function (obj) { this.remove(obj); }
+              },
+              "cut" : {
+                "separator_before" : true,
+                "label"            : "Cut",
+                "action"           : function (obj) { is_cut = true; this.cut(obj); }
+              },
+              "paste" : {
+                "label"            : "Paste",
+                "action"           : function (obj) { is_cut = false; this.paste(obj); },
+                "_disabled"        : is_cut == false
+              },
+              "edit" : {
+                "separator_before" : true,
+                "label"            : "Edit",
+                "action"           : function (obj) { window.location = base_url + obj.attr("id") + "/edit/"; }
+              }
+                  }
+          }
+          return menu;
       }
     },
-    callback : {
-      onmove: handle_move,
-      ondblclk: handle_dblclick,
-      onrename: handle_rename,
-      oncreate: handle_create,
-      beforedelete: handle_before_delete,
-      ondelete: handle_delete,
-      beforedata: function (n, t) {
-        if(n == false) t.settings.data.opts.static = initial;
-        else t.settings.data.opts.static = false;
-
-        return { parent_id : $(n).attr("id") || 0 };
-        }
 
-    }
+    "plugins" : [ "themes", "json_data", "dnd", "crrm", "contextmenu"]
   }
 
-  jQuery("#taxonomy_tree").tree(conf);
+  jQuery("#taxonomy_tree").jstree(conf)
+    .bind("move_node.jstree", handle_move)
+    .bind("remove.jstree", handle_delete)
+    .bind("create.jstree", handle_create)
+    .bind("rename.jstree", handle_rename);
+
+  jQuery("#taxonomy_tree").delegate("a", "dblclick", function (e) {
+   jQuery("#taxonomy_tree").jstree("rename", this)
+  });
+
 
   jQuery(document).keypress(function(e){
     //surpress form submit on enter/return
@@ -194,3 +193,5 @@ jQuery(document).ready(function(){
     }
   });
 });
+
+

data/public/stylesheets/admin/admin.css

@@ -577,37 +577,3 @@ table#product_scopes tr td table tr td {
 }
 
 
-span.handle{
-  background-image: url(../../images/reorder.jpg);
-  display: inline-block;
-  width:14px;
-  height:15px;
-}
-
-.alert {
-  -moz-border-radius: 5px;
-  -webkit-border-radius: 5px;
-  border-radius: 5px;
-  font-size: 1.3em;
-  margin-bottom: 1em;
-  padding: 0.8em;
-}
-.alert a.dismiss {
-  float:right;
-  font-size: 0.8em;
-}
-.alert.release {
-  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #556699;
-  border: 1px solid #99aacc;
-}
-.alert.security {
-  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #e75b5b;
-}
-.alert.news {
-  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
-  color: #000000;
-  border: 1px solid #66ff7e;
-}