cable 0.9.10 → 0.9.11

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/app/controllers/admin_controller.rb

@@ -1,8 +1,10 @@
 class AdminController < Cable::CableAdminController
   layout proc{ |c| c.request.xhr? ? false : "admin" }  
+  
   def index
   end
   
   protected
+
     # Add protected methods here
 end

data/app/controllers/cable/cable_admin_controller.rb

@@ -1,7 +1,7 @@
 module Cable
   class CableAdminController < ApplicationController
     unloadable
-  
+
     protected
       # Add protected methods here
   end

data/app/helpers/admin_helper.rb

@@ -4,4 +4,8 @@ module AdminHelper
       content_for( :admin_login ){ render 'admin/admin_user_login' }
   end
   
+  def single_column?
+    !content_for?(:sidebar) and !content_for?(:admin_sub_navigation)
+  end
+  
 end

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

@@ -24,40 +24,14 @@
     </div>
     <div id="main-wrapper">
       <div class="container">
+          <% content_for :admin_sub_navigation do %>
+              <%= render_navigation(:level => 2..5, :context => :admin) %>
+          <% end %>
         
-        
-        <% if @admin_layout == "single" %>
-          <div class="prepend-15">
-             <%= render :partial => "layouts/search" %>
-            </div>
-          <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>
-              <%= yield :page_menu %>
-              <%= render :partial => 'layouts/messages' %>
-              <%= yield %>
-            </div>
-          </div>        
+        <% if single_column? %>
+          <%= render :partial => "layouts/admin/single_column_layout" %>
         <% 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 class='span-11'><%= render :partial => 'layouts/breadcrumb' %></div>
-        <%= render :partial => "layouts/search" %>
-
-        <div id="main" class="span-20 last">
-          <div class="box shadow">
-            
-            <h2 id="title"><%= @page_title %></h2>
-            <div id="help"><%= yield :help %><a class="button">Help</a></div>
-            <%= yield :page_menu %>
-            <%= render :partial => 'layouts/messages' %>
-            <%= yield %>
-          </div>
-        </div>
+          <%= render :partial => "layouts/admin/dual_column_layout" %>
         <% end %>
       </div>
     </div>

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

@@ -0,0 +1,18 @@
+<div id="right-col" class="span-4">
+  <div id="secondary-navigation" class="box shadow"><%= yield :admin_sub_navigation %></div>
+  <%= yield :sidebar %>
+</div>
+
+<div class='span-11'><%= render :partial => 'layouts/breadcrumb' %></div>
+<%= render :partial => "layouts/search" %>
+
+<div id="main" class="span-20 last">
+  <div class="box shadow">
+    
+    <h2 id="title"><%= @page_title %></h2>
+    <div id="help"><%= yield :help %><a class="button">Help</a></div>
+    <%= yield :page_menu %>
+    <%= render :partial => 'layouts/messages' %>
+    <%= yield %>
+  </div>
+</div>

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

@@ -0,0 +1,12 @@
+<div class="prepend-15">
+ <%= render :partial => "layouts/search" %>
+</div>
+<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>
+      <%= yield :page_menu %>
+      <%= render :partial => 'layouts/messages' %>
+      <%= yield %>
+    </div>
+</div>

data/lib/generators/cable/install_generator.rb

@@ -62,6 +62,7 @@ module Cable
         
         def install_admin
           copy_file "app/views/layouts/admin.html.erb", 'app/views/layouts/admin.html.erb'
+          directory 'app/views/layouts/admin', 'app/views/layouts/admin'
           directory "public/stylesheets/tinymce", "public/stylesheets/tinymce"
         end
         
@@ -78,9 +79,9 @@ module Cable
           puts ""
           puts "Run rake db:migrate to complete setup.".color(:yellow)
           puts ""
-          puts "To begin using Cable Menu and Pages use:"
+          puts "To begin using Cable Menu and Resources use:".color(:green)
           puts "rails generate cable:menu MENU_NAME"
-          puts "rails generate cable:resource PAGE_NAME field:type field:type ..."
+          puts "rails generate cable:resource RESOURCE_NAME field:type field:type ..."
           puts ""
         end
         

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

@@ -3,11 +3,12 @@ class Admin::<%= class_name %>sController < AdminController
   # GET /pages
   # GET /pages.xml
   def index
-    @<%= plural_table_name %> = <%= class_name %>.roots
-    Menu.rebuild!
+    @<%= singular_table_name %>s = <%= class_name %>.roots
+    @admin_layout = "single"    
+    <%= class_name %>.rebuild!
     respond_to do |format|
       format.html # index.html.erb
-      format.xml  { render :xml => @<%= plural_table_name %> }
+      format.xml  { render :xml => @<%= singular_table_name %>s }
     end
   end
 
@@ -15,22 +16,24 @@ class Admin::<%= class_name %>sController < AdminController
   # GET /pages/1.xml
   def show
     @<%= singular_table_name %> = <%= class_name %>.where( :id => params[:id]).first
-    @<%= plural_table_name %> = Menu.roots
+    @<%= singular_table_name %>s = <%= class_name %>.roots
     
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @<%= singular_table_name %> }
-      format.js { render :partial => "admin/menus/parents" } 
+      format.js { render :partial => "admin/<%= singular_table_name %>s/parents" } 
     end
   end
 
   # GET /pages/new
   # GET /pages/new.xml
   def new
-    @resources = Cable.available_resources
+    @resource_types = Cable.resource_types.collect{|resource| ["#{resource.name}","#{resource.name.pluralize}"]}
+    @resources = @resource_types.first[0].classify.constantize.find(:all).sort{|x,y| x.title <=> y.title}
+    
     @<%= singular_table_name %> = <%= class_name %>.new
     if params[:parent_id] && params[:parent_id] != "0"
-      @parent = Menu.find(params[:parent_id])
+      @parent = <%= class_name %>.find(params[:parent_id])
       @<%= singular_table_name %>.parent_id = @parent.id
     end
     respond_to do |format|
@@ -41,15 +44,16 @@ class Admin::<%= class_name %>sController < AdminController
 
   # GET /pages/1/edit
   def edit
-    @<%= singular_table_name %> = <%= class_name %>.includes(:cable_menuable).where( :id => params[:id]).first
-    @resources = Cable.available_resources
+    @<%= singular_table_name %> = <%= class_name %>.includes(:cable_<%= singular_table_name %>able).where( :id => params[:id]).first
+    @resource_types = Cable.resource_types.collect{|resource| ["#{resource.name}","#{resource.name.pluralize}"]}
+    @resources = @<%= singular_table_name %>.cable_<%= singular_table_name %>able_type.classify.constantize.find(:all).sort{|x,y| x.title <=> y.title}
   end
   
   # POST /pages
   # POST /pages.xml
   def create
     
-    @<%= singular_table_name %> = <%= class_name %>.new(params[:menu])
+    @<%= singular_table_name %> = <%= class_name %>.new(params[:<%= singular_table_name %>])
 
     respond_to do |format|
       if @<%= singular_table_name %>.save
@@ -66,12 +70,12 @@ class Admin::<%= class_name %>sController < AdminController
   # PUT /pages/1
   # PUT /pages/1.xml
   def update
-    @<%= singular_table_name %> = <%= class_name %>.includes(:cable_menuable).where( :id => params[:id]).first
+    @<%= singular_table_name %> = <%= class_name %>.includes(:cable_<%= singular_table_name %>able).where( :id => params[:id]).first
     
-    params[:menu][:tree_id] = <%= class_name %>.find(params[:menu][:parent_id]).tree_id unless params[:menu][:parent_id].blank?
+    params[:<%= singular_table_name %>][:tree_id] = <%= class_name %>.find(params[:<%= singular_table_name %>][:parent_id]).tree_id unless params[:<%= singular_table_name %>][:parent_id].blank?
     
       respond_to do |format|
-      if @<%= singular_table_name %>.update_attributes(params[:menu])
+      if @<%= singular_table_name %>.update_attributes(params[:<%= singular_table_name %>])
         <%= class_name %>.rebuild!
         format.html { redirect_to([:admin, @<%= singular_table_name %>], :notice => '<%= class_name %> was successfully updated.') }
         format.xml  { head :ok }
@@ -89,7 +93,7 @@ class Admin::<%= class_name %>sController < AdminController
     @<%= singular_table_name %>.destroy
     
     respond_to do |format|
-      format.html { redirect_to(admin_menus_url) }
+      format.html { redirect_to(admin_<%= singular_table_name %>s_url) }
       format.xml  { head :ok }
     end
   end
@@ -98,39 +102,39 @@ class Admin::<%= class_name %>sController < AdminController
     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)
+      moved_item_id = array[1][:id].split(/<%= singular_table_name %>_/)
+      @current_<%= singular_table_name %> = <%= class_name %>.find_by_id(moved_item_id)
       unless previous.nil?
-        @previous_item = Menu.find_by_id(previous)
-        @current_menu.move_to_right_of(@previous_item)
+        @previous_item = <%= class_name %>.find_by_id(previous)
+        @current_<%= singular_table_name %>.move_to_right_of(@previous_item)
       else
-        @current_menu.move_to_root
+        @current_<%= singular_table_name %>.move_to_root
       end
       unless array[1][:children].blank?
-        parse_children(array[1], @current_menu)
+        parse_children(array[1], @current_<%= singular_table_name %>)
       end
       previous = moved_item_id
     end
-    Menu.rebuild!
+    <%= class_name %>.rebuild!
     render :nothing => true
   end
   
-  def parse_children(mynode, menu)
+  def parse_children(mynode, <%= singular_table_name %>)
     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)
+      child_id = child[1][:id].split(/<%= singular_table_name %>_/)
+      child_<%= singular_table_name %> = <%= class_name %>.find_by_id(child_id)
+      child_<%= singular_table_name %>.move_to_child_of(<%= singular_table_name %>)
       unless child[1][:children].blank?
-        parse_children(child[1], child_menu)
+        parse_children(child[1], child_<%= singular_table_name %>)
       end
     end
   end
   
   def resources
     resource_type = params[:resource]
-    @resources = "#{resource_type}".classify.constantize.find(:all)
-    render :update do |page|
-      page << "$('#menu_cable_menuable_id_input').html('#{escape_javascript(render(:partial => 'admin/menus/resource_fields'))}')"
+    @resources = "#{resource_type}".classify.constantize.find(:all).sort{|x,y| x.title <=> y.title}
+    respond_to do |format|
+      format.js
     end
   end
-end
+end

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

@@ -1,7 +1,35 @@
+<%%= javascript_include_tag 'jquery.quicksearch.js' %>
+<script>
+  $(document).ready(function(){
+    $(".tabs").tabs();
+    $("#types li").click(function(){
+      $("#types .selected").removeClass();
+      resource_type = $(this).attr("id").replace("type_", "");
+      $(this).addClass("selected");
+      update_resources(resource_type);
+    });
+  });
+  function update_fields(id,type){
+    $("#<%= singular_table_name %>_cable_menuable_type").val(type);
+    $("#<%= singular_table_name %>_cable_menuable_id").val(id);
+  }
+  function update_resources(resource_type){
+    $.ajax({
+      type: 'POST',
+      url: "/admin/<%= singular_table_name %>s/resources",
+      data: {resource : resource_type},
+      success: function(){
+        console.log("Done");
+      }
+    });    
+  }
+</script>
+
 <%%= semantic_form_for [:admin, @<%= singular_table_name %>] do |f| %>
+  
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
-      <h3><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this menu from being saved:</h3>
+      <h3><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h3>
       <ul>
         <%% @<%= singular_table_name %>.errors.full_messages.each do |msg| %>
           <li><%%= msg %></li>
@@ -9,24 +37,67 @@
       </ul>
     </div>
   <%% end %>
-  <%%= 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 :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 %>
-    <%% unless Cable.templates.empty? %>
-        <%%= f.input :template, :as => :select, :collection => Cable.templates, :selected => f.object.template || "default", :hint => "Which page template should be used?"%>
-    <%% end %>
-    <%% unless @resources.nil? %>
-        <%%= f.input :cable_menuable_id, :label => "Resource", :as => :select, :include_blank => true, :collection => @resources %>
-    <%% end %>
-  <%% end %>
   
+  <div class="tabs">
+    <ul>
+      <li><a href="#tabs-1">Menu Properties</a></li>
+      <li><a href="#tabs-2">Template and Special Actions</a></li>
+      <li><a href="#tabs-3">Resource</a></li>
+  	</ul>
+  	<div id="tabs-1">
+      <%%= f.inputs do %> 
+        <%%= f.input :title, :label => "Menu Title", :hint => "This will be used in the <%= singular_table_name %> 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 <%= singular_table_name %> item, Example: /categories/canopies" %>
+        <%%= f.input :show_in_<%= singular_table_name %>, :as => :boolean, :wrapper_html => { :class => "yes_no" }, :hint => "You can hide the <%= singular_table_name %> item by unchecking this box." %>
+      <%% end %>
+    </div>
+    <div id="tabs-2">
+      <%%= f.inputs do %>
+        <%% unless Cable.special_actions.empty? %>
+          <%%= f.input :special_action, :label => "Special Action", :as => :select, :collection => Cable.special_actions, :hint => "(Optional)" %>
+        <%% end %>
+        <%% unless Cable.templates.empty? %>
+          <%%= f.input :template, :as => :select, :collection => Cable.templates, :selected => f.object.template || "default", :hint => "Which page template should be used?"%>
+        <%% end %>
+      <%% end %>
+    </div>
+    <div id="tabs-3">
+      <%%= f.inputs do %>
+        <%%= f.input :cable_menuable_type, :as => :hidden %>
+        <%%= f.input :cable_menuable_id, :as => :hidden %>    
+        <li><div id="selected-resource"><%%= @<%= singular_table_name %>.cable_menuable_type %> &raquo; <%%= @<%= singular_table_name %>.resource.title unless @<%= singular_table_name %>.resource.nil? %></div></li>
+        <li>
+          <table id="resources">
+            <thead>
+              <tr>
+                <th>Type</th>
+                <th>Resources <input type="text" name="search" value="" id="search_resources" placeholder="Search" /> </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td id="types">
+                  <ul>
+                    <%% @resource_types.each do |type| %> 
+                      <li id="type_<%%= type[0] %>"><%%= type[1] %></li>
+                    <%% end %>
+                  </ul>
+                </td>
+                <td id="resources-data">
+                  <div>
+                    <%%= render(:partial => "admin/<%= singular_table_name %>s/resources", :locals => {:resources => @resources})%>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </li>
+      <%% end %>
+    </div>
+  </div>
+
   <%%= f.buttons %>
+  
 <%% end %>

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

@@ -0,0 +1,21 @@
+<table id="resources-table">
+  <tbody>
+  <%% @resources.each do |resource| %>
+    <tr>
+      <td menu_id="<%%= resource.id %>" resource_type="<%%= resource.class.name %>" class="resource"><%%= resource.title %></td>
+      <td><%%= link_to image_tag("cable/search.png"), [:admin, resource], :target => "_blank" %></td>
+    </tr>
+  <%% end %>
+  </tbody>
+</table>
+<script> 
+  $('input#search_resources').quicksearch('#resources-data tr');
+  $("#resources-data td.resource").click(function(){
+    $("#resources-data .selected").removeClass();
+    $("#selected-resource").html($(this).attr("resource_type")+" &raquo; "+$(this).text());
+    $(this).parent().addClass("selected");
+    menu_id = $(this).attr("menu_id");
+    resource_type = $(this).attr("resource_type");
+    update_fields(menu_id, resource_type);
+  });
+</script>

data/lib/generators/cable/menu/templates/erb/menus/resources.js.erb

@@ -0,0 +1 @@
+$("#resources-data div").html('<%%= escape_javascript(render(:partial => "admin/menus/resources")) %>');

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

@@ -5,7 +5,7 @@
   <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>
+      <td><%%= link_to "#{@<%= singular_table_name %>.url}", @<%= singular_table_name %>.url %> <%%= link_to image_tag('/images/cable/new-window.png'), @<%= singular_table_name %>.url, :target => "_blank" %> </td>
 
     </tr>
     <%% unless @<%= singular_table_name %>.resource.nil? %>

data/lib/generators/cable/menu/templates/erb/menus/sort.js.erb

@@ -0,0 +1 @@
+location.reload(true);

data/public/javascripts/cable_menu.js

@@ -36,6 +36,7 @@
   };
   
   function save_tree(){
+    
     $(".cable_menu_wrapper li").each(function() {
       $li = $(this);      
       $ul = $("ul[menu="+$li.attr("menu")+"]");
@@ -48,7 +49,10 @@
     $('.cable_menu_wrapper > ul').removeAttr("id");
     
     var the_menu = $('.cable_menu_wrapper > ul').serialize_list();
-    $.post("/admin/menus/sort", the_menu);
+    $('.cable_menu_wrapper').html("Saving ...");
+    $.post("/admin/menus/sort", the_menu, function(){
+      location.reload(true);
+    });
   }
   
   function show_add_menu(item){

data/public/javascripts/jquery.quicksearch.js

@@ -0,0 +1,150 @@
+(function($, window, document, undefined) {
+	$.fn.quicksearch = function (target, opt) {
+		
+		var timeout, cache, rowcache, jq_results, val = '', e = this, options = $.extend({ 
+			delay: 100,
+			selector: null,
+			stripeRows: null,
+			loader: null,
+			noResults: '',
+			bind: 'keyup',
+			onBefore: function () { 
+				return;
+			},
+			onAfter: function () { 
+				return;
+			},
+			show: function () {
+				this.style.display = "";
+			},
+			hide: function () {
+				this.style.display = "none";
+			},
+			prepareQuery: function (val) {
+				return val.toLowerCase().split(' ');
+			},
+			testQuery: function (query, txt, _row) {
+				for (var i = 0; i < query.length; i += 1) {
+					if (txt.indexOf(query[i]) === -1) {
+						return false;
+					}
+				}
+				return true;
+			}
+		}, opt);
+		
+		this.go = function () {
+			
+			var i = 0, 
+			noresults = true, 
+			query = options.prepareQuery(val),
+			val_empty = (val.replace(' ', '').length === 0);
+			
+			for (var i = 0, len = rowcache.length; i < len; i++) {
+				if (val_empty || options.testQuery(query, cache[i], rowcache[i])) {
+					options.show.apply(rowcache[i]);
+					noresults = false;
+				} else {
+					options.hide.apply(rowcache[i]);
+				}
+			}
+			
+			if (noresults) {
+				this.results(false);
+			} else {
+				this.results(true);
+				this.stripe();
+			}
+			
+			this.loader(false);
+			options.onAfter();
+			
+			return this;
+		};
+		
+		this.stripe = function () {
+			
+			if (typeof options.stripeRows === "object" && options.stripeRows !== null)
+			{
+				var joined = options.stripeRows.join(' ');
+				var stripeRows_length = options.stripeRows.length;
+				
+				jq_results.not(':hidden').each(function (i) {
+					$(this).removeClass(joined).addClass(options.stripeRows[i % stripeRows_length]);
+				});
+			}
+			
+			return this;
+		};
+		
+		this.strip_html = function (input) {
+			var output = input.replace(new RegExp('<[^<]+\>', 'g'), "");
+			output = $.trim(output.toLowerCase());
+			return output;
+		};
+		
+		this.results = function (bool) {
+			if (typeof options.noResults === "string" && options.noResults !== "") {
+				if (bool) {
+					$(options.noResults).hide();
+				} else {
+					$(options.noResults).show();
+				}
+			}
+			return this;
+		};
+		
+		this.loader = function (bool) {
+			if (typeof options.loader === "string" && options.loader !== "") {
+				 (bool) ? $(options.loader).show() : $(options.loader).hide();
+			}
+			return this;
+		};
+		
+		this.cache = function () {
+			
+			jq_results = $(target);
+			
+			if (typeof options.noResults === "string" && options.noResults !== "") {
+				jq_results = jq_results.not(options.noResults);
+			}
+			
+			var t = (typeof options.selector === "string") ? jq_results.find(options.selector) : $(target).not(options.noResults);
+			cache = t.map(function () {
+				return e.strip_html(this.innerHTML);
+			});
+			
+			rowcache = jq_results.map(function () {
+				return this;
+			});
+			
+			return this.go();
+		};
+		
+		this.trigger = function () {
+			this.loader(true);
+			options.onBefore();
+			
+			window.clearTimeout(timeout);
+			timeout = window.setTimeout(function () {
+				e.go();
+			}, options.delay);
+			
+			return this;
+		};
+		
+		this.cache();
+		this.results(true);
+		this.stripe();
+		this.loader(false);
+		
+		return this.each(function () {
+			$(this).bind(options.bind, function () {
+				val = $(this).val();
+				e.trigger();
+			});
+		});
+		
+	};
+
+}(jQuery, this, document));

data/public/stylesheets/cable/formtastic_changes.css

@@ -13,4 +13,9 @@ form.formtastic fieldset > ol > li.search input {
 
 
 
-form.formtastic fieldset.buttons { padding-top:1em; }
+form.formtastic fieldset.buttons { padding-top:1em; }
+
+.inline-hints {
+	display: block;	
+	clear: both;
+}

data/public/stylesheets/cable/menu.css

@@ -26,12 +26,18 @@ ul.cable_menu ul {
 	width: 129px;
 	padding: 4px 20px 4px 4px;
 }
+#resources-table tr:hover,
+#types li:hover,
 .cable_menu_wrapper li:hover{
 	background-color: #f4f4f4;
 	cursor: pointer;
 }
-.cable_menu_wrapper li {
+.cable_menu_wrapper li{
 	width: 145px;
+}
+
+#types li,
+.cable_menu_wrapper li {
 	padding: 4px 4px 4px 4px;
 	white-space: nowrap;
 	list-style: none;
@@ -60,8 +66,10 @@ ul.cable_menu ul {
   display:inline-block;
 }
 
+#resources-table tr.selected td,
 .cable_menu_wrapper li.selected.last,
-.cable_menu_wrapper li.selected.last.has-children{
+.cable_menu_wrapper li.selected.last.has-children, 
+#types li.selected{
   background-color: #2494fc;
 	color: white;
 }
@@ -101,34 +109,53 @@ ul.cable_menu ul {
 #add-menu:hover{
   background-color:#ddd;
 }
-::-webkit-scrollbar {
-	height: 8px;
-	width: 8px;
+ul.cable_menu.empty{
+  background:url(/images/cable/empty-menu.png);
+}
+#save-tree{
+  margin-bottom:1em;
 }
 
-::-webkit-scrollbar-track-piece {
-	margin-bottom: 10px;
-	border-bottom-left-radius: 4px 4px;
-	border-bottom-right-radius: 4px 4px;
-	border-top-left-radius: 4px 4px;
-	border-top-right-radius: 4px 4px;
+#resources-data {
+	padding: 0;
 }
 
-::-webkit-scrollbar-thumb:vertical {
-	height: 25px;
-	background-color: #ccc;
-	-webkit-border-radius: 4px;
-	-webkit-box-shadow: 0 1px 1px rgba(255,255,255,1);
+
+
+
+
+
+
+
+#search_resources{
+	float: right;
+	display: block;
+	font-weight: normal;
 }
 
-::-webkit-scrollbar-thumb:horizontal {
-	width: 25px;
-	background-color: #ccc;
-	-webkit-border-radius: 4px;
+#selected-resource {
+	font-size: 1.25em;
+	font-weight: bold;
 }
-ul.cable_menu.empty{
-  background:url(/images/cable/empty-menu.png);
+#types {
+	vertical-align: top;
+	width: 200px;
+	padding: 0;
 }
-#save-tree{
-  margin-bottom:1em;
+
+#resources-table tbody .resource{
+	width: 300px;
+}
+
+#types li{
+	display: block;
+	font-size: 1.25em;
+	padding: .25em;
+	border: 1px solid white;
+}
+
+#resources-table tbody {
+	height:300px;
+	display: block;
+    overflow:auto;
 }

data/public/stylesheets/cable/regions.css

@@ -126,7 +126,7 @@
 h2{
 	font-size: 1.5em;
 	display: block;
-	float: left;
+/*  float: left;*/
 }
 h3{
 	font-size: 1.25em;
@@ -247,4 +247,6 @@ h3{
 	padding: 1em;
 }
 
+#right-col {margin-bottom:80px;}
+
 /* @end */

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: cable
 version: !ruby/object:Gem::Version 
-  hash: 47
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 10
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Spencer Markowski
@@ -17,137 +12,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-07 00:00:00 -04:00
+date: 2011-04-10 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rails
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
-  name: rails
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: orm_adapter
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: orm_adapter
-  version_requirements: *id002
+  type: :runtime
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: awesome_nested_set
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: awesome_nested_set
-  version_requirements: *id003
+  type: :runtime
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: formtastic
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: formtastic
-  version_requirements: *id004
+  type: :runtime
   prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: simple-navigation
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: simple-navigation
-  version_requirements: *id005
+  type: :runtime
   prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: jquery-rails
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: jquery-rails
-  version_requirements: *id006
+  type: :runtime
   prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: rainbow
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: rainbow
-  version_requirements: *id007
+  type: :runtime
   prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: kaminari
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: kaminari
-  version_requirements: *id008
+  type: :runtime
   prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: cocoon
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  name: cocoon
-  version_requirements: *id009
+  type: :runtime
   prerelease: false
+  version_requirements: *id009
 description: 
 email: 
 executables: []
@@ -185,6 +151,8 @@ files:
 - app/views/layouts/_messages.html.erb
 - app/views/layouts/_search.html.erb
 - app/views/layouts/admin.html.erb
+- app/views/layouts/admin/_dual_column_layout.html.erb
+- app/views/layouts/admin/_single_column_layout.html.erb
 - config/admin_navigation.rb
 - config/navigation.rb
 - config/routes.rb
@@ -218,10 +186,13 @@ 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/_resources.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/new.html.erb
+- lib/generators/cable/menu/templates/erb/menus/resources.js.erb
 - lib/generators/cable/menu/templates/erb/menus/show.html.erb
+- lib/generators/cable/menu/templates/erb/menus/sort.js.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
@@ -262,6 +233,7 @@ files:
 - public/images/cable/story-icon.jpg
 - public/javascripts/admin.js
 - public/javascripts/cable_menu.js
+- public/javascripts/jquery.quicksearch.js
 - public/javascripts/jquery.tablesorter.min.js
 - public/javascripts/jquery.tagsinput.js
 - public/javascripts/jquery.ui.autocomplete.html.js
@@ -577,18 +549,12 @@ 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: []