refinerycms-snippets 0.3.1 → 0.4.0

data/app/controllers/admin/snippets_page_controller.rb

@@ -0,0 +1,32 @@
+module Admin
+  class SnippetsPageController < Admin::BaseController
+    
+    def add
+      @page = Page.find(params[:id])
+      @snippet = Snippet.find(params[:snippet_id])
+
+      sp = SnippetPage.new(:page => @page, :snippet => @snippet)
+
+      if sp.save
+         flash[:notice] = "Snippet #{@snippet.title} was successfully added to page."
+      end
+      
+      render :layout => false if request.xhr?
+    end
+
+    def remove
+      @page = Page.find(params[:id])
+      @snippet = Snippet.find(params[:snippet_id])
+
+      sp = SnippetPage.where(:page_id => @page, :snippet_id => @snippet)
+      
+      removed = sp.first.destroy() unless sp.empty?
+
+      if removed
+         flash[:notice] = "Snippet #{@snippet.title} was successfully removed from page."
+      end
+      
+      render :layout => false if request.xhr?
+    end
+  end
+end

data/app/models/snippet.rb

@@ -5,8 +5,9 @@ class Snippet < ActiveRecord::Base
   validates :title, :presence => true, :uniqueness => true
 
   translates :body
-  
-#  has_many :pages, :through => :snippets_pages
+
+  has_many :snippet_page, :dependent => :destroy
+  has_many :pages, :through => :snippet_page
 
   def self.inactive(page)
       @page = page

data/app/models/snippet_page.rb

@@ -1,9 +1,9 @@
 class SnippetPage < ActiveRecord::Base
   
-  set_table_name 'snippets_pages'
+  set_table_name 'snippet_page'
   
-  belongs_to :snippet, :foreign_key => :snippet_id, :dependent => :destroy
-  belongs_to :page, :foreign_key => :page_id, :dependent => :destroy
+  belongs_to :snippet, :foreign_key => :snippet_id
+  belongs_to :page, :foreign_key => :page_id
   
   validates_uniqueness_of(:snippet_id, :scope => :page_id)
 

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

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

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

@@ -1,2 +1,8 @@
-<%= render :partial => '/admin/pages/tabs/snippets_bar' %>
-<%= render :partial => '/admin/pages/tabs/snippets_field' %>
+<%= render :partial => '/admin/pages/tabs/snippets_field' %>
+
+<% content_for :stylesheets do %>
+  <%= stylesheet_link_tag 'page-snippet-picker' %>
+<% end %>
+<% content_for :javascripts do %>
+  <%= javascript_include_tag 'page-snippet-picker' %>
+<% end %>

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

@@ -1,8 +1,9 @@
-<div class="wym_box field snippets_field" id="snippets-holder">
+<div id="active-snippets">
 <% if @page.snippets.any? %>
-  <ul style="padding: 10px; background: #fff; margin: 5px 0;">
+  <h2><%= t('.active') %></h2>
+  <ul>
   <% @page.snippets.each do |snippet| %>
-    <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(snippet) -%>">
+    <li class='clearfix record <%= cycle('on', 'on-hover') %>' >
     <span class='title'>
       <%= snippet.title %>
       <% if ::Refinery::I18n.frontend_locales.many? and
@@ -15,9 +16,9 @@
       <% end %>
     </span>
     <span class='actions'>
-      <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_snippet_path(snippet),
+      <%= 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),
+      <%= link_to refinery_icon_tag('delete.png'), url_for({:controller => 'snippets_page', :action => 'remove', :snippet_id => snippet.id, :id => @page.id}),
           :title => t('.remove'),
           :class => 'remove-snippet' %>
     </span>
@@ -25,4 +26,27 @@
   <% end %>
   </ul>
 <% end %>
-</div>
+</div>
+
+<div id="inactive-snippets">
+<% inactive_snippets = Snippet.inactive(@page) %>
+<% if inactive_snippets.length > 0 %>
+  <h2><%= t('.inactive') %></h2>
+  <ul>
+    <% inactive_snippets.each do |snippet| %>
+    <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', :action => 'add', :snippet_id => snippet.id, :id => @page.id}) %>">Add</a>
+      </span>
+    </li>
+    <% end %>
+  </ul>
+<% end %>
+</div>
+
+
+
+
+
+

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

@@ -11,9 +11,6 @@
     <% end %>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"), snippet_url(snippet),
-        :title => t('.view_live_html'),
-        :target => "_blank" %>
     <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_snippet_path(snippet),
          :title => t('.edit') %>
     <%= link_to refinery_icon_tag("delete.png"), admin_snippet_path(snippet),

data/app/views/admin/snippets_page/add.html.erb

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

data/app/views/admin/snippets_page/remove.html.erb

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

data/config/locales/en.yml

@@ -1,8 +1,4 @@
 en:
-  shared:
-    admin:
-      image_picker:
-        image: image
   plugins:
     snippets:
       title: Snippets
@@ -20,6 +16,14 @@ en:
         view_live_html: View this snippet live <br/><em>(opens in a new window)</em>
         edit: Edit this snippet
         delete: Remove this snippet forever
+    pages:
+      tabs:
+        snippets_field:
+          active: Active
+          inactive: Inactive
+          remove: Remove
+          edit: Edit
+          add: Add
   snippets:
     show:
       other: Other Snippets

data/config/routes.rb

@@ -1,14 +1,19 @@
 Refinery::Application.routes.draw do
-  resources :snippets, :only => [:index, :show] 
 
   scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :snippets, :except => :show do
+    resources :snippets do
       collection do
         post :update_positions
       end
+      
+      resources :snippets_page do
+        member do
+          get 'add'
+          get 'remove'
+        end
+      end
     end
     
-    resources :snippets_pages
   end
   
 end

data/db/migrate/1_create_snippets.rb

@@ -8,9 +8,6 @@ class CreateSnippets < ActiveRecord::Migration
       t.timestamps
     end
 
-# 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
 

data/db/migrate/{2_create_snippets_pages.rb → 2_create_snippet_page.rb}

@@ -1,18 +1,18 @@
-class CreateSnippetsPages < ActiveRecord::Migration
+class CreateSnippetPage < ActiveRecord::Migration
 
   def self.up
-    create_table :snippets_pages do |t|
+    create_table :snippet_page 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
+    add_index :snippet_page, :snippet_id
+    add_index :snippet_page, :page_id
   end
 
   def self.down
-    drop_table :snippets_pages
+    drop_table :snippet_page
   end
 
 end

data/db/seeds/snippets.rb

@@ -3,18 +3,4 @@ User.all.each do |user|
     user.plugins.create(:name => 'snippets',
                         :position => (user.plugins.maximum(:position) || -1) +1)
   end
-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
+end

data/lib/refinerycms-snippets.rb

@@ -9,7 +9,7 @@ module Refinery
       
       config.to_prepare do
         Page.module_eval do
-          has_many :snippet_page
+          has_many :snippet_page, :dependent => :destroy
           has_many :snippets, :through => :snippet_page, :order => 'position ASC'
         end
       end

data/public/javascripts/page-snippet-picker.js

@@ -1,24 +1,23 @@
-$(document).ready(function(){
+$(document).ready(function (cms) {
+	cms = cms || {};
+	cms.plugin = cms.plugin || {};
 
 	/**
 	 * Class for handling everything between page and snippets
 	 */
-	var PageSnippet = {
+	cms.plugin.PageSnippet = {
 		processing: false,
 		content_holder: [], // html wrapper for all stuff
 		add_snippet: [], // add snippet anchor
-		inactive_snippets: [], // select box with inactive snippets on page
-
+		remove_snippet: [],
 
 		spinner_on: function () {
 			this.processing = true;
-			this.inactive_snippets.attr('disabled', 'disabled');
 			this.content_holder.css({opacity: 0.5});
 		},
 
 		spinner_off: function () {
 			this.content_holder.css({opacity: 1});
-			this.inactive_snippets.removeAttr('disabled');
 			this.processing = false;
 		},
 
@@ -29,36 +28,25 @@ $(document).ready(function(){
 			this.spinner_off();		
 		},
 
-		add: function () {
-			var that = this;
+		add: function (elm) {
+			var that = this,
+				add_url = $(elm).attr('href');
 			
 			if (!this.processing) {
-				var selected_item = this.inactive_snippets.find('option:selected'),
-					selected_id = null,
-					values = [],
-					add_url = this.add_snippet.attr('href');
-
-				if (selected_item.length > 0 && selected_item.val() !== '') {
-					this.spinner_on();
-				
-					add_url += '&add=' + selected_item.val();
-					
-					$.ajax({
-						url: add_url,
-						type: 'GET',
-						dataType: 'html',
-						error: function (response) { alert(response); },
-						complete: function (e) {
-							// console.log(e);
-						},
-						success: function (response) {
+				this.spinner_on();
 
-							that.update(response);
-						}
-					});
-				} else {
-					this.processing = false;
-				}
+				$.ajax({
+					url: add_url,
+					type: 'GET',
+					dataType: 'html',
+					error: function (response) { alert(response); },
+					complete: function (e) {
+						// console.log(e);
+					},
+					success: function (response) {
+						that.update(response);
+					}
+				});
 			}
 		},
 
@@ -67,7 +55,6 @@ $(document).ready(function(){
 				remove_url = $(elm).attr('href');
 
 			if (!this.processing) {
-				var values = [];
 				this.spinner_on();
 				
 				// console.log('remove start');
@@ -81,7 +68,6 @@ $(document).ready(function(){
 						// console.log(e);
 					},
 					success: function (response) {
-						// console.log('pleas');
 						that.update(response);
 					}
 				});
@@ -94,7 +80,8 @@ $(document).ready(function(){
 		clear: function () {
 			// console.log('start clear');
 			this.content_holder.find('a').unbind('click');
-			this.add_snippet.unbind('click');
+			this.content_holder.find('a').unbind('mouseout');
+			this.content_holder.find('a').unbind('mouseover');
 		},
 
 		/**
@@ -102,15 +89,16 @@ $(document).ready(function(){
 		 */
 		bind: function () {
 			var that = this;
-			this.add_snippet = $('#add-snippet');
-			this.inactive_snippets = $('#inactive_snippets');
+			this.add_snippet = this.content_holder.find('a.add-snippet');
+			this.remove_snippet = this.content_holder.find('a.remove-snippet');
+			
 			this.add_snippet.click(function (e) {
 				e.preventDefault();
-				that.add();
+				that.add(this);
 				return false;
 			});
 			
-			$('a.remove-snippet').click(function (e) {
+			this.remove_snippet.click(function (e) {
 				e.preventDefault();
 				that.remove(this);
 				return false;
@@ -118,12 +106,12 @@ $(document).ready(function(){
 		},
 
 		init: function () {
-			this.content_holder = $('#page_snippet_picker	');
+			this.content_holder = $('#page_snippet_picker');
 			if (this.content_holder.length > 0) {
 				this.bind();
 			}
 		}
 	}
 
-	PageSnippet.init();
+	cms.plugin.PageSnippet.init();
 });

data/public/stylesheets/page-snippet-picker.css

@@ -0,0 +1,29 @@
+/* 
+    Document   : page-snippet-picker.css
+    Created on : May 16, 2011, 4:41:03 AM
+    Author     : keram
+    Description:
+        Styles for snippets administrations
+*/
+
+a.add-snippet {
+	background-repeat: no-repeat;
+	background-position: left center;
+	border: none; 
+	padding-left: 20px;
+}
+
+#page_snippet_picker ul {
+	background: #fff;
+	padding: 10px;
+	padding-bottom: 0px;
+	margin-bottom: 5px;
+}
+
+#active-snippets ul {
+	margin-bottom: 15px;
+}
+
+#inactive-snippets ul {
+	background: #fcfcfc;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-snippets
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Marek L.
@@ -15,10 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-09 00:00:00 +02:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: refinerycms-pages
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 0
+        - 9
+        - 9
+        - 1
+        version: 0.9.9.1
+  type: :runtime
+  version_requirements: *id001
 description: Ruby on Rails Snippets engine for Refinery CMS
 email: nospam.keram@gmail.com
 executables: []
@@ -32,13 +48,10 @@ files:
 - lib/refinerycms-snippets.rb
 - lib/tasks/snippets.rake
 - config/routes.rb
-- config/locales/lolcat.yml
 - config/locales/en.yml
-- config/locales/nb.yml
 - config/locales/nl.yml
-- app/controllers/snippets_controller.rb
 - app/controllers/admin/snippets_controller.rb
-- app/controllers/admin/snippets_pages_controller.rb
+- app/controllers/admin/snippets_page_controller.rb
 - app/models/snippet_page.rb
 - app/models/snippet.rb
 - app/views/snippets/show.html.erb
@@ -53,16 +66,17 @@ files:
 - app/views/admin/snippets/_locale_picker.html.erb
 - app/views/admin/snippets/_actions.html.erb
 - app/views/admin/snippets/_snippet.html.erb
+- app/views/admin/snippets_page/remove.html.erb
+- app/views/admin/snippets_page/add.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
-- app/views/admin/snippets_pages/index.html.erb
-- db/migrate/2_create_snippets_pages.rb
+- db/migrate/2_create_snippet_page.rb
 - db/migrate/1_create_snippets.rb
 - db/migrate/3_translate_snippets.rb
 - db/seeds/snippets.rb
 - public/javascripts/page-snippet-picker.js
+- public/stylesheets/page-snippet-picker.css
 has_rdoc: true
 homepage: 
 licenses: []
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Html snippets for Refinery CMS page

data/app/controllers/admin/snippets_pages_controller.rb

@@ -1,31 +0,0 @@
-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/controllers/snippets_controller.rb

@@ -1,30 +0,0 @@
-class SnippetsController < ApplicationController
-
-  before_filter :find_all_snippets
-  before_filter :find_page
-
-  def index
-    # you can use meta fields from your model instead (e.g. browser_title)
-    # by swapping @page for @snippet in the line below:
-    present(@page)
-  end
-
-  def show
-    @snippet = Snippet.find(params[:id])
-
-    # you can use meta fields from your model instead (e.g. browser_title)
-    # by swapping @page for @snippet in the line below:
-    present(@page)
-  end
-
-protected
-
-  def find_all_snippets
-    @snippets = Snippet.order('position ASC')
-  end
-
-  def find_page
-    @page = Page.where(:link_url => "/snippets").first
-  end
-
-end

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

@@ -1,12 +0,0 @@
-<div class='wym_area_top'>
-  <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/snippets_pages/index.html.erb

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

data/config/locales/lolcat.yml

@@ -1,25 +0,0 @@
-lolcat:
-  shared:
-    admin:
-      image_picker:
-        image: IMAGE
-  plugins:
-    snippets:
-      title: Snippets
-  admin:
-    snippets:
-      actions:
-        create_new: CREATE NEW Snippet
-        reorder: REORDR Snippets
-        reorder_done: DUN REORDERIN Snippets
-      records:
-        title: Snippets
-        sorry_no_results: SRY! THAR R NO RESULTS FINDZ.
-        no_items_yet: THAR R NO Snippets YET. CLICK "CREATE NEW Snippet" 2 ADD UR FURST snippet.
-      snippet:
-        view_live_html: VIEW DIS snippet LIV <BR/><EM>(OPENS IN NEW WINDOW)</EM>
-        edit: EDIT DIS snippet
-        delete: REMOOV DIS snippet FOREVR
-  snippets:
-    show:
-      other: OTHR Snippets

data/config/locales/nb.yml

@@ -1,21 +0,0 @@
-nb:
-  plugins:
-    snippets:
-      title: Snippets
-  admin:
-    snippets:
-      actions:
-        create_new: Lag en ny Snippet
-        reorder: Endre rekkefølgen på Snippets
-        reorder_done: Ferdig å endre rekkefølgen Snippets
-      records:
-        title: Snippets
-        sorry_no_results: Beklager! Vi fant ikke noen resultater.
-        no_items_yet: Det er ingen Snippets enda. Klikk på "Lag en ny Snippet" for å legge til din første snippet.
-      snippet:
-        view_live_html: Vis hvordan denne snippet ser ut offentlig <br/><em>(åpner i et nytt vindu)</em>
-        edit: Rediger denne snippet
-        delete: Fjern denne snippet permanent
-  snippets:
-    show:
-      other: Andre Snippets