refinerycms-snippets 0.2 → 0.3

data/app/controllers/admin/snippets_controller.rb

@@ -2,6 +2,6 @@ module Admin
   class SnippetsController < Admin::BaseController
 
     crudify :snippet, :xhr_paging => true
-
+    
   end
 end

data/app/controllers/admin/snippets_pages_controller.rb

@@ -0,0 +1,31 @@
+module Admin
+  class SnippetsPagesController < Admin::BaseController
+    def index
+      
+      @page = Page.find(params[:page_id])
+      @do = 'nothing'
+      
+      if params[:add].to_i > 0
+        @do = 'add'
+        sp = SnippetPage.new(:page => @page, :snippet => Snippet.find(params[:add].to_i))
+        
+        if sp.save
+           flash[:notice] = 'Snippet was successfully added to page.'
+        end
+      else
+        if params[:remove].to_i > 0
+          @do = 'remove'
+          sp = SnippetPage.where(:page_id => @page.id, :snippet_id => params[:remove].to_i)
+          removed = sp.first.delete() unless sp.empty?
+
+          if removed
+             flash[:notice] = 'Snippet was successfully removed from page.'
+          end
+        end
+      end
+      
+      render :layout => false if request.xhr?
+      
+    end
+  end
+end

data/app/models/snippet.rb

@@ -1,11 +1,20 @@
 class Snippet < ActiveRecord::Base
-
+  
   acts_as_indexed :fields => [:title, :body]
 
   validates :title, :presence => true, :uniqueness => true
 
   translates :body
   
+#  has_many :pages, :through => :snippets_pages
+
+  def self.inactive(page)
+      @page = page
+      snippets = scoped      
+      snippets = snippets.where('id NOT IN (?)', @page.snippets) unless @page.snippets.empty?
+      snippets
+  end
+
   # rejects any page that has not been translated to the current locale.
   scope :translated, lambda {
     pages = Arel::Table.new(Snippet.table_name)

data/app/models/snippet_page.rb

@@ -1,10 +1,14 @@
 class SnippetPage < ActiveRecord::Base
-
-  belongs_to :snippet
-  belongs_to :page
+  
+  set_table_name 'snippets_pages'
+  
+  belongs_to :snippet, :foreign_key => :snippet_id, :dependent => :destroy
+  belongs_to :page, :foreign_key => :page_id, :dependent => :destroy
+  
+  validates_uniqueness_of(:snippet_id, :scope => :page_id)
 
   before_save do |snippet_page|
-    snippet_page.position = (SnippetPage.maximum(:position) || -1) + 1
+    snippet_page.position = (SnippetPage.where('page_id = ?', snippet_page.page_id).maximum(:position) || -1) + 1
   end
-
+  
 end

data/app/views/admin/pages/tabs/_snippets.html.erb

@@ -1,12 +1,7 @@
-<div class='wym_skin_refinery page_part' id='page_image_picker'>
-  <%= render :partial => '/admin/pages/tabs/snippets_bar', :locals => {:f => f} %>
-  <%= render :partial => '/admin/pages/tabs/snippets_field', :locals => {:f => f} %>
+<div class='wym_skin_refinery page_part' id='page_snippet_picker' style="padding: 5px;">
+  <%= render :partial => '/admin/pages/tabs/snippets_content', :locals => {:f => f} %>
 </div>
 
-<%# content_for :stylesheets do %>
-  <%#= stylesheet_link_tag 'page-image-picker' %>
-<%# end %>
-
-<%# content_for :javascripts do %>
-  <%#= javascript_include_tag 'page-image-picker' %>
-<%# end %>
+<% content_for :javascripts do %>
+  <%= javascript_include_tag 'page-snippet-picker' %>
+<% end %>

data/app/views/admin/pages/tabs/_snippets_bar.html.erb

@@ -1,9 +1,12 @@
 <div class='wym_area_top'>
-  <span class='clearfix label_inline_with_link'>-t- todo add snippet link
-    <%#= link_to t('.add'), insert_admin_images_url({
-                  :dialog => true, :width => 950, :height => 510,
-                  :callback => "image_added"
-                }),
-                :id => "add_image_link" %>
-  </span>
+  <div style="padding: 5px 0;">
+    <%
+          
+      inactive_snippets = Snippet.inactive(@page).map { |snippet| [snippet.title, snippet.id] }
+      inactive_snippets.unshift(['Select snippet', ''])
+      
+    %>
+    <%= select_tag(:inactive_snippets, options_for_select(inactive_snippets)) %>
+    <a href="<%= admin_snippets_pages_path(:page_id => @page.id.to_s) %>" id="add-snippet" class="add_icon" style="background-repeat: no-repeat; background-position: left center;border: none; padding: 2px 12px 2px 20px">Add</a>
+  </div>
 </div>

data/app/views/admin/pages/tabs/_snippets_content.html.erb

@@ -0,0 +1,2 @@
+<%= render :partial => '/admin/pages/tabs/snippets_bar' %>
+<%= render :partial => '/admin/pages/tabs/snippets_field' %>

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

@@ -1,3 +1,28 @@
-<div class="wym_box field snippets_field" >
-  -t- todo page snippets body
+<div class="wym_box field snippets_field" id="snippets-holder">
+<% if @page.snippets.any? %>
+  <ul style="padding: 10px; background: #fff; margin: 5px 0;">
+  <% @page.snippets.each do |snippet| %>
+    <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(snippet) -%>">
+    <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"), admin_snippets_pages_path(:page_id => @page.id, 'remove' => snippet.id),
+          :title => t('.remove'),
+          :class => 'remove-snippet' %>
+    </span>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
 </div>

data/app/views/admin/snippets/_form.html.erb

@@ -3,6 +3,7 @@
           :object => @snippet,
           :include_object_name => true
         } %>
+  
 
   <%= render :partial => "locale_picker",
              :locals => {
@@ -13,7 +14,6 @@
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
   </div>
-  
   <div class='field'>
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>

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

@@ -0,0 +1,2 @@
+<%= render :partial => '/admin/pages/tabs/snippets_content' %>
+<%#= debug @do %>

data/config/routes.rb

@@ -1,5 +1,5 @@
 Refinery::Application.routes.draw do
-  resources :snippets, :only => [:index, :show]
+  resources :snippets, :only => [:index, :show] 
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
     resources :snippets, :except => :show do
@@ -7,5 +7,8 @@ Refinery::Application.routes.draw do
         post :update_positions
       end
     end
+    
+    resources :snippets_pages
   end
+  
 end

data/db/migrate/1_create_snippets.rb

@@ -2,14 +2,14 @@ class CreateSnippets < ActiveRecord::Migration
 
   def self.up
     create_table :snippets do |t|
-      t.string :title
+      t.string :title, :limit => 36, :null => false
       t.text :body
-      t.integer :position
-
+      t.integer :position, :null => false, :default => 0
       t.timestamps
     end
 
-    add_index :snippets, :id
+# we have primary key, thus we don't need duplicate index with them
+#    add_index :snippets, :id
 
     load(Rails.root.join('db', 'seeds', 'snippets.rb'))
   end
@@ -17,7 +17,7 @@ class CreateSnippets < ActiveRecord::Migration
   def self.down
     UserPlugin.destroy_all({:name => "snippets"})
 
-#    Page.delete_all({:link_url => "/snippets"})
+    Page.delete_all({:link_url => "/snippets"})
 
     drop_table :snippets
   end

data/db/migrate/2_create_snippets_pages.rb

@@ -0,0 +1,18 @@
+class CreateSnippetsPages < ActiveRecord::Migration
+
+  def self.up
+    create_table :snippets_pages do |t|
+      t.integer :snippet_id, :null => false, :references => [:snippets, :id]
+      t.integer :page_id, :null => false, :references => [:pages, :id]
+      t.integer :position, :null => false, :default => 0
+    end
+
+#    add_index :snippets_pages, :snippet_id
+    add_index :snippets_pages, :page_id
+  end
+
+  def self.down
+    drop_table :snippets_pages
+  end
+
+end

data/db/seeds/snippets.rb

@@ -5,14 +5,16 @@ User.all.each do |user|
   end
 end
 
-page = Page.create(
-  :title => 'Snippets',
-  :link_url => '/snippets',
-  :show_in_menu => false,
-  :deletable => false,
-  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
-  :menu_match => '^/snippets(\/|\/.+?|)$'
-)
-Page.default_parts.each do |default_page_part|
-  page.parts.create(:title => default_page_part, :body => nil)
-end
+# we don't need this on frontend
+#page = Page.create(
+#  :title => 'Snippets',
+#  :link_url => '/snippets',
+#  :show_in_menu => false,
+#  :deletable => false,
+#  :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1),
+#  :menu_match => '^/snippets(\/|\/.+?|)$'
+#)
+#
+#Page.default_parts.each do |default_page_part|
+#  page.parts.create(:title => default_page_part, :body => nil)
+#end

data/lib/refinerycms-snippets.rb

@@ -9,8 +9,8 @@ module Refinery
       
       config.to_prepare do
         Page.module_eval do
-          has_many :snippet_pages
-          has_many :snippets, :through => :snippet_pages, :order => 'position ASC'
+          has_many :snippet_page
+          has_many :snippets, :through => :snippet_page, :order => 'position ASC'
         end
       end
 
@@ -21,9 +21,13 @@ module Refinery
         end
         Refinery::Plugin.register do |plugin|
           plugin.name = "snippets"
-          plugin.activity = {
+          plugin.url = {:controller => '/admin/snippets'}
+          plugin.menu_match = /^\/?(admin|refinery)\/snippets/
+          plugin.activity = [{
             :class => Snippet
-	  }
+          }, {
+            :class => SnippetPage
+          }]
         end
       end
     end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-snippets
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Marek L.
@@ -37,6 +37,7 @@ files:
 - config/locales/nl.yml
 - app/controllers/snippets_controller.rb
 - app/controllers/admin/snippets_controller.rb
+- app/controllers/admin/snippets_pages_controller.rb
 - app/models/snippet_page.rb
 - app/models/snippet.rb
 - app/views/snippets/show.html.erb
@@ -53,8 +54,10 @@ files:
 - app/views/admin/snippets/_snippet.html.erb
 - app/views/admin/pages/tabs/_snippets.html.erb
 - app/views/admin/pages/tabs/_snippets_bar.html.erb
+- app/views/admin/pages/tabs/_snippets_content.html.erb
 - app/views/admin/pages/tabs/_snippets_field.html.erb
-- db/migrate/2_create_page_snippets.rb
+- app/views/admin/snippets_pages/index.html.erb
+- db/migrate/2_create_snippets_pages.rb
 - db/migrate/1_create_snippets.rb
 - db/migrate/3_translate_snippets.rb
 - db/seeds/snippets.rb

data/db/migrate/2_create_page_snippets.rb

@@ -1,18 +0,0 @@
-class CreatePageSnippets < ActiveRecord::Migration
-
-  def self.up
-    create_table :snippet_pages, :id => false do |t|
-      t.integer :snippet_id
-      t.integer :page_id
-      t.integer :position
-    end
-
-    add_index :snippet_pages, :snippet_id
-    add_index :snippet_pages, :page_id
-  end
-
-  def self.down
-    drop_table :snippet_pages
-  end
-
-end