cable 0.9.1 → 0.9.3

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.3

data/app/controllers/admin_controller.rb

@@ -1,4 +1,5 @@
 class AdminController < Cable::CableAdminController
+  layout proc{ |c| c.request.xhr? ? false : "admin" }  
   def index
   end
   

data/app/helpers/admin/menus_helper.rb

@@ -21,4 +21,22 @@ module Admin::MenusHelper
     end
     ret += "</ul>"
   end
+  
+  def display_tree_plain(tree, parent_id)
+    unless tree.count <= 0
+    ret = "<ul>"
+    tree.each do |node|
+      if node.parent_id == parent_id
+        ret += "<li id='#{dom_id(node)}'>"
+        ret += "#{node.title}"
+        unless node.children.count <= 0
+          ret += display_tree_plain(node.children, node.id)
+        end
+        ret += "</li>"
+      end
+    end
+    ret += "</ul>"
+    end
+  end
+  
 end

data/app/views/admin/_admin_user_login.html.erb

@@ -1,5 +1,7 @@
 <div class="user-session">
-  <% if admin_user_signed_in? %>  
-    Signed in as: <%= current_admin_user.email %> <%= link_to "Sign out", destroy_admin_user_session_path, :class => 'button'%>
+  <% if  respond_to?( :admin_user_signed_in?) %>
+      <% if admin_user_signed_in? %>  
+        Signed in as: <%= current_admin_user.email %> <%= link_to "Sign out", destroy_admin_user_session_path, :class => 'button'%>
+      <% end %>
   <% end %>
 </div>

data/app/views/layouts/admin.html.erb

@@ -24,10 +24,25 @@
     </div>
     <div id="main-wrapper">
       <div class="container">
+        
+        
+        <% if @admin_layout == "single" %>
+          <div id="main" class="span-24">
+            <div class="box shadow">
+              <h2 id="title"><%= @page_title %></h2>
+              <div id="help"><%= yield :help %><a class="button">Help</a></div>
+              <%= render :partial => 'layouts/breadcrumb' %>
+              <%= yield :page_menu %>
+              <%= render :partial => 'layouts/messages' %>
+              <%= yield %>
+            </div>
+          </div>        
+        <% else %>
         <div id="right-col" class="span-4">
           <div id="secondary-navigation" class="box shadow"><%= render_navigation(:level => 2..5, :context => :admin) %></div>
           <%= yield :sidebar %>
         </div>
+        
         <div id="main" class="span-20 last">
           <div class="box shadow">
             <h2 id="title"><%= @page_title %></h2>
@@ -38,6 +53,7 @@
             <%= yield %>
           </div>
         </div>
+        <% end %>
       </div>
     </div>
     <div class="footer">

data/config/admin_navigation.rb

@@ -3,9 +3,6 @@ SimpleNavigation::Configuration.run do |navigation|
     admin.item :admin, "Home", '/admin'
     admin.item :admin, "Menu", "/admin/menus" do |menus|
       if Cable.class_exists? "Menu"
-        Menu.roots.each do |tree|
-          menus.item :edit, tree.title, "/admin/menus/show/#{tree.id}"
-        end
         menus.item :new, "New Menu Item", new_admin_menu_path
       end
     end

data/lib/generators/cable/install_generator.rb

@@ -17,24 +17,40 @@ module Cable
 
         def create_settings
           if options.settings?
-           migration_template 'lib/generators/templates/create_cable_settings.rb', "db/migrate/create_cable_settings.rb"
-           route( 'cable_to :cable_settings' ) if options.settings?
+            begin
+             migration_template 'lib/generators/templates/create_cable_settings.rb', "db/migrate/create_cable_settings.rb"
+             route( 'cable_to :cable_settings' )
+            rescue
+
+            end
          end
         end
         
         def create_blocks
           if options.blocks?
-            migration_template 'lib/generators/templates/create_blocks.rb', 'db/migrate/create_blocks.rb'
-            copy_file 'lib/generators/templates/block.rb', 'app/models/block.rb'
-            copy_file 'lib/generators/templates/partials/_block.html.erb', 'app/views/admin/partials/_block.html.erb'
-            copy_file 'lib/generators/templates/partials/_block_form.html.erb', 'app/views/admin/partials/_block_form.html.erb'
+            begin
+              migration_template 'lib/generators/templates/create_blocks.rb', 'db/migrate/create_blocks.rb'
+            rescue
+              copy_file 'lib/generators/templates/block.rb', 'app/models/block.rb'
+              copy_file 'lib/generators/templates/partials/_block.html.erb', 'app/views/admin/partials/_block.html.erb'
+              copy_file 'lib/generators/templates/partials/_block_form.html.erb', 'app/views/admin/partials/_block_form.html.erb'
+            end
           end
         end
         
         def copy_simple_nav
           if options.simple_nav?
-            copy_file 'config/admin_navigation.rb', 'config/admin_navigation.rb'
-            copy_file 'config/navigation.rb', 'config/navigation.rb'
+            if yes?("Would you like to install simple navigation?") 
+              generate("navigation_config")
+              copy_file 'config/admin_navigation.rb', 'config/admin_navigation.rb'
+                # copy_file 'config/navigation.rb', 'config/navigation.rb'
+            end
+          end
+        end
+        
+        def install_jquery
+          if yes?("Would you like to install jquery?")
+            generate("jquery:install --ui")
           end
         end
         

data/lib/generators/cable/menu/menu_generator.rb

@@ -18,28 +18,30 @@ module Cable
         
         def create_migration_file
           if options.migration?
-           migration_template 'migration.rb', "db/migrate/create_#{model_name.pluralize}.rb"
+           migration_template 'migration.rb', "db/migrate/create_#{model_name.pluralize}.rb" if yes?("Would you like to generate a migration?")
          end
         end
         
         def create_model_file
           if options.model?
-           template 'model.rb' , "app/models/#{model_name}.rb"
+           template 'model.rb' , "app/models/#{model_name}.rb" if yes?("Would you like to generate a model?")
          end
         end
         
         def create_controller_file
           if options.controller?
-            template 'controller.rb', "app/controllers/admin/#{model_name.pluralize}_controller.rb"
+            template 'controller.rb', "app/controllers/admin/#{model_name.pluralize}_controller.rb" if yes?("Would you like to generate a controller?")
           end
         end
         
         def create_views
           if options.views?
-            Dir.glob(File.expand_path("../templates", __FILE__) + '/erb/menus/*.erb') do |rb_file|
-              template rb_file, "app/views/admin/#{plural_table_name}/#{File.basename(rb_file)}"
+            if yes?( "Would you like Cable to generate menu views?")
+              Dir.glob(File.expand_path("../templates", __FILE__) + '/erb/menus/*.erb') do |rb_file|
+                template rb_file, "app/views/admin/#{plural_table_name}/#{File.basename(rb_file)}"
+              end
+              copy_file 'erb/partials/_menu_fields.html.erb', 'app/views/admin/partials/_menu_fields.html.erb'
             end
-            copy_file 'erb/partials/_menu_fields.html.erb', 'app/views/admin/partials/_menu_fields.html.erb'
           end
         end
         
@@ -48,15 +50,11 @@ module Cable
           route_string = <<EOF
 cable_to :#{plural_table_name} do |menu|
   collection do
-    get :rebuild
-    get :table
     post :sort
-    post :move
-    post :remove_resource
   end
 end
 EOF
-          route( route_string )
+          route( route_string ) if yes?("Would you like to generate routes?")
         
         end
         

data/lib/generators/cable/menu/templates/controller.rb

@@ -1,8 +1,10 @@
 class Admin::<%= class_name %>sController < AdminController
+  respond_to :html, :xml, :json  
   # GET /pages
   # GET /pages.xml
   def index
     @<%= plural_table_name %> = <%= class_name %>.roots
+    Menu.rebuild!
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @<%= plural_table_name %> }
@@ -19,7 +21,6 @@ class Admin::<%= class_name %>sController < AdminController
       format.html # show.html.erb
       format.xml  { render :xml => @<%= singular_table_name %> }
       format.js { render :partial => "admin/menus/parents" } 
-
     end
   end
 
@@ -28,6 +29,10 @@ class Admin::<%= class_name %>sController < AdminController
   def new
     @resources = Cable.available_resources
     @<%= singular_table_name %> = <%= class_name %>.new
+    if params[:parent_id] && params[:parent_id] != "0"
+      @parent = Menu.find(params[:parent_id])
+      @<%= singular_table_name %>.parent_id = @parent.id
+    end
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @<%= singular_table_name %> }
@@ -40,11 +45,6 @@ class Admin::<%= class_name %>sController < AdminController
     @resources = Cable.available_resources
   end
   
-  def move
-    @<%= singular_table_name %> = <%= class_name %>.where(:id => params[:id]).first
-    @<%= plural_table_name %> = <%= class_name %>.roots
-  end
-  
   # POST /pages
   # POST /pages.xml
   def create
@@ -94,17 +94,35 @@ class Admin::<%= class_name %>sController < AdminController
     end
   end
   
-
-  def table
-    @<%= plural_table_name %> = <%= class_name %>.all
+  def sort
+    new_list = params[:ul]
+    previous = nil
+    new_list.each_with_index do |array, index|
+      moved_item_id = array[1][:id].split(/menu_/)
+      @current_menu = Menu.find_by_id(moved_item_id)
+      unless previous.nil?
+        @previous_item = Menu.find_by_id(previous)
+        @current_menu.move_to_right_of(@previous_item)
+      else
+        @current_menu.move_to_root
+      end
+      unless array[1][:children].blank?
+        parse_children(array[1], @current_menu)
+      end
+      previous = moved_item_id
+    end
+    Menu.rebuild!
+    render :nothing => true
   end
   
-  def sort
-    @first = <%= class_name %>.find(params[:menu].first)
-    @<%= singular_table_name %>  = <%= class_name %>.find(@first.parent.id)
-    @<%= singular_table_name %>.reorder_children(params[:menu])
-    render :update do |page|
-      page << "$('#status').html();"
+  def parse_children(mynode, menu)
+    for child in mynode[:children]
+      child_id = child[1][:id].split(/menu_/)
+      child_menu = Menu.find_by_id(child_id)
+      child_menu.move_to_child_of(menu)
+      unless child[1][:children].blank?
+        parse_children(child[1], child_menu)
+      end
     end
   end
   

data/lib/generators/cable/menu/templates/erb/menus/_menu.html.erb

@@ -1,7 +1,7 @@
 <%%= semantic_form_for [:admin, @<%= singular_table_name %>] do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
-      <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this menu from being saved:</h2>
+      <h3><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this menu from being saved:</h3>
       <ul>
         <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
           <li><%%= msg %></li>
@@ -9,13 +9,14 @@
       </ul>
     </div>
   <%% end %>
-  <%%= f.inputs do %> 
+  <%%= f.inputs "Menu Properties" do %> 
     <%%= f.input :title, :label => "Menu Title", :hint => "This will be used in the menu itself" %>
     <%%= f.input :meta_description, :label => "Meta Description", :hint => "Meta Description rendered in the head of the document" %>
     <%%= f.input :meta_keywords, :label => "Meta Keywords", :hint => "Enter Keywords with a comma separating each key" %>    
     <%%= f.input :url, :label => "URL", :as => :string, :hint => "URL for this menu item, Example: /categories/canopies" %>
-    <%%= f.input :parent_id, :as => :select, :collection => nested_set_options(<%= singular_table_name.classify %>) {|i| "#{'-' * i.level} #{i.title}" unless i.level > 1 }.to_a.reject{|i| i[0].nil?}, :hint => "You can move this later" %>            
     <%%= f.input :show_in_menu, :as => :boolean, :wrapper_html => { :class => "yes_no" }, :hint => "You can hide the menu item by unchecking this box." %>
+  <%% end %>
+  <%%= f.inputs "Template and Resource" do %>
     <%% unless Cable.special_actions.empty? %>
         <%%= f.input :special_action, :label => "Special Action", :as => :select, :collection => Cable.special_actions, :hint => "(Optional)" %>
     <%% end %>
@@ -25,7 +26,7 @@
     <%% unless @resources.nil? %>
         <%%= f.input :cable_menuable_id, :label => "Resource", :as => :select, :include_blank => true, :collection => @resources %>
     <%% end %>
-
-<%% end %>
+  <%% end %>
+  
   <%%= f.buttons %>
-<%% end %>
+<%% end %>

data/lib/generators/cable/menu/templates/erb/menus/index.html.erb

@@ -1,28 +1,17 @@
 <%% content_for :scripts do %>
-  <script>
-    $(document).ready(function(){
-      $(".sortable").sortable({
-        cursor:     'move',
-        axis:       'y',
-        update: function(e, ui) {
-          sorted = $(this).sortable("serialize");
-          $.ajax({
-            type:   'POST',
-            url:    "/admin/<%= plural_table_name %>/sort",
-            data:   sorted
-          });
-        }
-      });
-      $(".check-all").click(function(){
-        $("input").each(function(){
-          $(this).attr('checked', !$(this).attr('checked'));
-        });
-      });
+  <%%= javascript_include_tag 'cable_menu.js' %>
+  <script type="text/javascript" charset="utf-8">
+    $(document).ready(function(){  
+      $('#menu').cable_menu();
     });
   </script>
 <%% end %>
 
-<%% @<%= plural_table_name %>.each do |menu| %>
-  <h3><%%= link_to menu.title, [:admin, menu] %></h3>
-  <%%= render :partial => 'menu_vitals', :locals => {:menu => menu} %>
-<%% end %>
+<ul id="menu">
+  <%% @<%= plural_table_name %>.each do |m| -%>
+    <li title="<%%= m.title %>" id="<%%= dom_id(m) %>">
+      <%%= m.title %>
+      <%% if m.descendants %><%%= raw display_tree_plain(m.children, m.id) %><%% end %>
+    </li> 
+  <%% end %>
+</ul>

data/lib/generators/cable/menu/templates/erb/menus/show.html.erb

@@ -1,16 +1,22 @@
-<%% if @<%= singular_table_name %>.ancestors.empty? %>
-  <div><%%= link_to "Site Root", [:admin, :menus] %> &gt;</div>
-<%% else %>
-  <div><%%= link_to "Site Root", [:admin, :menus] %> &gt;
-    <%% for parent in @<%= singular_table_name %>.ancestors %>  
-      <%%= link_to h(parent.title), [:admin, parent] %> &gt;
-    <%% end %>
-    <%%= @<%= singular_table_name %>.title %>  
-  </div>
-<%% end %>
-
-<h3><%%= @<%= singular_table_name %>.title %></h3>
-
-<%%= render :partial => 'menu_vitals', :locals => {:menu => @<%= singular_table_name %> } %>
-<%%= render :partial => 'menu_children_table' %>
+<table>
+  <thead>
+    <tr><th colspan=3>"<%%= @<%= singular_table_name %>.title %>" Properties</th></tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th>URL:</th>
+      <td><%%= link_to "#{@<%= singular_table_name %>.url}", @<%= singular_table_name %>.url, :target => "_blank" %> <%%= link_to image_tag('/images/cable/new-window.png'), @<%= singular_table_name %>.url, :target => "_blank" %> </td>
 
+    </tr>
+    <%% unless @<%= singular_table_name %>.resource.nil? %>
+      <tr>
+        <th class="label">Links to:</th>
+        <td><%%= @<%= singular_table_name %>.cable_<%= singular_table_name %>able_type %> | <%%= link_to @<%= singular_table_name %>.resource.title, [:admin, @<%= singular_table_name %>.resource] %></td>
+      </tr>
+    <%% end %>
+  </tbody>
+</table>
+<div class="actions">
+  <%%= link_to "Edit", edit_admin_menu_path(@<%= singular_table_name %>) %>
+  <%%= link_to "Destroy", [:admin, @<%= singular_table_name %>], :confirm => 'Are you sure? This could be a really bad idea!', :method => :delete %>
+</div>

data/lib/generators/cable/resource/resource_generator.rb

@@ -22,31 +22,33 @@ module Cable
         class_option :orm,        :type => :string,  :default => "active_record"
  
         def create_migration_file
-           migration_template 'migration.rb', "db/migrate/create_#{table_name}.rb" if options.migration?
+           migration_template 'migration.rb', "db/migrate/create_#{table_name}.rb" if options.migration? and yes?("Would you like to generate a migration?")
         end       
         
         def create_model_file
-           template 'model.rb' , "app/models/#{model_name}.rb" if options.model?
+           template 'model.rb' , "app/models/#{model_name}.rb" if options.model? and yes?("Would you like to generate a model?")
         end
         
         def create_controller_file
           if options.controller?
-            template 'controller.rb' , "app/controllers/admin/#{file_name.pluralize}_controller.rb" 
+            template 'controller.rb' , "app/controllers/admin/#{file_name.pluralize}_controller.rb" if yes?("Would you like to generate a controller?")
           end
         end
         
         def create_scaffold
           if options.views?
-            template 'erb/scaffold/_form.html.erb', "app/views/admin/#{plural_table_name}/_#{singular_table_name}.html.erb"
-            template 'erb/scaffold/index.html.erb', "app/views/admin/#{plural_table_name}/index.html.erb"
-            template 'erb/scaffold/edit.html.erb', "app/views/admin/#{plural_table_name}/edit.html.erb"
-            template 'erb/scaffold/new.html.erb', "app/views/admin/#{plural_table_name}/new.html.erb"
-            template 'erb/scaffold/show.html.erb', "app/views/admin/#{plural_table_name}/show.html.erb"
+            if yes?("Would you like Cable to generate views for #{model_name.capitalize}?")
+              template 'erb/scaffold/_form.html.erb', "app/views/admin/#{plural_table_name}/_#{singular_table_name}.html.erb"
+              template 'erb/scaffold/index.html.erb', "app/views/admin/#{plural_table_name}/index.html.erb"
+              template 'erb/scaffold/edit.html.erb', "app/views/admin/#{plural_table_name}/edit.html.erb"
+              template 'erb/scaffold/new.html.erb', "app/views/admin/#{plural_table_name}/new.html.erb"
+              template 'erb/scaffold/show.html.erb', "app/views/admin/#{plural_table_name}/show.html.erb"
+            end
           end
         end
         
         def install_route
-          route("cable_to :#{plural_table_name}") if options.routes?
+          route("cable_to :#{plural_table_name}") if options.routes? and yes?("Would you like to generate routes for #{model_name.capitalize}?")
         end
         
         def self.next_migration_number(dirname)

data/public/javascripts/cable_menu.js

@@ -48,8 +48,6 @@
     $('.cable_menu_wrapper > ul').removeAttr("id");
     
     var the_menu = $('.cable_menu_wrapper > ul').serialize_list();
-    $(".cable_menu_wrapper").removeClass();
-        
     $.post("/admin/menus/sort", the_menu);
   }
   
@@ -57,22 +55,21 @@
     $("#add-menu").remove();
     
     var $add = $("<li id='add-menu'>Add Menu Item</li>").appendTo($(item));
-    // $add.css({"position":"absolute","bottom":"-40px"});
-    // $item.css({"padding-bottom":"40px","height":"300px"});
-    
+
     $add.click(function(){
       var id = $(item).attr("menu");
       $("#add-menu-form").html("<img src='/images/cable/loader.gif' />");
-      $("#add-menu-form").load("/admin/menus/new?parent_id="+id, function(){
-        $("#save-tree").hide();
-        $("#menu-details").hide();
-        $("<li class='commit'><input class='cancel' id='menu_cancel' name='cancel' type='button' value='Cancel' /></li>").insertBefore("ol li.commit").click(function(){
-          $("#add-menu-form").html("");
-          $("#save-tree").show();
+      $("#add-menu-form").load("/admin/menus/new", function(){
+        $(this).dialog({
+          modal: true,
+          width: 600,
+      resizable: false,
+          title: "New Menu",
+      draggable: false
         });
-        
       });
-    })
+    });
+    
   }
   
   function hide_add_menu(item){
@@ -170,22 +167,36 @@
     last_width = $wrapper.attr("scrollWidth");
     $wrapper.stop();
     $wrapper.animate({ 'scrollLeft': $wrapper.attr("scrollWidth") }, 2000);
-    $("#add-menu-form").html("");
-    $("#save-tree").show();
-    $("#menu-details").html("<img src='/images/cable/loader.gif' />").show();
     
+    update_breadcrumb();
+  }
+  
+  function zoom_item(item,wrapper){
+    $item = $(item);
+    $id = $(item).attr("menu");
+    $wrapper = $(wrapper);
+        
     if(xhr != undefined) {
       xhr.abort(); 
     } 
     xhr = $.ajax({
       url: "/admin/menus/"+$item.attr("menu"),
       success: function(data) {
-        $("#menu-details").html(data);
+        $("#menu-details").html(data).dialog(
+          {
+            modal: true, 
+            width: 600,
+            height: 250,
+            resizable: false,
+            draggable: false,
+            resizable: false,
+            title: "Displaying menu properties"
+          }
+        );
       }
     });
-    update_breadcrumb();
   }
-  
+
   function deselect(item) {
     var $item = $(item);
     $item.removeClass('selected');
@@ -218,16 +229,18 @@
       var $cloned_li = $(this).clone();
       if($cloned_li.children().size() > 0){ 
         $cloned_li.addClass("has-children");
+        var $id = $cloned_li.attr("id").replace("menu_","");        
         $cloned_li.children().each(function(){
-          var $id = $cloned_li.attr("id").replace("menu_","");
           build_menu(this,$wrapper,$id);
         });
       }
+      $cloned_li.find("ul").remove();
+      $cloned_li.html("<span class='menu-zoom'></span> <span class='menu-title'>"+$cloned_li.text()+"</span>");
       $cloned_li.appendTo($new_menu);
       $cloned_li.attr("menu",$cloned_li.attr("id").replace("menu_",""));      
       $cloned_li.removeAttr("id");
 
-      $cloned_li.find("ul").remove();
+
     });
   }
 
@@ -291,10 +304,14 @@
     
     build_menu($tree, $wrapper, 0);
     
-    $wrapper.find("li").click(function(){
-      select_item(this, $wrapper);
+    $wrapper.find("li span.menu-title").click(function(){
+      select_item($(this).parent(), $wrapper);
     });
     
+     $wrapper.find("li span.menu-zoom").click(function(){
+        zoom_item($(this).parent(), $wrapper);
+      });
+    
     update_tree($wrapper);
     $tree.remove();    
     

data/public/stylesheets/cable/base.css

@@ -21,5 +21,4 @@ a:hover{
 	 -moz-box-shadow: 0px 2px 2px #ccc;
   -webkit-box-shadow: 0px 2px 2px #ccc;
           box-shadow: 0px 2px 2px #ccc;
-}
-
+}

data/public/stylesheets/cable/buttons.css

@@ -4,14 +4,13 @@
 .previous_page,
 .formtastic input.button,
 .formtastic input[type=button],
-.formtastic input[type=file],
 .formtastic input[type=submit],
 .actions a,
-.user-session a{
+.user-session a,
+form.formtastic input, form.formtastic textarea, form.formtastic select {
   display:inline-block;
   font-size: 14px;
   color: #ffffff;
-  padding: 4px 8px;
   background: #777;
   background: -moz-linear-gradient(top,#aaa 0%,#777);
   background: -webkit-gradient(linear, left top, left bottom,from(#aaa),to(#777));
@@ -22,6 +21,11 @@
   -moz-box-shadow:    0px 1px 2px rgba(000,000,000,0.5), inset 0px 0px 1px rgba(255,255,255,1);
   -webkit-box-shadow: 0px 1px 2px rgba(000,000,000,0.5), inset 0px 0px 1px rgba(255,255,255,1);
   text-shadow: 0px -1px 0px rgba(000,000,000,0.4), 0px 1px 0px rgba(255,255,255,0.3);
+	padding: 4px 6px;
+}
+.formtastic input[type=file]{
+	background: white;
+	color: black;
 }
 .user-session a{
   margin-left:12px;
@@ -41,7 +45,6 @@
   cursor:pointer;
 }
 .formtastic input[type=button]:hover,
-.formtastic input[type=file]:hover,
 .formtastic input[type=submit]:hover{
   background:#333;
   text-decoration:none;

data/public/stylesheets/cable/formtastic_changes.css

@@ -4,36 +4,45 @@ form.formtastic legend {
   white-space:normal;
   color:#333; 
   font-weight: normal;
+  margin-bottom: 1em;
+  display: block;
 }
+form.formtastic fieldset.buttons,
 form.formtastic fieldset.inputs { 
 background: #f9f9f9;
 margin-bottom: 1em;
 padding: 1em;
 }
-form.formtastic fieldset.buttons { 
-	padding-left:15%; 
+form.formtastic fieldset.buttons{
+	padding-left: 100px;
+	margin-bottom: 0;
 }
 form.formtastic fieldset.buttons li { 
 	float:left; 
-	padding-right:0.5em; 
+	padding-right:0.5em;
+
 }
 form.formtastic fieldset > ol > li label { 
   display:block; 
-  width: 15%; 
+  width: 90px; 
   float:left; 
   padding-top:.2em; 
   font-weight: bold;
   color: #222;
+	margin-right: 10px;
+}
+form.formtastic fieldset > ol > li.boolean label { 
+	padding-left:100px; 
+	width:auto; 
 }
-
-
 form.formtastic fieldset > ol > li p.inline-hints { 
 	color:#000; 
-	margin:0.5em 0 0 15%; 
-	padding: 10px;
+	margin: 0.5em 0 0 100px;
 	border-radius:          4px;
     -moz-border-radius:     4px;
     -webkit-border-radius:  4px;
+    clear: both;
+	padding: .25em 10px .25em 0;
 }
 
 
@@ -43,9 +52,12 @@ form.formtastic fieldset > ol > li.password input,
 form.formtastic fieldset > ol > li.numeric input,
 form.formtastic fieldset > ol > li.url input{
 	padding: .5em;
-	font-size: 16px;
-	min-width: 40%;
+	font-size: 14px;
+	min-width: 60%;
 	 -moz-box-shadow: 0px 0px 4px #ccc inset;
   -webkit-box-shadow: 0px 0px 4px #ccc inset;
           box-shadow: 0px 0px 4px #ccc inset;
-}
+}
+form.formtastic fieldset > ol > li { margin-bottom: .5em; 	border-bottom: 1px dotted #00; }
+form.formtastic input, form.formtastic textarea, form.formtastic select { font-size:100%;
+max-width: 300px;}

data/public/stylesheets/cable/menu.css

@@ -21,7 +21,6 @@ ul.cable_menu ul {
 	margin: 0;
 	width: 170px;
 	background:#fff;	
-	border-left:1px solid #eee;
 }
 .cable_menu_wrapper li.has-children {
 	width: 129px;
@@ -38,14 +37,32 @@ ul.cable_menu ul {
 	list-style: none;
 	display: block;
 	overflow: hidden;
-	text-overflow: ellipsis;
 	background-color: white;
 	-webkit-border-radius: 3px;
 	margin-bottom: 3px;
 }
+.cable_menu_wrapper li span.menu-zoom{
+  display:inline-block;
+  width:12px;
+  height:12px;
+  margin-top:2px;
+	background: url(/images/cable/search.png) no-repeat right center;
+	visibility:hidden;
+	padding-right:6px;
+}
+.cable_menu_wrapper li:hover span.menu-zoom{
+  visibility:visible;
+}
+.cable_menu_wrapper li span.menu-title{
+  text-overflow: ellipsis;
+  width:110px;
+  overflow:hidden;
+  display:inline-block;
+}
+
 .cable_menu_wrapper li.selected.last,
 .cable_menu_wrapper li.selected.last.has-children{
-	background-color: #2494fc;
+  background-color: #2494fc;
 	color: white;
 }
 .cable_menu_wrapper .selected {
@@ -112,9 +129,6 @@ ul.cable_menu ul {
 ul.cable_menu.empty{
   background:url(/images/cable/empty-menu.png);
 }
-#add-menu-form{
-  margin-top:1em;
-}
 #save-tree{
   margin-bottom:1em;
 }

data/public/stylesheets/cable/regions.css

@@ -1,6 +1,5 @@
 /* @override http://localhost:3000/stylesheets/cable/regions.css */
 
-
 /* @group Headers */
 
 #header{ 
@@ -123,14 +122,17 @@
 	padding-top: 1em;
 }
 #main .box{
-	min-height: 400px;
-	-webkit-border-radius: 4px;	
 }
-#main h2{
+h2{
 	font-size: 1.5em;
 	display: block;
 	float: left;
 }
+h3{
+	font-size: 1.25em;
+	display: block;
+	
+}
 #help{
 	float: right;
 }

data/public/stylesheets/cable/tables.css

@@ -1,30 +1,39 @@
 /* @override http://localhost:3000/stylesheets/cable/tables.css */
 table{
 	border-bottom: 2px solid #ccc;
+	margin-bottom: 1em;
 }
 thead th{
 	background: #eee;
 	border-bottom: 2px solid #ccc;	
-	font-weight:normal;
-	font-size:1.25em;
+	font-weight:bold;
+	font-size:1em;
 }
+tbody th{
+	background: #eee;
+	border-right: 2px solid #ccc;	
+	font-weight:bold;
+	font-size:1em;
+}
+
 
 table td{
-	border-bottom: 1px dashed #ccc;
 	border-right: 1px dashed #ccc;		
 }
 
 tbody tr:nth-child(even) td, 
 tbody tr.even td {
-	background:#eee;
+	background: #eee;
+}
+tbody tr:last td{
+	border-bottom:none;
 }
-
 th.actions,
 td.actions{
 	text-align: right;
 }
 td.actions{
-  padding-right:0px;
+	padding: 5px;
 }
 tbody tr td:first-child{
   border-left: none;

data/public/stylesheets/jquery/ui/jquery-ui-1.8.7.custom.css

@@ -1,3 +1,5 @@
+/* @override http://localhost:3000/stylesheets/jquery/ui/jquery-ui-1.8.7.custom.css */
+
 /*
  * jQuery UI CSS Framework 1.8.7
  *
@@ -60,7 +62,6 @@
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Helvetica,Arial,sans-serif; font-size: 1em; }
 .ui-widget-content { border: 1px solid #B6B6B6; background: #ffffff; color: #4F4F4F; }
-.ui-widget-content a { color: #4F4F4F; }
 .ui-widget-header { border: 1px solid #B6B6B6; color: #4F4F4F; font-weight: bold; }
 .ui-widget-header {
 	background: url(images/bg_fallback.png) 0 0 repeat-x;
@@ -553,7 +554,9 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; background: url(images/icon_sprite.png) 0 -16px no-repeat; }
 .ui-dialog .ui-dialog-titlebar-close:hover span { background-position: -16px -16px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; border: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; background: none; overflow: auto; zoom: 1;
+	padding: .5em;
+}
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
 .ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }

metadata

@@ -2,7 +2,7 @@
 name: cable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors: 
 - Spencer Markowski
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -04:00
+date: 2011-03-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,39 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: formtastic
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: simple-navigation
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: jquery-rails
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
 description: 
 email: 
 executables: []
@@ -112,18 +145,10 @@ files:
 - lib/generators/cable/menu/menu_generator.rb
 - lib/generators/cable/menu/templates/controller.rb
 - lib/generators/cable/menu/templates/erb/menus/_menu.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_menu_children_table.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_menu_tree.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_menu_vitals.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_resource.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_resource_fields.html.erb
-- lib/generators/cable/menu/templates/erb/menus/_tree.html.erb
 - lib/generators/cable/menu/templates/erb/menus/edit.html.erb
 - lib/generators/cable/menu/templates/erb/menus/index.html.erb
-- lib/generators/cable/menu/templates/erb/menus/move.html.erb
 - lib/generators/cable/menu/templates/erb/menus/new.html.erb
 - lib/generators/cable/menu/templates/erb/menus/show.html.erb
-- lib/generators/cable/menu/templates/erb/menus/table.html.erb
 - lib/generators/cable/menu/templates/erb/partials/_menu_fields.html.erb
 - lib/generators/cable/menu/templates/migration.rb
 - lib/generators/cable/menu/templates/model.rb
@@ -156,8 +181,9 @@ files:
 - public/images/cable/loader.gif
 - public/images/cable/new-window.png
 - public/images/cable/nil-icon.png
-- public/images/cable/page-icon.png
+- public/images/cable/page.png
 - public/images/cable/product-icon.jpg
+- public/images/cable/search.png
 - public/images/cable/story-icon.jpg
 - public/javascripts/admin.js
 - public/javascripts/cable_menu.js

data/lib/generators/cable/menu/templates/erb/menus/_menu_children_table.html.erb

@@ -1,60 +0,0 @@
-<%% content_for :scripts do %>
-  <script>
-    $(document).ready(function(){
-      $(".sortable").sortable({
-        cursor:     'move',
-        axis:       'y',
-        update: function(e, ui) {
-          sorted = $(this).sortable("serialize");
-          $.ajax({
-            type:   'POST',
-            url:    "/admin/menus/sort",
-            data:   sorted
-          });
-        }
-      });
-      $(".check-all").click(function(){
-        $("input").each(function(){
-          $(this).attr('checked', !$(this).attr('checked'));
-        });
-      });
-    });
-  </script>
-<%% end %>
-
-
-<%% unless @<%= singular_table_name %>.children.blank? %>
-  <%%= semantic_form_for :index, :url => {:controller => "menus", :action => "bulk" } do |f| %>
-    <table id="<%%= dom_id(@<%= singular_table_name %>) %>">
-      <thead>
-        <tr>
-          <th><a class="check-all">All</a></th>
-          <th>Title</th>
-          <th>Children</th>
-          <th>Resource Type</th>
-          <th class="actions">Actions</th>
-        </tr>
-      </thead>
-      <tbody class="sortable">
-        <%% @<%= singular_table_name %>.children.each do |menu| %>
-          <tr id="<%%= dom_id(menu)%>">
-            <td class="edit"><%%= check_box_tag 'menus[]', menu.id %></td>
-            <td class="title"><%%= link_to menu.title, [:admin, menu] %>
-              <%% unless menu.show_in_menu %> <span style="color:red;">[Hidden]</span> <%% end %>
-            </td>
-            <td class="children">
-              <%%= menu.children.count %>
-            </td>
-            <td class="class"><%%= menu.resource.class unless menu.resource.class == NilClass %></td>
-            <td class="actions"><%%= link_to "Show", [:admin,menu], :class => "button small" %> <%%= link_to 'Edit', edit_admin_menu_path(menu), :class=>"button small" %> <%%= link_to 'Destroy', [:admin, menu], :confirm => 'Are you sure?', :method => :delete, :class=>"button small" %></td>
-          </tr>
-        <%% end %>
-      </tbody>
-    </table>
-    <%%= f.inputs :name => "Bulk Operations" do %>
-      <%%= f.commit_button "Delete Selected" %>
-      <%%= f.input :parent_id, :as => :select, :collection => nested_set_options(Menu) {|i| "#{'-' * i.level} #{i.title}" unless i.level > 1 }.to_a.reject{|i| i[0].nil?} %>
-      <%%= f.commit_button "Move Selected" %>
-    <%% end %>
-  <%% end %>
-<%% end %>

data/lib/generators/cable/menu/templates/erb/menus/_menu_tree.html.erb

@@ -1,10 +0,0 @@
-<%% content_for :sidebar do%>
-  <ul id="menu-tree">
-    <%% @<%= singular_table_name %>s.each do |menu| %>
-    <li>
-      <%%= link_to menu.title, [:admin, menu] %>
-      <%%= raw display_tree_plain(menu.children, menu.id) %>
-    </li>
-    <%% end %>
-  </ul>
-<%% end %>

data/lib/generators/cable/menu/templates/erb/menus/_menu_vitals.html.erb

@@ -1,30 +0,0 @@
-
-<div class="content box">
-  <table>
-    <thead>
-      <tr><th colspan=3>Menu Properies</th></tr>
-    </thead>
-    <tbody>
-      <tr><td class="label">URL:     </td><td><%%= "#{menu.url}" %></td><td class="actions"><%%= link_to "Open in New Window", menu.url, :target => "_blank" %></td></tr>
-      <%% unless menu.children.empty? %>
-      <tr><td class="label">Children: </td><td colspan=2><%%= raw menu.children.collect{|i| link_to i.title, [:admin, i]}.join(", ") %></td></tr>
-      <%% end %>
-      <%% unless menu.root? %>
-        <tr><td class="label">Root:</td><td><%%= link_to menu.root.title, [:admin, menu.root] %></td></tr>
-      <%% end %>
-      <%% unless menu.resource.nil? %>
-      <tr><td class="label">Links to:</td><td><%%= menu.cable_menuable_type %> | <%%= link_to menu.resource.title, [:admin, menu.resource] %></td></tr>
-      <%% end %>
-      <tr>
-        <td colspan=3 class="actions">
-          <%%= link_to "Show", [:admin,menu], :class => "button small" %>            
-          <%%= link_to "Edit Menu Properties", edit_admin_menu_path(menu), :class => "button small" %>
-          <%%= link_to "Move", move_admin_menus_path(menu), :class => "button small" %>      
-          <%%# if menu.is_deletable? %>  
-            <%%= link_to "Destroy", [:admin, menu], :confirm => 'Are you sure? This will also remove associated category image!', :method => :delete, :class => "button small" %>
-          <%%# end %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</div>

data/lib/generators/cable/menu/templates/erb/menus/_resource.html.erb

@@ -1,29 +0,0 @@
-<%% content_for :scripts do %>
-<script>
-$(function(){
-  $("#menu_cable_menuable_type").change(function(){
-    $.ajax({ url: "<%%= resources_admin_menus_path %>/"+$(this).val()});
-  });
-});
-</script>
-<%% end %>
-<%%= semantic_form_for [:admin, @<%= singular_table_name %>] do |f| %>
-  <%%= f.inputs :name => "Add a resource to this menu" do %>
-    <%%= f.input :cable_menuable_type, :label => "Content Model", :as => :select, :collection => ['Page'] %>
-    <%%= f.input :cable_menuable_id, :label => "Resource", :as => :select, :collection => @resources.collect{|r| ["#{r.site.name} - #{r.title}",r.id]} %>
-  <%% end %>
-
-
-  <%% f.buttons do %>
-    <%% unless @<%= singular_table_name %>.resource.nil? %>
-      <%%= f.commit_button "Update Resource" %>
-      <li class="commit"><%%= link_to "Remove this Resource", remove_resource_admin_menus_path(@<%= singular_table_name %>), :class => "button" %></li>
-    <%% else %>
-      <%%= f.commit_button "Add Resource" %>    
-    <%% end %>
-  <%% end %>
-  
-
-<%% end %>
-
-

data/lib/generators/cable/menu/templates/erb/menus/_resource_fields.html.erb

@@ -1,10 +0,0 @@
-<fieldset>
-  <li class="select optional" id="menu_cable_menuable_type_input">
-    <label>Resource</label>
-    <select id="menu_cable_menuable_id"  name="menu[cable_menuable_id]" MULTIPLE SIZE=10>
-      <%% @resources.each do |resource| %>
-        <option value="<%%= resource.id %>"> <%%= "#{resource.site.name} - #{resource.title}" %></option>
-      <%% end %>
-    </select>
-  </li>
-</fieldset>

data/lib/generators/cable/menu/templates/erb/menus/_tree.html.erb

@@ -1,16 +0,0 @@
-<%% content_tag :li, :id => dom_id(menu) do %>
-    <div>
-      <%%= check_box_tag 'menus[]', menu.id %>      
-      <span class="handle"><%%= menu.title %></span>
-      <%% unless menu.show_in_menu %> <span style="color:red;">[Hidden]</span> <%% end %>
-        <%%= menu.children.count %>
-        <%%= link_to "Show", [:admin,menu], :class => "button small" %> <%%= link_to 'Edit', edit_admin_menu_path(menu), :class=>"button small" %>
-        <%%= link_to 'Destroy', [:admin, menu], :confirm => 'Are you sure?', :method => :delete, :class=>"button small" %>
-    </div>
-    
-    <%% content_tag :ul do %>
-        <%% for child in menu.children do %>
-            <%%= render :partial => "admin/menus/tree", :locals => {:menu => child }%>
-        <%% end %>
-    <%% end unless menu.leaf? %>
-<%% end %>

data/lib/generators/cable/menu/templates/erb/menus/move.html.erb

@@ -1,25 +0,0 @@
-<h2>Move Menu</h2>
-<div id="parent">Select a parent</div><br />
-<%%= semantic_form_for [:admin, @<%= singular_table_name %>] do |f| %>
-  <%%= f.inputs do %>
-    <%%= f.input :parent_id, :as => :hidden %>
-    <%%= f.input :id, :as => :hidden %>
-      <li class="select optional" id="menu_parent_id_input">
-        <div style="width:100px;">
-          <ul id="menu-tree-list">
-            <li>Site Root <%%= image_tag "/images/arrow-head.png" %>
-              <ul>
-                <%% @<%= plural_table_name %>.each do |m| -%>
-                  <li id="<%%= dom_id(m) %>" title="<%%= m.title %>"><%%= m.title %><%% if m.descendants %><%%= raw display_tree_plain(m.children, m.id) %><%% end %></li> 
-                <%% end %>
-              </ul>
-            </li>
-          </ul>
-        </div>      
-      </li>
-    
-  <%% end %>
-  
-  <%%= f.buttons %>
-  
-<%% end %>

data/lib/generators/cable/menu/templates/erb/menus/table.html.erb

@@ -1,9 +0,0 @@
-<table>
-  <%% @<%= singular_table_name %>s.each do |m|%>
-    <tr>
-      <td><%%= m.menu_identifier %></td>
-      <td><%%= link_to m.name, [:admin, m] %></td>
-      <td><%%= m.url %></td>
-    </tr>
-  <%% end %>
-</table>