- Added to SnippetsPagePartsController functionality so snippets could

  be added after or before PagePartBody.

- Added validation to SnippetPagePart so the same snippet could be
  only one time after the part body and only one time before it.

- Change snippet tab in page edit interface so user cand and and
  delete snippets after or before part body. Update englush locales
  file.

- Fixed after and before scopes in Snippet.

Author: Rodrigo Garcia Suarez

app/controllers/admin/snippets_page_parts_controller.rb

@@ -5,8 +5,9 @@ def add
       @page = Page.find(params[:id])
       @part = PagePart.find(params[:part_id])
       @snippet = Snippet.find(params[:snippet_id])
-
-      sp = SnippetPagePart.new(:page_part => @part, :snippet => @snippet)
+      before_body = params[:before_body] == 'true' ? true : false
+      
+      sp = SnippetPagePart.new(:page_part => @part, :snippet => @snippet, :before_body => before_body)
 
       if sp.save
          flash[:notice] = "Snippet #{@snippet.title} was successfully added."
@@ -19,8 +20,9 @@ def remove
       @page = Page.find(params[:id])
       @part = PagePart.find(params[:part_id])
       @snippet = Snippet.find(params[:snippet_id])
+      before_body = params[:before_body] == 'true' ? true : false
 
-      sp = SnippetPagePart.where(:page_part_id => @page, :snippet_id => @snippet)
+      sp = SnippetPagePart.where(:page_part_id => @part, :snippet_id => @snippet, :before_body => before_body)
 
       removed = sp.first.destroy() unless sp.empty?
 

app/models/snippet.rb

@@ -18,12 +18,12 @@ class Snippet < ActiveRecord::Base
   }
 
   named_scope :before, {
-    :joins => :page_parts,
+    :joins => :snippet_page_parts,
     :conditions => {:snippets_page_parts => {:before_body => true}}
   }
 
   named_scope :after, {
-    :joins => :page_parts,
+    :joins => :snippet_page_parts,
     :conditions => {:snippets_page_parts => {:before_body => false}}
   }
 

app/models/snippet_page_part.rb

@@ -4,6 +4,8 @@ class SnippetPagePart < ActiveRecord::Base
 
   belongs_to :snippet, :foreign_key => :snippet_id
   belongs_to :page_part, :foreign_key => :page_part_id
+
+  validates_uniqueness_of :snippet_id,  :scope => [:page_part_id, :before_body]
 
   before_save do |snippet_page_part|
     snippet_page_part.position = (SnippetPagePart.where('page_part_id = ?', snippet_page_part.page_part_id).maximum(:position) || -1) + 1

app/views/admin/pages/tabs/_snippets_field.html.erb

@@ -1,31 +1,16 @@
 <div class="part-snippets">
   <div class="active-snippets">
     <h1><%= part.title %></h1>
-    <% if part.snippets.any? %>
-      <h2><%= t('.active') %></h2>
+    <% if part.snippets.before.any? %>
+      <h2><%= t('.before_body') %></h2>
       <ul>
-        <% part.snippets.each do |snippet| %>
-          <li class='clearfix record <%= cycle('on', 'on-hover') %>' >
-            <span class='title'>
-              <%= snippet.title %>
-              <% if ::Refinery::I18n.frontend_locales.many? and
-                     (locales = snippet.translations.collect{|t| t.locale}).present? %>
-                <span class='preview'>
-                  <% locales.each do |locale| %>
-                    <%= refinery_icon_tag "flags/#{locale}.png", :size => '16x11' %>
-                  <% end %>
-                </span>
-              <% end %>
-            </span>
-            <span class='actions'>
-              <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_snippet_path(snippet),
-                  :title => t('.edit') %>
-              <%= link_to refinery_icon_tag('delete.png'), url_for({:controller => 'snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}),
-                  :title => t('.remove'),
-                  :class => 'remove-snippet' %>
-            </span>
-          </li>
-        <% end %>
+        <%= render :partial => '/admin/pages/tabs/snippets_list_item', :collection => part.snippets.before, :as => :snippet, :locals => {:part => part, :before_body => true} %>
+      </ul>
+    <% end %>
+    <% if part.snippets.after.any? %>
+      <h2><%= t('.after_body') %></h2>
+      <ul>
+        <%= render :partial => '/admin/pages/tabs/snippets_list_item', :collection => part.snippets.after, :as => :snippet, :locals => {:part => part, :before_body => false} %>
       </ul>
     <% end %>
   </div>
@@ -39,7 +24,8 @@
           <li class='clearfix record <%= cycle('on', 'on-hover') %>' >
             <span class="title"><%= snippet.title %></span>
             <span class="actions">
-              <a class="add_icon add-snippet" href="<%= url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}) %>">Add</a>
+              <a class="add_icon add-snippet" href="<%= url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}) %>"><%= t('.add_after_body') %></a>
+              <a class="add_icon add-snippet" href="<%= url_for({:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => 'true'}) %>"><%= t('.add_before_body') %></a>
             </span>
           </li>
         <% end %>

app/views/admin/pages/tabs/_snippets_list_item.html.erb

@@ -0,0 +1,20 @@
+<li class='clearfix record <%= cycle('on', 'on-hover') %>' >
+  <span class='title'>
+    <%= snippet.title %>
+    <% if ::Refinery::I18n.frontend_locales.many? and
+           (locales = snippet.translations.collect{|t| t.locale}).present? %>
+      <span class='preview'>
+        <% locales.each do |locale| %>
+          <%= refinery_icon_tag "flags/#{locale}.png", :size => '16x11' %>
+        <% end %>
+      </span>
+    <% end %>
+  </span>
+  <span class='actions'>
+    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_snippet_path(snippet),
+        :title => t('.edit') %>
+    <%= link_to refinery_icon_tag('delete.png'), url_for({:controller => 'snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => before_body}),
+        :title => t('.remove'),
+        :class => 'remove-snippet' %>
+  </span>
+</li>

config/locales/en.yml

@@ -23,9 +23,13 @@ en:
         snippets_field:
           active: Active
           inactive: Inactive
+          add_after_body: Add after body
+          add_before_body: Add before body
+          after_body: After body
+          before_body: Before body
+        snippets_list_item:
           remove: Remove
           edit: Edit
-          add: Add
   snippets:
     show:
       other: Other Snippets