refinerycms-llama_widgets 0.3.8 → 0.3.9

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

@@ -7,33 +7,13 @@ jQuery ->
   $('.dialog-link').click (event) ->
     linkFromDialog($(this).data('link-from-dialog'))
 
-  if $('#new_widget #widget_type').length > 0
-    $('#new_widget #widget_type.template').change (event) ->
-      selected = $(this).val()
-      if selected != ''
-        activePart = window.parent.$('li.ui-tabs-active').attr('aria-controls')
-        index = window.parent.$('#template_part_index_' + activePart).attr('data-index')
-        data = {sub_type: selected, index: index}
-        url = '/<%= Refinery::Core.backend_route %>/widgets/widget_types/new_for_template'
-        $.ajax({url: url, data: data}).done (data) ->
-          target = window.parent.$("a#add_widget_" + activePart)
-          $(data).insertBefore(target)
-          window.parent.initWidgets()
-          window.parent.init_refinery_admin()
-          window.parent.refinery_dialog_success()
-    $('#new_widget #widget_type.page').change (event) ->
-      selected = $(this).val()
-      if selected != ''
-        activePart = window.parent.$('li.ui-tabs-active').attr('aria-controls')
-        index = window.parent.$('#template_part_index_' + activePart).attr('data-index')
-        data = {sub_type: selected, index: index}
-        url = '/<%= Refinery::Core.backend_route %>/widgets/widget_types/new_for_page'
-        $.ajax({url: url, data: data}).done (data) ->
-          target = window.parent.$("a#add_widget_" + activePart)
-          $(data).insertBefore(target)
-          window.parent.initWidgets()
-          window.parent.init_refinery_admin()
-          window.parent.refinery_dialog_success()
+  if $('#new_widget').length > 0
+    $('#new_widget .widget-list.new-page a').on 'click', (e) ->
+      e.preventDefault()
+      selectWidgetTypeForNewPage($(this).data('value'))
+    $('#new_widget .widget-list.template a').on 'click', (e) ->
+      e.preventDefault()
+      selectWidgetTypeForTemplate($(this).data('value'))
           
   $('[data-sortable="widgets"]').each (index, value) ->
     $(value).sortable({handle: '.handle', \
@@ -44,6 +24,32 @@ jQuery ->
                         assessOrder()
                      })
 
+window.selectWidgetTypeForNewPage = (selected) ->
+  if selected != ''
+    activePart = window.parent.$('li.ui-tabs-active').attr('aria-controls')
+    index = window.parent.$('#template_part_index_' + activePart).attr('data-index')
+    data = {sub_type: selected, index: index}
+    url = '/<%= Refinery::Core.backend_route %>/widgets/widget_types/new_for_page'
+    $.ajax({url: url, data: data}).done (data) ->
+      target = window.parent.$("a#add_widget_" + activePart)
+      $(data).insertBefore(target)
+      window.parent.initWidgets()
+      window.parent.init_refinery_admin()
+      window.parent.refinery_dialog_success()
+
+window.selectWidgetTypeForTemplate = (selected) ->
+  if selected != ''
+    activePart = window.parent.$('li.ui-tabs-active').attr('aria-controls')
+    index = window.parent.$('#template_part_index_' + activePart).attr('data-index')
+    data = {sub_type: selected, index: index}
+    url = '/<%= Refinery::Core.backend_route %>/widgets/widget_types/new_for_template'
+    $.ajax({url: url, data: data}).done (data) ->
+      target = window.parent.$("a#add_widget_" + activePart)
+      $(data).insertBefore(target)
+      window.parent.initWidgets()
+      window.parent.init_refinery_admin()
+      window.parent.refinery_dialog_success()
+
 window.initExistingWidgetSelect = () ->
   $('a.select-widget-template').click ->
     selectExistingWidgetForTemplate($(this).data('id'))

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

@@ -122,3 +122,34 @@ span.label-sup {
 }
 
 input.checkbox { margin-top: 8px; }
+
+#content {
+  div.widget-list {
+    padding-left: 0;
+    a {
+      &:hover {
+        background-color: lighten(gray, 40%);
+      }
+      padding: 5px;
+      background-color: lighten(gray, 45%);
+      border: 1px solid lighten(gray, 20%);
+      border-bottom: none;
+      display: block;
+    }
+    a:first-of-type {
+      border-top-left-radius: 5px;
+      border-top-right-radius: 5px;
+    }
+    a:last-of-type {
+      border: 1px solid lighten(gray, 20%);
+      border-bottom-left-radius: 5px;
+      border-bottom-right-radius: 5px;
+    }
+  }
+  .left-side {
+    width: 50%;
+  }
+  .right-side {
+    width: 50%;
+  }
+}

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

@@ -1,34 +1,42 @@
 #new_widget
-  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'
+  .left-side
+    h3 Add new
+    div class="widget-list #{current_page?(refinery.url_for(:action => 'page')) ? 'new-page' : 'template'}"
+      - Refinery::Widgets::WidgetType.all.sort_by(&:name).each do |widget_type|
+        a href='#' data-value=widget_type.klass_as_string
+          = widget_type.name
+          - if widget_type.description.present?
+            br
+            small = widget_type.description
 
-  - if @widgets.any?
-    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
+  .right-side
+    - 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'))
-                = content_tag(:a, 'Select', class: 'select-widget-page',
-                  data: {id: widget.id})
+                td
+                  = widget.pages.collect{|p| p.title }.to_sentence
               - else
-                = content_tag(:a, 'Select', class: 'select-widget-template',
-                  data: {id: widget.id})
+                td
+                  = widget.templates.collect{|p| p.name }.to_sentence
+              td
+                - if current_page?(refinery.url_for(action: 'page'))
+                  = content_tag(:a, 'Select', class: 'select-widget-page',
+                    data: {id: widget.id})
+                - else
+                  = content_tag(:a, 'Select', class: 'select-widget-template',
+                    data: {id: widget.id})

data/lib/refinery/widgets/configuration.rb

@@ -5,7 +5,7 @@ module Refinery
     config_accessor :base_widgets, :excluded_widgets, 
       :additional_widgets, :super_admin_widgets
 
-    self.base_widgets = ['Refinery::Widgets::ContentBlockWidget']
+    self.base_widgets = [{name: 'Refinery::Widgets::ContentBlockWidget', description: 'Text block which can include images and simple styles'}]
     self.excluded_widgets = []
     self.additional_widgets = []
     self.super_admin_widgets = []

data/lib/refinery/widgets/widget_type.rb

@@ -4,9 +4,14 @@ module Refinery
 
       attr_reader :name, :klass, :html_id, :association_name, :admin_partial,
         :klass_as_string, :attribute_param, :admin_preview_partial,
-        :front_partial
+        :front_partial, :description
 
       def initialize(class_as_string)
+        if class_as_string.is_a?(Hash)
+          attributes = class_as_string.dup
+          class_as_string = attributes[:name]
+          description = attributes[:description]
+        end
         @klass_as_string = class_as_string
         @klass = class_as_string.constantize
         @html_id = class_as_string.split('::').last.underscore
@@ -16,6 +21,7 @@ module Refinery
         @admin_preview_partial = "#{@html_id}_preview"
         @front_partial = @html_id
         @name = @html_id.humanize
+        @description = description || ''
       end
 
       def self.all

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-llama_widgets
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  prerelease: 
+  version: 0.3.9
 platform: ruby
 authors:
 - Nick Bolt
@@ -9,74 +10,84 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   name: refinerycms-nested_models
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.1
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  prerelease: false
   name: deface
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
+  type: :development
+  prerelease: false
   name: refinerycms-testing
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -175,25 +186,26 @@ files:
 - lib/refinerycms-llama_widgets.rb
 homepage: 
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Widgets extension for Refinery CMS
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a463bfd7bb89d6d84ade195fca59fa96e9c11810
-  data.tar.gz: 90212b90aa1f3e74a90edc15d932884db4289cd0
-SHA512:
-  metadata.gz: feda320660343175de87727086dd1c6aefa349080a6eafd1a94a4bb66aafd909d040a5185981caa28d9c77a8d8f14fc0080f5a4e7ebae7d2ce800a080bdce939
-  data.tar.gz: 1933098d8b9fac86b37a7221705b37951ea0677c44c66ad7a71584a7e0bf647da39e6bc391dc4240ee05072c02c074dfe3fa7f701310e8227de5f887cc3cf366