Merge branch 'master' into multiple-authors

xaviershay · Nov 19, 2010 · 5a85b90 · 5a85b90
2 parents 7ac26f1 + e807066
commit 5a85b90
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 63 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.1'
+gem 'rails', '3.0.3'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,34 +4,33 @@ GEM
     RedCloth (4.2.3)
     aaronh-chronic (0.3.9)
     abstract (1.0.0)
-    actionmailer (3.0.1)
+    actionmailer (3.0.3)
-      actionpack (= 3.0.1)
+      actionpack (= 3.0.3)
-      mail (~> 2.2.5)
+      mail (~> 2.2.9)
-    actionpack (3.0.1)
+    actionpack (3.0.3)
-      activemodel (= 3.0.1)
+      activemodel (= 3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
+      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.4)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
+    activemodel (3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
-    activerecord (3.0.1)
+    activerecord (3.0.3)
-      activemodel (= 3.0.1)
+      activemodel (= 3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
-      arel (~> 1.0.0)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
+    activeresource (3.0.3)
-      activemodel (= 3.0.1)
+      activemodel (= 3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
-    activesupport (3.0.1)
+    activesupport (3.0.3)
-    arel (1.0.1)
+    arel (2.0.4)
-      activesupport (~> 3.0.0)
     builder (2.1.2)
     coderay (0.9.5)
     cucumber (0.9.4)
@@ -46,9 +45,9 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.2)
-    formtastic (1.1.0)
+    formtastic (1.2.0)
-      actionpack (>= 2.3.0)
+      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.0)
+      activesupport (>= 2.3.7)
       i18n (>= 0.4.0)
     gherkin (2.2.9)
       json (~> 1.4.6)
@@ -58,13 +57,13 @@ GEM
     i18n (0.4.2)
     json (1.4.6)
     lesstile (1.0.0)
-    mail (2.2.9)
+    mail (2.2.10)
       activesupport (>= 2.3.6)
       i18n (~> 0.4.1)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -74,19 +73,19 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.1)
+    rails (3.0.3)
-      actionmailer (= 3.0.1)
+      actionmailer (= 3.0.3)
-      actionpack (= 3.0.1)
+      actionpack (= 3.0.3)
-      activerecord (= 3.0.1)
+      activerecord (= 3.0.3)
-      activeresource (= 3.0.1)
+      activeresource (= 3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
-      bundler (~> 1.0.0)
+      bundler (~> 1.0)
-      railties (= 3.0.1)
+      railties (= 3.0.3)
-    railties (3.0.1)
+    railties (3.0.3)
-      actionpack (= 3.0.1)
+      actionpack (= 3.0.3)
-      activesupport (= 3.0.1)
+      activesupport (= 3.0.3)
-      rake (>= 0.8.4)
+      rake (>= 0.8.7)
-      thor (~> 0.14.0)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
@@ -102,7 +101,7 @@ GEM
     sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
     thor (0.14.4)
-    treetop (1.4.8)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
     webrat (0.7.2)
@@ -125,7 +124,7 @@ DEPENDENCIES
   hpricot
   lesstile
   rack-openid
-  rails (= 3.0.1)
+  rails (= 3.0.3)
   rspec
   rspec-rails
   ruby-openid

diff --git a/app/views/admin/comments/show.html.erb b/app/views/admin/comments/show.html.erb
@@ -1,13 +1,13 @@
 <h1>Editing comment by <%= @comment.author %></h1>
 
 <%= semantic_form_for([:admin, @comment]) do |form| -%>
-  <%= form.input_field_set do -%>
+  <%= form.inputs do -%>
     <%= form.input :author %>
     <%= form.input :author_url, :required => false %>
     <%= form.input :author_email, :required => false %>
     <%= form.input :body, :hint => "<a href='http://lesstile.rubyforge.org'>Lesstile enabled</a>.".html_safe %>
   <% end %>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("Save") %>
   <% end -%>
 <% end -%>
diff --git a/app/views/admin/pages/_form.html.erb b/app/views/admin/pages/_form.html.erb
@@ -2,8 +2,8 @@
   <%= javascript_include_tag 'admin/edit-preview' %>
 <% end -%>
 
-<%= form.input_field_set do -%>
+<%= form.inputs do -%>
   <%= form.input :title %>
   <%= form.input :slug, :hint => "Leave blank for an auto-generated slug based on the title." %>
-  <%= form.input :body, :hint => "<a href='http://hobix.com/textile/quick.html'>Textile enabled</a>. Use Ctrl+E to switch between preview and edit mode.".html_safe %>
+  <%= form.input :body, :hint => "<a href='http://textile.thresholdstate.com/'>Textile enabled</a>. Use Ctrl+E to switch between preview and edit mode.".html_safe %>
 <% end -%>
diff --git a/app/views/admin/pages/new.html.erb b/app/views/admin/pages/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([:admin, @page]) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("Save") -%>
   <% end -%>
 <% end -%>
diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([:admin, @page]) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("Save") -%>
   <% end -%>
 <% end -%>
diff --git a/app/views/admin/posts/_form.html.erb b/app/views/admin/posts/_form.html.erb
@@ -2,12 +2,12 @@
   <%= javascript_include_tag 'admin/edit-preview' %>
 <% end -%>
 
-<%= form.input_field_set do -%>
+<%= form.inputs do -%>
   <%= form.input :title -%>
-  <%= form.input :body, :hint => "<a href='http://hobix.com/textile/quick.html'>Textile enabled</a>. Use Ctrl+E to switch between preview and edit mode.".html_safe -%>
+  <%= form.input :body, :hint => "<a href='http://textile.thresholdstate.com/'>Textile enabled</a>. Use Ctrl+E to switch between preview and edit mode.".html_safe -%>
   <%= form.input :tag_list, :as => 'string', :required => false, :hint => 'Comma separated: ruby, rails&hellip;'.html_safe -%>
 <% end -%>
-<%= form.input_field_set do -%>
+<%= form.inputs do -%>
   <%= form.input :published_at_natural, :label => 'Published at', :as => 'string', :hint => 'Example: now, yesterday, 1 hour from now, '.html_safe + link_to("more&hellip;".html_safe, "http://chronic.rubyforge.org/") -%>
   <%= form.input :slug, :hint => "Leave blank for an auto-generated slug based on the title." -%>
   <%= form.input :minor_edit, :as => 'boolean', :hint => 'Minor edits will not show up as refreshed in feed readers. Use this to fix spelling mistakes and the like.' unless @post.new_record? -%>

diff --git a/app/views/admin/posts/new.html.erb b/app/views/admin/posts/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([:admin, @post]) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} -%>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("Save") -%>
   <% end -%>
 <% end -%>
diff --git a/app/views/admin/posts/show.html.erb b/app/views/admin/posts/show.html.erb
@@ -2,7 +2,7 @@
 
 <%= semantic_form_for([:admin, @post]) do |form| -%>
   <%= render :partial => 'form', :locals => {:form => form} %>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("Save") -%>
   <% end -%>
 <% end -%>
diff --git a/app/views/admin/tags/edit.html.erb b/app/views/admin/tags/edit.html.erb
@@ -1,10 +1,10 @@
 <h1>Editing tag - <%= link_to(@tag.name, posts_path(:tag => @tag)) %></h1>
 
 <%= semantic_form_for([:admin, @tag]) do |form| -%>
-  <%= form.input_field_set do -%>
+  <%= form.inputs do -%>
     <%= form.input :name %>
   <% end -%>
-  <%= form.button_field_set do -%>
+  <%= form.buttons do -%>
     <%= form.commit_button("save") -%>
   <% end -%>
 <% end -%>
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -34,13 +34,13 @@
     </div>
     <div id="nav">
       <ul>
-        <li><%= nav_link_to("Dashboard", admin_root_path,  :accesskey => '1') %></li>
+        <li><%= nav_link_to("Dashboard", admin_root_path,       :accesskey => '1') %></li>
         <li><%= nav_link_to("Posts",     admin_posts_path,      :accesskey => '2') %> <%= nav_link_to("(+)", new_admin_post_path, :accesskey => 'n') %></li>
         <li><%= nav_link_to("Pages",     admin_pages_path,      :accesskey => '3') %> <%= nav_link_to("(+)", new_admin_page_path, :accesskey => 'p') %></li>
         <li><%= nav_link_to("Comments",  admin_comments_path,   :accesskey => '4') %></li>
         <li><%= nav_link_to("Tags",      admin_tags_path,       :accesskey => '5') %></li>
         <li><%= nav_link_to("Actions",   admin_undo_items_path, :accesskey => '6') %></li>
-        <li><%= nav_link_to("Health",    admin_health_path, :accesskey => '6') %></li>
+        <li><%= nav_link_to("Health",    admin_health_path,     :accesskey => '7') %></li>
         <li class="separator">&nbsp;</li>
         <li><%= link_to("Logout", admin_session_path, :accesskey => 'l', :method => :delete) %></li>
         <li><%= link_to("View Site", '/',             :accesskey => 'v', :title => 'View Site') %></li>

diff --git a/config/locales/en.yml b/config/locales/en.yml