site_logic 1.6.7 → 1.6.8

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 source 'http://jose.seologic.com:8808/'
 
 gem 'bson_ext'
-gem 'carrierwave'
+gem 'carrierwave', '< 0.5.7'
 gem 'ckeditor', :git => 'git://github.com/Bantik/rails-ckeditor.git', :branch => 'rails3_mongoid'
 gem 'mongoid', '>= 2.0.0.beta.17'
 gem 'mongoid-tree', :require => 'mongoid/tree'

data/VERSION

@@ -1 +1 @@
-1.6.7
+1.6.8

data/app/controllers/admin/pages_controller.rb

@@ -11,9 +11,10 @@ class Admin::PagesController < ApplicationController
       :window_title  => 'Title Tag',
       :page_title    => 'Page Header'
     }
-    params[:by] ||= 'humanize_path'; params[:dir] ||= 'ASC'
-    @pages = @site.pages.sort{|a,b| a.send(params[:by]) <=> b.send(params[:by])}
-    @pages.reverse! if params[:dir] == 'DESC'
+    params[:by] ||= 'humanize_path'
+    params[:dir] ||= 'asc'
+    @pages = @site.pages.sort_by{ |p| p.send(params[:by]).to_s }
+    @pages.reverse! if params[:dir] == 'desc'
   end
 
   def show

data/app/controllers/admin/sites_controller.rb

@@ -11,11 +11,12 @@ class Admin::SitesController < ApplicationController
       :humanize_path => 'URL'
     }
     @site = Site.find(params[:id])
-    params[:by] ||= 'humanize_path'; params[:dir] ||= 'ASC'
-    @pages = @site.pages.sort{|a,b| a.send(params[:by]) <=> b.send(params[:by])}
-    @pages.reverse! if params[:dir] == 'DESC'
+    params[:by] ||= 'humanize_path'
+    params[:dir] ||= 'asc'
+    @pages = @site.pages.sort_by{ |p| p.send(params[:by]).to_s }
+    @pages.reverse! if params[:dir] == 'desc'
     @redirects = @site.redirects
-    @nav_items = @site.nav_items.roots.sort{|a,b| a.position.to_i <=> b.position.to_i}
+    @nav_items = @site.nav_items.roots.sort_by{ |ni| ni.position.to_i }
   end
 
   def new

data/app/helpers/layout_helper.rb

@@ -6,8 +6,7 @@ module LayoutHelper
   def breadcrumbs
     unless controller?('home') && action?(/home|index/)
       html = [ link_to('Home', root_path) ]
-#      html << link_to( 'Foo', foo_path ) if controller?('FoosController')
-      (html * ' &gt; ').html_safe
+      html * ''
     end
   end
 

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

@@ -1,22 +1,25 @@
 <table class="standard">
-<%- if @pages.empty? -%>
-  <tr><th>No pages have been created yet.</th></tr>
+  <tr>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'humanize_path', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'page_title', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'window_title', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'state', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'noindex', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'sitemap', params) -%></th>
+    <th><%= sort_link("admin/sites/#{@site.id}/pages", 'updated_at', params) -%></th>
+    <th> </th>
+  </tr>
+<%- if @pages.blank? -%>
+  <tr><th colspan="8">No pages found.</th></tr>
 <%- else -%>
-    <tr>
-      <th style="width: 25%;"><%= sort_link("admin/sites/#{@site.id}/pages", 'humanize_path', params) -%></th>
-      <th style="width: 25%;"><%= sort_link("admin/sites/#{@site.id}/pages", 'page_title', params) -%></th>
-      <th style="width: 20%;"><%= sort_link("admin/sites/#{@site.id}/pages", 'window_title', params) -%></th>
-      <th style="width: 10%;"><%= sort_link("admin/sites/#{@site.id}/pages", 'state', params) -%></th>
-      <th style="width: 10%;"><%= sort_link("admin/sites/#{@site.id}/pages", 'updated_at', params) -%></th>
-      <th> </th>
-    </tr>
-
   <%- @pages.each do |page| -%>
     <tr class="<%= cycle('odd', 'even') -%>">
       <td><%= link_to page.humanize_path, admin_site_page_path(@site, page) -%></td>
       <td><%= page.page_title -%></td>
       <td><%= page.window_title -%></td>
       <td><%= page.status -%></td>
+      <td><%= page.noindex ? '√' : '' -%></td>
+      <td><%= page.sitemap ? '√' : '' -%></td>
       <td><%= page.updated_at.to_s(:concise) -%></td>
       <td class="crud_links">
         <%= link_to image_tag('/images/icons/view.png'), admin_site_page_path(@site, page) -%>
@@ -26,11 +29,7 @@
     </tr>
   <%- end -%>
 <%- end -%>
-  <tr>
-    <td colspan="6">
-      <div class="link_block">
-        <%= link_to 'New Page...', new_admin_site_page_path(@site), :class => 'link_button' -%>
-      </div>
-    </td>
-  </tr>
-</table>
+</table><br />
+<div class="attached link_block">
+  <%= link_to 'New Page...', new_admin_site_page_path(@site), :class => 'link_button' -%>
+</div>

data/site_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{site_logic}
-  s.version = "1.6.7"
+  s.version = "1.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Bantik}]
-  s.date = %q{2011-07-27}
+  s.authors = ["Bantik"]
+  s.date = %q{2011-08-15}
   s.description = %q{An engine for search-engine-optimized content management.}
   s.email = %q{corey@seologic.com}
   s.extra_rdoc_files = [
@@ -824,8 +824,8 @@ Gem::Specification.new do |s|
     "tasks/site_logic.rake"
   ]
   s.homepage = %q{http://github.com/ivanoblomov/site_logic}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{An engine for search-engine-optimized content management.}
 
   if s.respond_to? :specification_version then
@@ -833,7 +833,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
-      s.add_runtime_dependency(%q<carrierwave>, [">= 0"])
+      s.add_runtime_dependency(%q<carrierwave>, ["< 0.5.7"])
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
@@ -845,7 +845,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<bson_ext>, [">= 0"])
-      s.add_dependency(%q<carrierwave>, [">= 0"])
+      s.add_dependency(%q<carrierwave>, ["< 0.5.7"])
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
@@ -858,7 +858,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<bson_ext>, [">= 0"])
-    s.add_dependency(%q<carrierwave>, [">= 0"])
+    s.add_dependency(%q<carrierwave>, ["< 0.5.7"])
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: site_logic
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 6
-  - 7
-  version: 1.6.7
+  - 8
+  version: 1.6.8
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 Z
+date: 2011-08-15 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -37,12 +38,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 7
+        version: 0.5.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -998,6 +1001,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/site_logic.rake
+has_rdoc: true
 homepage: http://github.com/ivanoblomov/site_logic
 licenses: []
 
@@ -1027,7 +1031,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: An engine for search-engine-optimized content management.