site_logic 1.8.0 → 1.9.0

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.9.0

data/app/views/admin/nav_items/_index.html.erb

@@ -1,5 +1,5 @@
 <%- if ! nav_items.blank? -%>
-<p>To reorder the navigation links, drag and drop the rows below using the drag icon on the right hand side of the table.</p>
+<p>To reorder a link, drag it using the drag icon on the far right.</p>
 
 <table class="standard">
   <thead>
@@ -21,7 +21,7 @@
       <td class="crud_links">
         <%= link_to image_tag('/images/icons/delete.png'), admin_site_nav_item_path(@site, nav_item), :method => :delete, :confirm => 'Are you sure? This action cannot be undone.' -%>
       </td>
-      <td style="width: 19px; cursor: move; " id="content_<%= nav_item.id -%>">
+      <td style="width: 19px; cursor: move">
         <img src="/images/icons/drag.png" alt="Move" width="19" height="19" class="move_icon" />
       </td>
     </tr>

data/app/views/admin/nav_items/_tabs.html.erb

@@ -0,0 +1,26 @@
+<%= tabset do -%>
+  <%= tab_tag(:id => 'primary_nav', :label => 'Main', :state => 'active') -%>
+  <%= tab_tag(:id => 'secondary_nav', :label => 'Secondary') -%>
+  <%= tab_tag(:id => 'footer_nav', :label => 'Footer') -%>
+<%- end -%>
+
+<%= tab_body :id => 'primary_nav', :label => 'Navigation', :help => SiteLogic.primary_nav.description, :display => 'block' do -%>
+  <%= render :partial => 'admin/nav_items/index', :locals => {:nav_items => @site.nav_items.primary.roots, :navitem_type => 'primary'} -%>
+  <div class="link_block">
+    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site), :class => 'link_button' -%>
+  </div>
+<%- end -%>
+
+<%= tab_body :id => 'secondary_nav', :label => 'Navigation', :help => SiteLogic.secondary_nav.description, :display => 'none' do -%>
+  <%= render :partial => 'admin/nav_items/index', :locals => {:nav_items => @site.nav_items.secondary.roots, :navitem_type => 'secondary'} -%>
+  <div class="link_block">
+    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site, :kind => 'Secondary'), :class => 'link_button' -%>
+  </div>
+<%- end -%>
+
+<%= tab_body :id => 'footer_nav', :label => 'Navigation', :help => SiteLogic.footer_nav.description, :display => 'none' do -%>
+  <%= render :partial => 'admin/nav_items/index', :locals => {:nav_items => @site.nav_items.footer.roots, :navitem_type => 'footer'} -%>
+  <div class="link_block">
+    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site, :kind => 'Footer'), :class => 'link_button' -%>
+  </div>
+<%- end -%>

data/app/views/admin/nav_items/index.html.erb

@@ -1,31 +1,3 @@
 <%- set_title 'Manage Navigation Links' -%>
 
-<%= tabset do -%>
-  <%= tab_tag(:id => 'primary_nav', :label => 'Main Navigation', :state => 'active') %>
-  <%= tab_tag(:id => 'secondary_nav', :label => 'Secondary Navigation') %>
-  <%= tab_tag(:id => 'footer_nav', :label => 'Footer Navigation') %>
-<%- end -%>
-
-<%= tab_body :id => 'primary_nav', :label => SiteLogic.primary_nav.label, :help => SiteLogic.primary_nav.description, :display => 'block' do -%>
-  <%= render :partial => 'index', :locals => {:nav_items => @site.nav_items.primary.roots, :navitem_type => 'primary'} -%>
-  <br style="clear: both;" />
-  <div class="link_block">
-    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site), :class => 'link_button' -%>
-  </div>
-<%- end -%>
-
-<%= tab_body :id => 'secondary_nav', :label => SiteLogic.secondary_nav.label, :help => SiteLogic.secondary_nav.description, :display => 'none' do -%>
-  <%= render :partial => 'index', :locals => {:nav_items => @site.nav_items.secondary.roots, :navitem_type => 'secondary'} -%>
-  <br style="clear: both;" />
-  <div class="link_block">
-    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site, :kind => 'Secondary'), :class => 'link_button' -%>
-  </div>
-<%- end -%>
-
-<%= tab_body :id => 'footer_nav', :label => SiteLogic.footer_nav.label, :help => SiteLogic.footer_nav.description, :display => 'none' do -%>
-  <%= render :partial => 'index', :locals => {:nav_items => @site.nav_items.footer.roots, :navitem_type => 'footer'} -%>
-  <br style="clear: both;" />
-  <div class="link_block">
-    <%= link_to 'New Navigation Link', new_admin_site_nav_item_path(@site, :kind => 'Footer'), :class => 'link_button' -%>
-  </div>
-<%- end -%>
+<%= render 'tabs' -%>

data/app/views/admin/sites/show.html.erb

@@ -22,8 +22,11 @@
       <%= link_to 'Back', admin_sites_path, :class => 'link_button' -%>
     <%- end -%>
   </div>
-</fieldset><br style="clear: both" />
+</fieldset><br />
 
-<h2>Pages</h2>
+<%= render 'admin/nav_items/tabs' -%><br style="clear: both" />
 
-<%= render :partial => 'admin/pages/index' -%>
+<fieldset class="form_container">
+  <%= legend_tag 'Pages' -%><br />
+  <%= render :partial => 'admin/pages/index' -%>
+</fieldset>

data/site_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "site_logic"
-  s.version = "1.8.0"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-09-23"
+  s.date = "2011-09-26"
   s.description = "An engine for search-engine-optimized content management."
   s.email = "corey@seologic.com"
   s.extra_rdoc_files = [
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "app/uploaders/image_uploader.rb",
     "app/views/admin/nav_items/_form.html.erb",
     "app/views/admin/nav_items/_index.html.erb",
+    "app/views/admin/nav_items/_tabs.html.erb",
     "app/views/admin/nav_items/edit.html.erb",
     "app/views/admin/nav_items/index.html.erb",
     "app/views/admin/nav_items/new.html.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: site_logic
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: 
   segments: 
   - 1
-  - 8
+  - 9
   - 0
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2011-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -231,6 +231,7 @@ files:
 - app/uploaders/image_uploader.rb
 - app/views/admin/nav_items/_form.html.erb
 - app/views/admin/nav_items/_index.html.erb
+- app/views/admin/nav_items/_tabs.html.erb
 - app/views/admin/nav_items/edit.html.erb
 - app/views/admin/nav_items/index.html.erb
 - app/views/admin/nav_items/new.html.erb