cable 0.9.14 → 0.9.15

data/VERSION

@@ -1 +1 @@
-0.9.14
+0.9.15

data/lib/generators/cable/install_generator.rb

@@ -45,7 +45,7 @@ module Cable
             if yes?("Would you like to install simple navigation?".color(:yellow) ) 
               generate("navigation_config")
               copy_file 'config/admin_navigation.rb', 'config/admin_navigation.rb'
-                # copy_file 'config/navigation.rb', 'config/navigation.rb'
+              copy_file 'config/navigation.rb', 'config/navigation.rb'
             end
           end
         end

data/public/javascripts/cable_menu.js

@@ -1,7 +1,8 @@
 (function($){
   
   var xhr;
-  
+  var parent_id;
+
   var sortable_options = {
     items: "li:not(#add-menu)",
     connectWith: '.cable_menu_wrapper ul',
@@ -73,7 +74,6 @@
         });
       });
     });
-    
   }
   
   function hide_add_menu(item){
@@ -144,16 +144,14 @@
   function select_item(item,wrapper){
     $item = $(item);
     $id = $(item).attr("menu");
+	parent_id = $id;
     $wrapper = $(wrapper);
     $child = $("ul[menu="+$id+"]");
 
     if($child.children().size() > 0){
       $child.css({ left: $item.parent().position().left + $item.parent().width()+3+$(".cable_menu_wrapper").scrollLeft(), top: 0}).show();      
     }else{
-      $("<ul class='cable_menu empty' menu="+$id+"/>").css({ left: $item.parent().position().left + $item.parent().width()+3+$(".cable_menu_wrapper").scrollLeft(), top: 0}).sortable(sortable_options).appendTo($wrapper).mouseenter(function() {
-        show_add_menu(this);
-       }).mouseleave(function(){
-        hide_add_menu(this);       
+      $("<ul class='cable_menu empty' menu="+$id+"/>").css({ left: $item.parent().position().left + $item.parent().width()+3+$(".cable_menu_wrapper").scrollLeft(), top: 0}).sortable(sortable_options).appendTo($wrapper).mouseenter(function() {   
        });;
     }
     
@@ -305,7 +303,7 @@
   $.fn.cable_menu = function(options){
     var $tree = $(this);
     var $wrapper = $("<div class='cable_menu_wrapper'></div>").insertAfter($tree);
-    
+
     build_menu($tree, $wrapper, 0);
     
     $wrapper.find("li span.menu-title").click(function(){
@@ -320,16 +318,55 @@
     $tree.remove();    
     
     $wrapper.find("ul").sortable(sortable_options);
-    $wrapper.find("ul").mouseenter(function() {
-      show_add_menu(this);
-     }).mouseleave(function(){
-      hide_add_menu(this);       
-     });
+    
     var $current_selection = $("<div id='selection'><strong>Current Selection:</strong><p>&nbsp;</p></div>").insertBefore($wrapper);
+    var $add1 = $("<div id='add-menu-tree1' class='actions'><a>Add Menu</a></div>").insertBefore($current_selection);
+    var $save1 = $("<div id='save-tree1' class='actions'><a>Save Tree</a></div>").insertBefore($current_selection);
+
     var $save = $("<div id='save-tree' class='actions'><a>Save Tree</a></div>").insertAfter($wrapper);
+    var $add = $("<div id='add-menu-tree' class='actions'><a>Add Menu</a></div>").insertAfter($wrapper);
+
     var $form = $("<div id='add-menu-form' />").insertAfter($save);
     var $menu_details = $("<div id='menu-details' />").insertAfter($save);
-    $save.click(function(){save_tree();});    
+
+    $save.click(function(){save_tree();}); 
+    $save1.click(function(){save_tree();}); 
+
+    $add.click(function(){
+      $("#add-menu-form").html("<img src='/images/cable/loader.gif' />");
+      $("#add-menu-form").load("/admin/menus/new?parent_id="+parent_id, function(){
+        $(this).dialog({
+          modal: true,
+          width: 600,
+      resizable: false,
+          title: "New Menu",
+      draggable: false
+        });
+      });
+    }); 
+
+	$add1.click(function(){
+      $("#add-menu-form").html("<img src='/images/cable/loader.gif' />");
+      
+      var get_string;
+      
+      if (parent_id > 0){
+        get_string = "?parent_id="+parent_id;
+      } else {
+        get_string = "?parent_id=0";
+      }
+      
+      $("#add-menu-form").load("/admin/menus/new"+get_string, function(){
+        $(this).dialog({
+          modal: true,
+          width: 600,
+      resizable: false,
+          title: "New Menu",
+      draggable: false
+        });
+      });
+    });
+   
     $("<hr />").insertAfter($wrapper);
 
   }

data/public/javascripts/jquery.ui.autocomplete.html.js

@@ -31,7 +31,7 @@ $.extend( proto, {
 
 	_renderItem: function( ul, item) {
 	    console.log( "autocomplete running")
-		return $( "<li></li>" )
+		return $( "<li></li>" ).addClass(item.type)
 			.data( "item.autocomplete", item )
 			.append( $( "<a></a>" )[ this.options.html ? "html" : "text" ]( item.label + "<span class='search_type'>" + item.type +"</span>") )
 			.appendTo( ul );

data/public/stylesheets/cable/menu.css

@@ -1,5 +1,20 @@
 /* @override http://localhost:3000/stylesheets/cable/menu.css */
 
+#selection {
+  margin-top:10px;
+}
+
+#add-menu-tree1 {
+  float:left;
+  margin-right:10px;
+}
+ 
+
+#add-menu-tree {
+  float:left; 
+  margin-right:10px;
+}
+
 .cable_menu_wrapper {
 	position: relative;
 	height: 360px;

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cable
 version: !ruby/object:Gem::Version 
+  hash: 37
   prerelease: 
-  version: 0.9.14
+  segments: 
+  - 0
+  - 9
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Spencer Markowski
@@ -12,119 +17,153 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -04:00
+date: 2011-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-  type: :runtime
-  prerelease: false
+  name: rails
   version_requirements: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: orm_adapter
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: orm_adapter
   version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: awesome_nested_set
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: awesome_nested_set
   version_requirements: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: formtastic
   version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: simple-navigation
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: simple-navigation
   version_requirements: *id005
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: jquery-rails
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: jquery-rails
   version_requirements: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: rainbow
+  type: :runtime
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: rainbow
   version_requirements: *id007
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: kaminari
+  type: :runtime
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: kaminari
   version_requirements: *id008
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: cocoon
+  type: :runtime
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-  type: :runtime
-  prerelease: false
+  name: cocoon
   version_requirements: *id009
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  name: schemata
+  type: :runtime
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
-  type: :runtime
-  prerelease: false
+  name: schemata
   version_requirements: *id010
+  prerelease: false
 description: 
 email: 
 executables: []
@@ -561,12 +600,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []