refinerycms-llama_widgets 0.1.7 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d292a000b86ed67183eeae7e3970ac239b2fe43
-  data.tar.gz: d0e137f15646b5873155a92fced660b917570e3e
+  metadata.gz: babae46015255950c2cab92f3712deae0cbd4de4
+  data.tar.gz: 67327dc7fbce7ee44589d408b1c58ff67b2fe331
 SHA512:
-  metadata.gz: 0b0e2338bcd10d11d1b916b2ae83887dfb45eb131eb508c9475abd817d565a43112b1204b1b47a0f9891b8665717d5243cb59fe77ef0cbe75ab6d1dbbd47272e
-  data.tar.gz: 050033ccff1dbac74380863cc71d671c1480939409c48fcee1832f765e3ed38936f5552a0fd22ecd891a4fe4c2c73eaa39e14e69863f719e772a14c454e50288
+  metadata.gz: e29a16c27971626bc13ac9a32703e58c1f09fa0d17f504a386734324fd4344c5fdd8b850384da0fcc72ecf69ba826a0004de285d01d63a5374d6bbe3d4cf41d5
+  data.tar.gz: 3e091d5a45cb6f813123fb6bf8383a6cb158ec6dafd43f13d90c17608c3ee6ddd94c5f84c2d7037bba6e96da6715947f25658d3e934a0c39ca38cadca40b10d2

data/app/assets/javascripts/refinery/widgets.js.coffee.erb

@@ -1,4 +1,14 @@
 jQuery ->
+  $('[data-disabled-master]').each (index,element) ->
+    $(element).change (event) -> 
+      if ($(this).is(':checked'))
+        if $(this).is('[data-disabled-warning]')
+          alert $(this).attr('data-disabled-warning')
+        $(this).parents('[data-disabled-container]').find('[data-disabled-slave]').removeAttr('disabled')
+      else
+        $(this).parents('[data-disabled-container]').find('[data-disabled-slave]').attr('disabled', true)
+
+
   if $('#new_widget #widget_type').length > 0
     $('#new_widget #widget_type.template').change (event) ->
       selected = $(this).val()
@@ -66,9 +76,10 @@ window.linkFromDialog = (linkUrl) ->
   window.parent.refinery_dialog_success()
         
 window.removeWidget = (link) -> 
-  widget = $(link).parents('.widget')
-  widget.find('input[data-meta="destroy"]').val('1')
-  widget.hide()
+  if window.confirm("Are you sure you want to remove this widget?")
+    widget = $(link).parents('.widget')
+    widget.find('input[data-meta="destroy"]').val('1')
+    widget.hide()
 
 window.toggleWidget = (link) ->
   widgetInner = $(link).parents('.widget').find('.inner')

data/app/assets/stylesheets/refinery/widgets.scss

@@ -1,4 +1,4 @@
-.inline{ float:left; margin-top: 5px; margin-right: 20px; }
+.inline{ float:left; margin-top: 5px; margin-right: 10px; }
 .tab-area{ border: 1px solid #CCC; padding: 10px; }
 .reuseable-block{ border: 1px solid #CCC }
 .widgets.ui-sortable {
@@ -37,6 +37,9 @@
 .clear {
   clear: both;
 }
+.locked {
+  background-color: #DDDDDD;
+}
 table.existing_widgets, table.select_template {
   border-collapse: collapse;
   border-spacing: 0;
@@ -50,7 +53,9 @@ table.existing_widgets, table.select_template {
     }
   }
 }
+
 .sub-title { font-size: 0.9em; opacity: 0.8; }
+select.inline { margin-top: 5px; }
 
 form fieldset { 
   margin: 5px;
@@ -63,6 +68,26 @@ form fieldset {
 .l-margin { margin-top: 20px; margin-bottom: 20px; }
 .xl-margin { margin-top: 40px; margin-bottom: 40px; }
 
+.s-top-pad { padding-top: 5px; }
+.m-top-pad { padding-top: 10px; }
+.l-top-pad { padding-top: 20px; }
+.xl-top-pad { padding-top: 40px; }
+
+.s-top-margin { margin-top: 5px; }
+.m-top-margin { margin-top: 10px; }
+.l-top-margin { margin-top: 20px; }
+.xl-top-margin { margin-top: 40px; }
+
+.s-bottom-pad { padding-bottom: 5px; }
+.m-bottom-pad { padding-bottom: 10px; }
+.l-bottom-pad { padding-bottom: 20px; }
+.xl-bottom-pad { padding-bottom: 40px; }
+
+.s-bottom-margin { margin-bottom: 5px; }
+.m-bottom-margin { margin-bottom: 10px; }
+.l-bottom-margin { margin-bottom: 20px; }
+.xl-bottom-margin { margin-bottom: 40px; }
+
 .row { padding-left: 15px; }
 .row:before,.row:after{content:" ";display:table;}
 .row:after{clear:both;}
@@ -93,3 +118,5 @@ span.label-sup {
   margin-left: 20px;
   font-size: 0.9em;
 }
+
+input.checkbox { margin-top: 8px; }

data/app/decorators/models/refinery/page.rb

@@ -5,6 +5,8 @@ Refinery::Page.class_eval do
   
   before_validation :validate_widgets
 
+  before_save :change_template
+
   def self.find_by_widget_class(widget_class)
     instance = widget_class.first
     return nil if instance.nil?
@@ -17,6 +19,10 @@ Refinery::Page.class_eval do
     parts.collect(&:widgets).flatten
   end
 
+  def ordered_parts
+    (::Refinery::Pages.default_parts.collect{|dp| parts.find{|p| p.title == dp } } + parts).uniq
+  end
+
   private
     
     def validate_widgets
@@ -25,4 +31,13 @@ Refinery::Page.class_eval do
       end
     end
 
+    def change_template
+      if changes.has_key?(:template_id)
+        widgets.each{|w| w.destroy if w.layout == true}
+        template.template_parts.each do |tp|
+          tp.sychronize_widgets!(self)
+        end
+      end
+    end
+
 end

data/app/models/refinery/widgets/widget.rb

@@ -10,15 +10,16 @@ module Refinery
       attr_accessor :widget_attributes
       attr_accessible :name, :position, :container_type, :container_id, 
         :display, :master_id, :sub_type, :locked, :widget_attributes,
-        :widget_id, :layout, :container
+        :widget_id, :layout, :container, :reuse
 
-      
       validate :validate_widget
 
+      validates :name, :presence => {:if => Proc.new{|o| o.reuse? }}
+
       before_validation :update_widget
 
       def self.reusable
-        where(widget_id: nil)
+        where(widget_id: nil, reuse: true)
       end
       
       def self.has_name

data/app/overrides/refinery/admin/pages/_form.rb

@@ -2,3 +2,13 @@ Deface::Override.new(virtual_path: 'refinery/admin/pages/_form',
                     name: 'insert_template_id_field_to_pages_admin_form',
                     insert_after: "erb[loud]:contains('form_for')",
                     text: "<%= f.hidden_field :template_id -%>")
+
+Deface::Override.new(virtual_path: 'refinery/admin/pages/_form',
+                    name: 'remove_preview_and_continue_links',
+                    replace: "erb[loud]:contains('admin/form_actions')",
+                    partial: 'refinery/admin/pages/form_actions')
+
+Deface::Override.new(virtual_path: 'refinery/admin/pages/_form',
+                    name: 'insert_template_changer',
+                    insert_after: "erb[loud]:contains('admin/locale_picker')",
+                    partial: 'refinery/admin/pages/template_changer')

data/app/views/refinery/admin/pages/_form_actions.html.erb

@@ -0,0 +1,5 @@
+<%= render '/refinery/admin/form_actions', :f => f,
+             :continue_editing => false,
+             :delete_title => t('delete', :scope => 'refinery.admin.pages'),
+             :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @page.title),
+             :cancel_url => refinery.admin_pages_path %>

data/app/views/refinery/admin/pages/_form_page_parts.html.erb

@@ -1,7 +1,7 @@
 <div class='field'>
   <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
     <ul id='page_parts'>
-      <% f.object.parts.each_with_index do |part, index| %>
+      <% f.object.ordered_parts.each_with_index do |part, index| %>
         <li class="ui-state-default <%= 'ui-state-active' if index == 0 %>">
           <%= link_to "#{part.title.to_s.humanize}", "\##{part.title}" %>
         </li>
@@ -17,7 +17,7 @@
     </ul>
 
     <div id='page_part_editors'>
-      <% f.object.parts.each_with_index do |part,index| %>
+      <% f.object.ordered_parts.each_with_index do |part,index| %>
         <div class='page_part' id="<%= part.title %>">
           <%= render 'page_part', :f => f, :field => part.title, :part => part %>
         </div>

data/app/views/refinery/admin/pages/_template_changer.html.erb

@@ -0,0 +1,10 @@
+<div class='field row' data-disabled-container='true'>
+  <div class='col-6'>
+    <%= label_tag :change_template, 'Check this box to select a different template for this page', class: 'inline' %>
+    <%= check_box_tag :change_template, '1', false, :class => 'checkbox', 'data-disabled-master' => true, 'data-disabled-warning' => 'Please note that changing the template will affect the widgets in use on this page. After changing the template press save and come back and check the widget order is correct.' %>
+  </div>
+  <div class='col-6'>
+    <%= f.label :template_id, nil, class: 'inline' %>
+    <%= f.collection_select :template_id, ::Refinery::Widgets::Template.order(:name), :id, :name, {}, :disabled => 'disabled', 'data-disabled-slave' => true, :class => 'inline' %>
+  </div>
+</div>

data/app/views/refinery/admin/pages/_widget_fields.slim

@@ -1,4 +1,4 @@
-.widget data-sort-item='widget'
+.widget data-sort-item='widget' class=('locked' if f.object.locked?)
   .banner
     .left
       span.handle title="Reorder"
@@ -14,34 +14,40 @@
             = refinery_icon_tag('lock')
         - else
           = f.label :display, :class => 'inline'
-          = f.check_box :display, :class => 'simple-itoggle'
+          = f.check_box :display, :class => 'checkbox'
           = link_to_function(refinery_icon_tag('bin_closed'), 'removeWidget(this)', :title => "Remove widget" )
           = link_to_function(refinery_icon_tag('edit'), 'showWidgetEdit(this)', :title => "Edit widget" ) unless local_assigns.has_key?(:mode) && mode == 'edit'
         = link_to_function(refinery_icon_tag('zoom'), 'toggleWidget(this)', :title => "Toggle details")
-  .inner.clear style="margin-top:40px;"
+  .inner.clear style="margin-top:40px; #{'display:none;' if f.object.locked?}"
     .previewing style=("display:none;" if local_assigns.has_key?(:mode) && mode == 'edit')
-      .field
-        = f.label :name
-        = f.object.name
       = f.fields_for f.object.widget_type.association_name do |j|
         = render "refinery/widgets/admin/widgets/#{f.object.widget_type.admin_preview_partial}", :f => j
 
     .editing style=("display:none;" unless local_assigns.has_key?(:mode) && mode == 'edit')
-      .field.clear
+      .clear
         = f.hidden_field :sub_type
         = f.hidden_field :_destroy, 'data-meta' => 'destroy'
         = f.hidden_field :position, 'data-meta' => 'position'
         = f.hidden_field :widget_id
         = f.hidden_field :locked
         = f.hidden_field :layout
-        = f.label :name, nil, :class => 'inline'
-        - if f.object.locked?
-          = text_field_tag :name, f.object.name, :disabled => true
-          = f.hidden_field :name
-        - else
-          = f.text_field :name
-          span.label-sup If you would like to reuse this widget enter a name here
+
+
       = f.fields_for f.object.widget_type.association_name do |j|
         = render "refinery/widgets/admin/widgets/#{f.object.widget_type.admin_partial}", :f => j
+
+      - if f.object.locked?
+        = f.hidden_field :name
+      - else
+        .row.field.l-top-margin.m-bottom-margin data-disabled-container = true
+          .col-4
+            = f.check_box :reuse, :class => 'checkbox', 'data-disabled-master' => true
+            = f.label :reuse, nil, :class => 'inline'
+          .col-8
+            = f.label :name, nil, :class => 'inline'
+            - if f.object.reuse?
+              = f.text_field :name, 'data-disabled-slave' => true
+            - else
+              = f.text_field :name, :disabled => true, 'data-disabled-slave' => true
   .clear
     

data/app/views/refinery/widgets/admin/templates/_widget_fields.slim

@@ -12,15 +12,25 @@
         = link_to_function(refinery_icon_tag('bin_closed'), 'removeWidget(this)', :title => "Remove widget" )
         = link_to_function(refinery_icon_tag('zoom'), 'toggleWidget(this)', :title => "Toggle details")
   .inner.clear style="margin-top:40px;"
-    .field.clear
+    .clear
       = f.hidden_field :sub_type
       = f.hidden_field :_destroy, 'data-meta' => 'destroy'
       = f.hidden_field :position, 'data-meta' => 'position'
       = f.hidden_field :widget_id
       = f.hidden_field :locked
-      = f.label :name
-      = f.text_field :name
+
     = f.fields_for f.object.widget_type.association_name do |j|
       = render "refinery/widgets/admin/widgets/#{f.object.widget_type.admin_partial}", :f => j
+
+    .row.field.l-top-margin.m-bottom-margin data-disabled-container = true
+      .col-4
+        = f.check_box :reuse, :class => 'checkbox', 'data-disabled-master' => true
+        = f.label :reuse, nil, :class => 'inline'
+      .col-8
+        = f.label :name, nil, :class => 'inline'
+        - if f.object.reuse?
+          = f.text_field :name, 'data-disabled-slave' => true
+        - else
+          = f.text_field :name, :disabled => true, 'data-disabled-slave' => true
   .clear
     

data/app/views/refinery/widgets/admin/widgets/new.slim

@@ -2,30 +2,31 @@
   h3 Add new
   = select_tag :widget_type, options_for_select([['Select type...', nil]] + Refinery::Widgets::WidgetType.all.sort_by(&:name).map{|t| [t.name, t.klass_as_string] }), :class => current_page?(refinery.url_for(:action => 'page')) ? 'page' : 'template'
 
-  h3 Select existing
-  table.existing_widgets
-    thead
-      tr.titles
-        th Name
-        th Type
-        - if current_page?(refinery.url_for(action: 'page'))
-          th Pages
-        - else
-          th Templates 
-        th &nbsp
-    tbody
-      - @widgets.each do |widget|
-        tr class = cycle('dark', 'light')
-          td = widget.name
-          td = widget.widget_type.name
+  - if @widgets.any?
+    h3 Select existing
+    table.existing_widgets
+      thead
+        tr.titles
+          th Name
+          th Type
           - if current_page?(refinery.url_for(action: 'page'))
-            td
-              = widget.pages.collect{|p| p.title }.to_sentence
+            th Pages
           - else
-            td
-              = widget.templates.collect{|p| p.name }.to_sentence
-          td
+            th Templates 
+          th &nbsp
+      tbody
+        - @widgets.each do |widget|
+          tr class = cycle('dark', 'light')
+            td = widget.name
+            td = widget.widget_type.name
             - if current_page?(refinery.url_for(action: 'page'))
-              = link_to_function('Select', "selectExistingWidgetForPage(#{widget.id})")
+              td
+                = widget.pages.collect{|p| p.title }.to_sentence
             - else
-              = link_to_function('Select', "selectExistingWidgetForTemplate(#{widget.id})")
+              td
+                = widget.templates.collect{|p| p.name }.to_sentence
+            td
+              - if current_page?(refinery.url_for(action: 'page'))
+                = link_to_function('Select', "selectExistingWidgetForPage(#{widget.id})")
+              - else
+                = link_to_function('Select', "selectExistingWidgetForTemplate(#{widget.id})")

data/config/locales/en.yml

@@ -31,4 +31,7 @@ en:
     attributes:
       'refinery/widgets/template':
         name: Name
+      'refinery/widgets/widget':
+        name: Reference (not displayed on site)
+        reuse: I would like to reuse this widget
 

data/db/migrate/7_add_reuse_to_refinery_widgets.rb

@@ -0,0 +1,7 @@
+class AddReuseToRefineryWidgets < ActiveRecord::Migration
+
+  def change
+    add_column :refinery_widgets_widgets, :reuse, :boolean, :default => false
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-llama_widgets
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Bolt
@@ -114,6 +114,8 @@ files:
 - app/views/refinery/admin/pages/_page_part.slim
 - app/views/refinery/admin/pages/_widget_fields.slim
 - app/views/refinery/admin/pages/_link_url.html.erb
+- app/views/refinery/admin/pages/_template_changer.html.erb
+- app/views/refinery/admin/pages/_form_actions.html.erb
 - app/views/refinery/admin/_image_picker.html.erb
 - app/views/refinery/admin/_nested_image_picker.html.erb
 - app/controllers/refinery/widgets/admin/widget_types_controller.rb
@@ -156,6 +158,7 @@ files:
 - db/migrate/4_create_widgets_content_block_widgets.rb
 - db/migrate/6_add_locked_to_refinery_page_parts.rb
 - db/migrate/3_create_widgets_widgets.rb
+- db/migrate/7_add_reuse_to_refinery_widgets.rb
 - db/migrate/5_add_template_id_to_refinery_pages.rb
 - lib/tasks/refinery/widgets.rake
 - lib/refinery/widgets/configuration.rb