refinerycms-llama_widgets 0.2.5 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/refinery/engage.itoggle-min.js +16 -16
  3. data/app/assets/javascripts/refinery/widgets.js.coffee.erb +16 -0
  4. data/app/assets/stylesheets/refinery/engage.itoggle.css +93 -93
  5. data/app/assets/stylesheets/refinery/widgets.scss +2 -0
  6. data/app/controllers/refinery/widgets/admin/templates_controller.rb +5 -0
  7. data/app/decorators/controllers/refinery/admin/pages_controller.rb +10 -0
  8. data/app/decorators/models/refinery/page.rb +2 -2
  9. data/app/decorators/models/refinery/page_part.rb +2 -4
  10. data/app/models/refinery/widgets/content_block_widget.rb +0 -2
  11. data/app/models/refinery/widgets/template.rb +0 -2
  12. data/app/models/refinery/widgets/template_part.rb +2 -4
  13. data/app/models/refinery/widgets/widget.rb +0 -3
  14. data/app/views/refinery/admin/pages/_widget_fields.slim +5 -3
  15. data/app/views/refinery/widgets/admin/templates/_widget_fields.slim +4 -2
  16. data/app/views/refinery/widgets/admin/templates/list.slim +3 -1
  17. data/app/views/refinery/widgets/admin/widgets/new.slim +4 -2
  18. data/lib/refinery/widgets/acts_as_widget.rb +0 -1
  19. data/lib/refinery/widgets/engine.rb +1 -1
  20. metadata +78 -77
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0671c4e7ab839d914437e4cb105434d7ca9e94f9
4
- data.tar.gz: e11647ce8c0df6b47dbd6945380445296c22bc8a
3
+ metadata.gz: 0295fa26531865198776c86d75a4b8efae5c0d14
4
+ data.tar.gz: 3e679e3c1860f159b21dbce21cfbbe7b62bc1188
5
5
  SHA512:
6
- metadata.gz: 89c5d32b21b724a9458d3edfeeaef53f0761d523c93987f8b1cbdff08a5d23c1a31022af7f6e202481a47a66a7d216b7f3ca13a4dac20567d8d51ff384bfea91
7
- data.tar.gz: 1ae8e6abc1a775c160cb854bf46f9db1a39c6f3df78318e6fdc95dd861e10aab02dd0db9720b6fc92bcfd6259d969d88356bc832cfc8c1e4e37812067e1f1696
6
+ metadata.gz: 4b64f7b7d57f9e033a2077190182dab6c5e20a9e89f4ee18539b4f6024d85e9a5069842d4ccc582a1e59752bef62ce55c08ef48fb13e3e32693c926fc8f03803
7
+ data.tar.gz: e445d5f5744a3f0da783adaae861ce92c7fd3710e8792ddd6fd49b5bf901cd056e254b61b6b18d585b43a62dabc47ad4f6186d8ff7968a0b1d2800557f0775d6
data/app/assets/javascripts/refinery/engage.itoggle-min.js CHANGED
@@ -1,17 +1,17 @@
1
- /*---------------
2
- * jQuery iToggle Plugin by Engage Interactive
3
- * Examples and documentation at: http://labs.engageinteractive.co.uk/itoggle/
4
- * Copyright (c) 2009 Engage Interactive
5
- * Version: 1.0 (10-JUN-2009)
6
- * Dual licensed under the MIT and GPL licenses:
7
- * http://www.opensource.org/licenses/mit-license.php
8
- * http://www.gnu.org/licenses/gpl.html
9
- * Requires: jQuery v1.3 or later
10
- ---------------*/
11
-
12
- (function($){$.fn.iToggle=function(options){clickEnabled=true;var defaults={type:'checkbox',keepLabel:true,easing:false,speed:200,onClick:function(){},onClickOn:function(){},onClickOff:function(){},onSlide:function(){},onSlideOn:function(){},onSlideOff:function(){}},settings=$.extend({},defaults,options);this.each(function(){var $this=$(this);if($this.attr('tagName')=='INPUT'){var id=$this.attr('id');label(settings.keepLabel,id);$this.addClass('iT_checkbox').before('<label class="itoggle" for="'+id+'"><span></span></label>');if($this.attr('checked')){$this.prev('label').addClass('iTon');}else{$this.prev('label').addClass('iToff');}}else{$this.children('input:'+settings.type).each(function(){var id=$(this).attr('id');label(settings.keepLabel,id);$(this).addClass('iT_checkbox').before('<label class="itoggle" for="'+id+'"><span></span></label>');if($(this).attr('checked')){$(this).prev('label').addClass('iTon');}else{$(this).prev('label').addClass('iToff');}
13
- if(settings.type=='radio'){$(this).prev('label').addClass('iT_radio');}});}});function label(e,id){if(e==true){if(settings.type=='radio'){$('label[for='+id+']').addClass('ilabel_radio');}else{$('label[for='+id+']').addClass('ilabel');}}else{$('label[for='+id+']').remove();}}
14
- $('label.itoggle').click(function(){if(clickEnabled==true){clickEnabled=false;if($(this).hasClass('iT_radio')){if($(this).hasClass('iTon')){clickEnabled=true;}else{slide($(this),true);}}else{slide($(this));}}
15
- return false;});$('label.ilabel').click(function(){if(clickEnabled==true){clickEnabled=false;slide($(this).next('label.itoggle'));}
16
- return false;});function slide($object,radio){settings.onClick.call($object);h=$object.innerHeight();t=$object.attr('for');if($object.hasClass('iTon')){settings.onClickOff.call($object);$object.animate({backgroundPosition:'100% -'+h+'px'},settings.speed,settings.easing,function(){$object.removeClass('iTon').addClass('iToff');clickEnabled=true;settings.onSlide.call(this);settings.onSlideOff.call(this);});$('input#'+t).removeAttr('checked');}else{settings.onClickOn.call($object);$object.animate({backgroundPosition:'0% -'+h+'px'},settings.speed,settings.easing,function(){$object.removeClass('iToff').addClass('iTon');clickEnabled=true;settings.onSlide.call(this);settings.onSlideOn.call(this);});$('input#'+t).attr('checked','checked');}
1
+ /*---------------
2
+ * jQuery iToggle Plugin by Engage Interactive
3
+ * Examples and documentation at: http://labs.engageinteractive.co.uk/itoggle/
4
+ * Copyright (c) 2009 Engage Interactive
5
+ * Version: 1.0 (10-JUN-2009)
6
+ * Dual licensed under the MIT and GPL licenses:
7
+ * http://www.opensource.org/licenses/mit-license.php
8
+ * http://www.gnu.org/licenses/gpl.html
9
+ * Requires: jQuery v1.3 or later
10
+ ---------------*/
11
+
12
+ (function($){$.fn.iToggle=function(options){clickEnabled=true;var defaults={type:'checkbox',keepLabel:true,easing:false,speed:200,onClick:function(){},onClickOn:function(){},onClickOff:function(){},onSlide:function(){},onSlideOn:function(){},onSlideOff:function(){}},settings=$.extend({},defaults,options);this.each(function(){var $this=$(this);if($this.attr('tagName')=='INPUT'){var id=$this.attr('id');label(settings.keepLabel,id);$this.addClass('iT_checkbox').before('<label class="itoggle" for="'+id+'"><span></span></label>');if($this.attr('checked')){$this.prev('label').addClass('iTon');}else{$this.prev('label').addClass('iToff');}}else{$this.children('input:'+settings.type).each(function(){var id=$(this).attr('id');label(settings.keepLabel,id);$(this).addClass('iT_checkbox').before('<label class="itoggle" for="'+id+'"><span></span></label>');if($(this).attr('checked')){$(this).prev('label').addClass('iTon');}else{$(this).prev('label').addClass('iToff');}
13
+ if(settings.type=='radio'){$(this).prev('label').addClass('iT_radio');}});}});function label(e,id){if(e==true){if(settings.type=='radio'){$('label[for='+id+']').addClass('ilabel_radio');}else{$('label[for='+id+']').addClass('ilabel');}}else{$('label[for='+id+']').remove();}}
14
+ $('label.itoggle').click(function(){if(clickEnabled==true){clickEnabled=false;if($(this).hasClass('iT_radio')){if($(this).hasClass('iTon')){clickEnabled=true;}else{slide($(this),true);}}else{slide($(this));}}
15
+ return false;});$('label.ilabel').click(function(){if(clickEnabled==true){clickEnabled=false;slide($(this).next('label.itoggle'));}
16
+ return false;});function slide($object,radio){settings.onClick.call($object);h=$object.innerHeight();t=$object.attr('for');if($object.hasClass('iTon')){settings.onClickOff.call($object);$object.animate({backgroundPosition:'100% -'+h+'px'},settings.speed,settings.easing,function(){$object.removeClass('iTon').addClass('iToff');clickEnabled=true;settings.onSlide.call(this);settings.onSlideOff.call(this);});$('input#'+t).removeAttr('checked');}else{settings.onClickOn.call($object);$object.animate({backgroundPosition:'0% -'+h+'px'},settings.speed,settings.easing,function(){$object.removeClass('iToff').addClass('iTon');clickEnabled=true;settings.onSlide.call(this);settings.onSlideOn.call(this);});$('input#'+t).attr('checked','checked');}
17
17
  if(radio==true){name=$('#'+t).attr('name');slide($object.siblings('label[for]'));}}};})(jQuery);
data/app/assets/javascripts/refinery/widgets.js.coffee.erb CHANGED
@@ -1,7 +1,11 @@
1
1
  jQuery ->
2
2
 
3
3
  initDisabled()
4
+ initExistingWidgetSelect()
5
+ initWidgets()
4
6
 
7
+ $('.dialog-link').click (event) ->
8
+ linkFromDialog($(this).data('link-from-dialog'))
5
9
 
6
10
  if $('#new_widget #widget_type').length > 0
7
11
  $('#new_widget #widget_type.template').change (event) ->
@@ -38,6 +42,12 @@ jQuery ->
38
42
  assessOrder()
39
43
  })
40
44
 
45
+ window.initExistingWidgetSelect = () ->
46
+ $('a.select-widget-template').click ->
47
+ selectExistingWidgetForTemplate($(this).data('id'))
48
+ $('a.select-widget-page').click ->
49
+ selectExistingWidgetForPage($(this).data('id'))
50
+
41
51
  window.initDisabled = () ->
42
52
  $('[data-disabled-master]').each (index,element) ->
43
53
  $(element).change (event) ->
@@ -75,6 +85,12 @@ window.initWidgets = ->
75
85
  WYMeditor.init()
76
86
  assessOrder()
77
87
  initDisabled()
88
+ $('a.remove-widget').click ->
89
+ removeWidget(this)
90
+ $('a.toggle-widget').click ->
91
+ toggleWidget(this)
92
+ $('a.edit-widget').click ->
93
+ showWidgetEdit(this)
78
94
 
79
95
  window.linkFromDialog = (linkUrl) ->
80
96
  window.parent.location = linkUrl
data/app/assets/stylesheets/refinery/engage.itoggle.css CHANGED
@@ -1,94 +1,94 @@
1
- /* ---------------------------------------------
2
- TOGGLE.CSS
3
- -----------------------------------------------*/
4
-
5
- div#itoggle{
6
- background:#FFF;
7
- padding:20px 20px 0;
8
- -moz-border-radius:10px;
9
- -webkit-border-radius:10px;
10
- color:#333;
11
- }
12
- div#itoggle h3{
13
- margin-bottom:4px;
14
- font-size: 14px;
15
- font-weight:bold;
16
- }
17
- div#itoggle p{
18
- color:#666;
19
- margin-bottom:10px;
20
- }
21
-
22
- div#console{
23
- display:none;
24
- position:absolute;
25
- top:8px;
26
- right:8px;
27
- width:160px;
28
- padding:6px 8px 8px 8px;
29
- text-align:right;
30
- background:#000;
31
- -moz-border-radius:6px;
32
- -webkit-border-radius:6px;
33
- background:url(/global/images/console.gif);
34
- }
35
- div#console p{
36
- margin:0;
37
- font-size:11px;
38
- font-family:"Courier New", Courier, monospace;
39
- }
40
-
41
- div#itoggle input.iT_checkbox_on{
42
- display:block !important;
43
- float:left;
44
- position:relative !important;
45
- top:-43px !important;
46
- left:100px !important;
47
- margin-bottom:-43px;
48
- }
49
-
50
- /* -----------------------------
51
- This is the important bit
52
- -------------------------------*/
53
-
54
- div#itoggle label.ilabel{
55
- display:block;
56
- font-size:12px;
57
- padding-bottom:10px;
58
- cursor:pointer;
59
- }
60
-
61
- div#itoggle label.itoggle,
62
- div#itoggle label.itoggle span{
63
- display: block;
64
- width: 93px;
65
- height: 27px;
66
- margin-bottom: 20px;
67
- background: url(../images/itoggle.png) left bottom no-repeat;
68
- cursor:pointer;
69
- text-indent:-5000px;
70
- }
71
- div#itoggle label.itoggle.iToff{
72
- background-position:right bottom;
73
- }
74
- div#itoggle label.itoggle span{
75
- background-position: left top;
76
- margin: 0;
77
- }
78
- div#itoggle input.iT_checkbox{
79
- position:absolute;
80
- top:-9999px;
81
- left:-9999px;
82
- }
83
-
84
- /*
85
- If you want the corners to be
86
- transparent, add these two lines
87
- to the main block above. Only
88
- works on webkit and mozilla browsers
89
- For more reliable results, make your
90
- own png using the supplied .psd
91
-
92
- -moz-border-radius:6px;
93
- -webkit-border-radius:6px;
1
+ /* ---------------------------------------------
2
+ TOGGLE.CSS
3
+ -----------------------------------------------*/
4
+
5
+ div#itoggle{
6
+ background:#FFF;
7
+ padding:20px 20px 0;
8
+ -moz-border-radius:10px;
9
+ -webkit-border-radius:10px;
10
+ color:#333;
11
+ }
12
+ div#itoggle h3{
13
+ margin-bottom:4px;
14
+ font-size: 14px;
15
+ font-weight:bold;
16
+ }
17
+ div#itoggle p{
18
+ color:#666;
19
+ margin-bottom:10px;
20
+ }
21
+
22
+ div#console{
23
+ display:none;
24
+ position:absolute;
25
+ top:8px;
26
+ right:8px;
27
+ width:160px;
28
+ padding:6px 8px 8px 8px;
29
+ text-align:right;
30
+ background:#000;
31
+ -moz-border-radius:6px;
32
+ -webkit-border-radius:6px;
33
+ background:url(/global/images/console.gif);
34
+ }
35
+ div#console p{
36
+ margin:0;
37
+ font-size:11px;
38
+ font-family:"Courier New", Courier, monospace;
39
+ }
40
+
41
+ div#itoggle input.iT_checkbox_on{
42
+ display:block !important;
43
+ float:left;
44
+ position:relative !important;
45
+ top:-43px !important;
46
+ left:100px !important;
47
+ margin-bottom:-43px;
48
+ }
49
+
50
+ /* -----------------------------
51
+ This is the important bit
52
+ -------------------------------*/
53
+
54
+ div#itoggle label.ilabel{
55
+ display:block;
56
+ font-size:12px;
57
+ padding-bottom:10px;
58
+ cursor:pointer;
59
+ }
60
+
61
+ div#itoggle label.itoggle,
62
+ div#itoggle label.itoggle span{
63
+ display: block;
64
+ width: 93px;
65
+ height: 27px;
66
+ margin-bottom: 20px;
67
+ background: url(../images/itoggle.png) left bottom no-repeat;
68
+ cursor:pointer;
69
+ text-indent:-5000px;
70
+ }
71
+ div#itoggle label.itoggle.iToff{
72
+ background-position:right bottom;
73
+ }
74
+ div#itoggle label.itoggle span{
75
+ background-position: left top;
76
+ margin: 0;
77
+ }
78
+ div#itoggle input.iT_checkbox{
79
+ position:absolute;
80
+ top:-9999px;
81
+ left:-9999px;
82
+ }
83
+
84
+ /*
85
+ If you want the corners to be
86
+ transparent, add these two lines
87
+ to the main block above. Only
88
+ works on webkit and mozilla browsers
89
+ For more reliable results, make your
90
+ own png using the supplied .psd
91
+
92
+ -moz-border-radius:6px;
93
+ -webkit-border-radius:6px;
94
94
  */
data/app/assets/stylesheets/refinery/widgets.scss CHANGED
@@ -33,6 +33,7 @@
33
33
  .type {
34
34
  margin-left: 20px;
35
35
  }
36
+ a { cursor: pointer; }
36
37
  }
37
38
  .clear {
38
39
  clear: both;
@@ -52,6 +53,7 @@ table.existing_widgets, table.select_template {
52
53
  border: 1px solid #CCC;
53
54
  }
54
55
  }
56
+ a { cursor: pointer; }
55
57
  }
56
58
 
57
59
  .sub-title { font-size: 0.9em; opacity: 0.8; }
data/app/controllers/refinery/widgets/admin/templates_controller.rb CHANGED
@@ -22,6 +22,11 @@ module Refinery
22
22
  end
23
23
  end
24
24
 
25
+ private
26
+ def template_params
27
+ params.require(:template).permit!
28
+ end
29
+
25
30
  end
26
31
  end
27
32
  end
data/app/decorators/controllers/refinery/admin/pages_controller.rb CHANGED
@@ -1,3 +1,10 @@
1
+ module WidgetsPagesController
2
+ private
3
+ def permitted_params
4
+ params.require(:page).permit!
5
+ end
6
+ end
7
+
1
8
  Refinery::Admin::PagesController.class_eval do
2
9
  before_filter :load_valid_templates, :only => [:edit, :new, :update, :create]
3
10
 
@@ -20,4 +27,7 @@ Refinery::Admin::PagesController.class_eval do
20
27
  end
21
28
  super
22
29
  end
30
+
31
+ prepend WidgetsPagesController
32
+
23
33
  end
data/app/decorators/models/refinery/page.rb CHANGED
@@ -1,5 +1,4 @@
1
1
  Refinery::Page.class_eval do
2
- attr_accessible :template_id
3
2
 
4
3
  belongs_to :template, class_name: 'Refinery::Widgets::Template'
5
4
 
@@ -20,7 +19,8 @@ Refinery::Page.class_eval do
20
19
  end
21
20
 
22
21
  def ordered_parts
23
- (::Refinery::Pages.default_parts.collect{|dp| parts.find{|p| p.title == dp } } + parts).uniq
22
+ (::Refinery::Pages.default_parts.collect{|dp| parts.find{|p| p.title == dp } } + parts)
23
+ .uniq.compact
24
24
  end
25
25
 
26
26
  def self.find_or_create_by_link_url!(link_url, options={})
data/app/decorators/models/refinery/page_part.rb CHANGED
@@ -1,10 +1,8 @@
1
1
  Refinery::PagePart.class_eval do
2
- has_many :widgets, class_name: 'Refinery::Widgets::Widget',
3
- as: :container, order: 'position'
2
+ has_many :widgets, -> { order(:position) },
3
+ class_name: 'Refinery::Widgets::Widget', as: :container
4
4
  accepts_nested_attributes_for :widgets, :allow_destroy => true
5
5
 
6
- attr_accessible :widgets_attributes, :locked
7
-
8
6
  def add_ref_widget_for!(widget)
9
7
  w = widget.dup_by_ref
10
8
  w.locked = true
data/app/models/refinery/widgets/content_block_widget.rb CHANGED
@@ -4,8 +4,6 @@ module Refinery
4
4
 
5
5
  acts_as_widget
6
6
 
7
- attr_accessible :content, :widget_id
8
-
9
7
  validates :content, :presence => true
10
8
 
11
9
  end
data/app/models/refinery/widgets/template.rb CHANGED
@@ -7,8 +7,6 @@ module Refinery
7
7
 
8
8
  has_many :pages, :class_name => 'Refinery::Page'
9
9
 
10
- attr_accessible :name, :position, :template_parts_attributes
11
-
12
10
  validates :name, :presence => true, :uniqueness => true
13
11
  before_validation :validate_widgets
14
12
 
data/app/models/refinery/widgets/template_part.rb CHANGED
@@ -3,13 +3,11 @@ module Refinery
3
3
  class TemplatePart < Refinery::Core::BaseModel
4
4
 
5
5
  belongs_to :template
6
- has_many :widgets, class_name: 'Refinery::Widgets::Widget',
7
- as: :container, order: 'position'
6
+ has_many :widgets, -> { order(:position) },
7
+ class_name: 'Refinery::Widgets::Widget', as: :container
8
8
 
9
9
  accepts_nested_attributes_for :widgets, :allow_destroy => true
10
10
 
11
- attr_accessible :name, :display, :locked, :widgets_attributes
12
-
13
11
  validates :name, :presence => true, :uniqueness => {:scope => 'template_id'}
14
12
 
15
13
  def sychronize_widgets!(page)
data/app/models/refinery/widgets/widget.rb CHANGED
@@ -8,9 +8,6 @@ module Refinery
8
8
 
9
9
 
10
10
  attr_accessor :widget_attributes
11
- attr_accessible :name, :position, :container_type, :container_id,
12
- :display, :master_id, :sub_type, :locked, :widget_attributes,
13
- :widget_id, :layout, :container, :reuse
14
11
 
15
12
  validate :validate_widget
16
13
 
data/app/views/refinery/admin/pages/_widget_fields.slim CHANGED
@@ -15,9 +15,11 @@
15
15
  - else
16
16
  = f.label :display, :class => 'inline'
17
17
  = f.check_box :display, :class => 'checkbox'
18
- = link_to_function(refinery_icon_tag('bin_closed'), 'removeWidget(this)', :title => "Remove widget" )
19
- = link_to_function(refinery_icon_tag('edit'), 'showWidgetEdit(this)', :title => "Edit widget" ) unless local_assigns.has_key?(:mode) && mode == 'edit'
20
- = link_to_function(refinery_icon_tag('zoom'), 'toggleWidget(this)', :title => "Toggle details")
18
+ = content_tag(:a, refinery_icon_tag('edit'), class: 'edit-widget',
19
+ title: 'Edit widget') unless local_assigns.has_key?(:mode) && mode == 'edit'
20
+ = content_tag(:a, refinery_icon_tag('bin_closed'), class: 'remove-widget',
21
+ title: 'Remove widget')
22
+ = content_tag(:a, refinery_icon_tag('zoom'), class: 'toggle-widget', title: 'Toggle details')
21
23
  .inner.clear style="margin-top:40px; #{'display:none;' if f.object.locked?}"
22
24
  .previewing style=("display:none;" if local_assigns.has_key?(:mode) && mode == 'edit')
23
25
  = f.fields_for f.object.widget_type.association_name do |j|
data/app/views/refinery/widgets/admin/templates/_widget_fields.slim CHANGED
@@ -9,8 +9,10 @@
9
9
  span.sub-title style = 'margin-left: 20px;' Used in #{pluralize (f.object.times_used-1), 'other place'}
10
10
  .right
11
11
  .icons
12
- = link_to_function(refinery_icon_tag('bin_closed'), 'removeWidget(this)', :title => "Remove widget" )
13
- = link_to_function(refinery_icon_tag('zoom'), 'toggleWidget(this)', :title => "Toggle details")
12
+ = content_tag(:a, refinery_icon_tag('bin_closed'), class: 'remove-widget',
13
+ title: 'Remove widget')
14
+ = content_tag(:a, refinery_icon_tag('zoom'), class: 'toggle-widget',
15
+ title: 'Toggle details')
14
16
  .inner.clear style="margin-top:40px;"
15
17
  .clear
16
18
  = f.hidden_field :sub_type
data/app/views/refinery/widgets/admin/templates/list.slim CHANGED
@@ -12,4 +12,6 @@ table.select_template
12
12
  td = template.name
13
13
  td = template.unlocked_template_parts.collect(&:name).to_sentence
14
14
  td = Refinery::Page.where(template_id: template.id).count
15
- td = link_to_function 'Use this template', "linkFromDialog('#{refinery.new_admin_page_path(parent_id: @parent_id, template_id: template.id)}')"
15
+ td = content_tag(:a, 'Use this template',
16
+ data: {'link-from-dialog' => refinery.new_admin_page_path(parent_id: @parent_id, template_id: template.id)},
17
+ class: 'dialog-link')
data/app/views/refinery/widgets/admin/widgets/new.slim CHANGED
@@ -27,6 +27,8 @@
27
27
  = widget.templates.collect{|p| p.name }.to_sentence
28
28
  td
29
29
  - if current_page?(refinery.url_for(action: 'page'))
30
- = link_to_function('Select', "selectExistingWidgetForPage(#{widget.id})")
30
+ = content_tag(:a, 'Select', class: 'select-widget-page',
31
+ data: {id: widget.id})
31
32
  - else
32
- = link_to_function('Select', "selectExistingWidgetForTemplate(#{widget.id})")
33
+ = content_tag(:a, 'Select', class: 'select-widget-template',
34
+ data: {id: widget.id})
data/lib/refinery/widgets/acts_as_widget.rb CHANGED
@@ -19,7 +19,6 @@ module Refinery
19
19
  Widget.class_eval do
20
20
  has_one widget_type.association_name.to_sym, class_name: widget_type.klass_as_string, dependent: :destroy
21
21
  accepts_nested_attributes_for widget_type.association_name.to_sym
22
- attr_accessible widget_type.attribute_param.to_sym
23
22
  end
24
23
  end
25
24
  end
data/lib/refinery/widgets/engine.rb CHANGED
@@ -19,7 +19,7 @@ module Refinery
19
19
  end
20
20
 
21
21
  Refinery::Core.configure do |config| # # Register extra javascript for backend
22
- config.register_javascript 'refinery/widgets.js.coffee.erb'
22
+ config.register_javascript 'refinery/widgets.js'
23
23
  config.register_javascript 'refinery/engage.itoggle-min.js'
24
24
  config.register_stylesheet "refinery/widgets", :media => 'screen'
25
25
  config.register_stylesheet "refinery/engage.itoggle", :media => 'screen'
metadata CHANGED
@@ -1,83 +1,84 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-llama_widgets
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Bolt
8
+ - Daniel King
8
9
  autorequire:
9
10
  bindir: bin
10
11
  cert_chain: []
11
- date: 2014-03-06 00:00:00.000000000 Z
12
+ date: 2014-06-20 00:00:00.000000000 Z
12
13
  dependencies:
13
14
  - !ruby/object:Gem::Dependency
14
15
  name: refinerycms-core
15
16
  requirement: !ruby/object:Gem::Requirement
16
17
  requirements:
17
- - - ~>
18
+ - - "~>"
18
19
  - !ruby/object:Gem::Version
19
- version: 2.1.0
20
+ version: 3.0.0.dev
20
21
  type: :runtime
21
22
  prerelease: false
22
23
  version_requirements: !ruby/object:Gem::Requirement
23
24
  requirements:
24
- - - ~>
25
+ - - "~>"
25
26
  - !ruby/object:Gem::Version
26
- version: 2.1.0
27
+ version: 3.0.0.dev
27
28
  - !ruby/object:Gem::Dependency
28
29
  name: refinerycms-nested_models
29
30
  requirement: !ruby/object:Gem::Requirement
30
31
  requirements:
31
- - - '>='
32
+ - - ">="
32
33
  - !ruby/object:Gem::Version
33
34
  version: '0'
34
35
  type: :runtime
35
36
  prerelease: false
36
37
  version_requirements: !ruby/object:Gem::Requirement
37
38
  requirements:
38
- - - '>='
39
+ - - ">="
39
40
  - !ruby/object:Gem::Version
40
41
  version: '0'
41
42
  - !ruby/object:Gem::Dependency
42
43
  name: slim-rails
43
44
  requirement: !ruby/object:Gem::Requirement
44
45
  requirements:
45
- - - '>='
46
+ - - ">="
46
47
  - !ruby/object:Gem::Version
47
48
  version: '0'
48
49
  type: :runtime
49
50
  prerelease: false
50
51
  version_requirements: !ruby/object:Gem::Requirement
51
52
  requirements:
52
- - - '>='
53
+ - - ">="
53
54
  - !ruby/object:Gem::Version
54
55
  version: '0'
55
56
  - !ruby/object:Gem::Dependency
56
57
  name: deface
57
58
  requirement: !ruby/object:Gem::Requirement
58
59
  requirements:
59
- - - ~>
60
+ - - "~>"
60
61
  - !ruby/object:Gem::Version
61
62
  version: 1.0.0
62
63
  type: :runtime
63
64
  prerelease: false
64
65
  version_requirements: !ruby/object:Gem::Requirement
65
66
  requirements:
66
- - - ~>
67
+ - - "~>"
67
68
  - !ruby/object:Gem::Version
68
69
  version: 1.0.0
69
70
  - !ruby/object:Gem::Dependency
70
71
  name: refinerycms-testing
71
72
  requirement: !ruby/object:Gem::Requirement
72
73
  requirements:
73
- - - ~>
74
+ - - "~>"
74
75
  - !ruby/object:Gem::Version
75
76
  version: 2.1.0
76
77
  type: :development
77
78
  prerelease: false
78
79
  version_requirements: !ruby/object:Gem::Requirement
79
80
  requirements:
80
- - - ~>
81
+ - - "~>"
81
82
  - !ruby/object:Gem::Version
82
83
  version: 2.1.0
83
84
  description: Ruby on Rails Widgets extension for Refinery CMS
@@ -86,87 +87,87 @@ executables: []
86
87
  extensions: []
87
88
  extra_rdoc_files: []
88
89
  files:
89
- - app/views/refinery/widgets/_content_block_widget.slim
90
- - app/views/refinery/widgets/admin/widget_types/show_for_template.slim
91
- - app/views/refinery/widgets/admin/widget_types/new_for_page.slim
92
- - app/views/refinery/widgets/admin/widget_types/show_for_page.slim
93
- - app/views/refinery/widgets/admin/widget_types/new_for_template.slim
94
- - app/views/refinery/widgets/admin/widgets/new.slim
95
- - app/views/refinery/widgets/admin/widgets/_content_block_widget.slim
96
- - app/views/refinery/widgets/admin/widgets/_content_block_widget_preview.slim
97
- - app/views/refinery/widgets/admin/widgets/_widget.slim
98
- - app/views/refinery/widgets/admin/widgets/_widget_preview.slim
99
- - app/views/refinery/widgets/admin/templates/edit.html.erb
100
- - app/views/refinery/widgets/admin/templates/new.html.erb
101
- - app/views/refinery/widgets/admin/templates/_page_part.slim
102
- - app/views/refinery/widgets/admin/templates/_widget_fields.slim
103
- - app/views/refinery/widgets/admin/templates/_records.html.erb
104
- - app/views/refinery/widgets/admin/templates/_page_parts.html.erb
105
- - app/views/refinery/widgets/admin/templates/index.html.erb
106
- - app/views/refinery/widgets/admin/templates/_template.html.erb
107
- - app/views/refinery/widgets/admin/templates/_templates.html.erb
108
- - app/views/refinery/widgets/admin/templates/_form.html.erb
109
- - app/views/refinery/widgets/admin/templates/_actions.html.erb
110
- - app/views/refinery/widgets/admin/templates/list.slim
111
- - app/views/refinery/widgets/admin/templates/_sortable_list.html.erb
112
- - app/views/refinery/widgets/_widget.slim
113
- - app/views/refinery/admin/pages/_form_page_parts.html.erb
114
- - app/views/refinery/admin/pages/_page_part.slim
115
- - app/views/refinery/admin/pages/_widget_fields.slim
116
- - app/views/refinery/admin/pages/_link_url.html.erb
117
- - app/views/refinery/admin/pages/_template_changer.html.erb
118
- - app/views/refinery/admin/pages/_form_actions.html.erb
119
- - app/controllers/refinery/widgets/admin/widget_types_controller.rb
120
- - app/controllers/refinery/widgets/admin/widgets_controller.rb
121
- - app/controllers/refinery/widgets/admin/templates_controller.rb
122
- - app/helpers/refinery/widgets/widgets_helper.rb
123
- - app/assets/images/refinery/itoggle.png
124
90
  - app/assets/images/refinery/icons/lock.png
91
+ - app/assets/images/refinery/itoggle.png
92
+ - app/assets/javascripts/refinery/engage.itoggle-min.js
93
+ - app/assets/javascripts/refinery/widgets.js.coffee.erb
125
94
  - app/assets/stylesheets/refinery/engage.itoggle.css
126
95
  - app/assets/stylesheets/refinery/widgets.scss
127
- - app/assets/javascripts/refinery/widgets.js.coffee.erb
128
- - app/assets/javascripts/refinery/engage.itoggle-min.js
96
+ - app/controllers/refinery/widgets/admin/templates_controller.rb
97
+ - app/controllers/refinery/widgets/admin/widget_types_controller.rb
98
+ - app/controllers/refinery/widgets/admin/widgets_controller.rb
129
99
  - app/decorators/controllers/refinery/admin/pages_controller.rb
130
100
  - app/decorators/controllers/refinery/pages_controller.rb
131
101
  - app/decorators/models/refinery/page.rb
132
102
  - app/decorators/models/refinery/page_part.rb
133
- - app/overrides/refinery/admin/pages/_form.rb
134
- - app/overrides/refinery/admin/pages/_page.rb
135
- - app/overrides/refinery/admin/pages/_form_page_parts.rb
136
- - app/overrides/refinery/admin/pages/_actions.rb
137
- - app/overrides/refinery/admin/pages/_form_advanced_options.rb
103
+ - app/helpers/refinery/widgets/widgets_helper.rb
104
+ - app/models/refinery/widgets/content_block_widget.rb
138
105
  - app/models/refinery/widgets/template.rb
139
106
  - app/models/refinery/widgets/template_part.rb
140
- - app/models/refinery/widgets/content_block_widget.rb
141
107
  - app/models/refinery/widgets/widget.rb
142
- - config/locales/sk.yml
143
- - config/locales/it.yml
144
- - config/locales/fr.yml
145
- - config/locales/tr.yml
146
- - config/locales/nl.yml
147
- - config/locales/es.yml
108
+ - app/overrides/refinery/admin/pages/_actions.rb
109
+ - app/overrides/refinery/admin/pages/_form.rb
110
+ - app/overrides/refinery/admin/pages/_form_advanced_options.rb
111
+ - app/overrides/refinery/admin/pages/_form_page_parts.rb
112
+ - app/overrides/refinery/admin/pages/_page.rb
113
+ - app/views/refinery/admin/pages/_form_actions.html.erb
114
+ - app/views/refinery/admin/pages/_form_page_parts.html.erb
115
+ - app/views/refinery/admin/pages/_link_url.html.erb
116
+ - app/views/refinery/admin/pages/_page_part.slim
117
+ - app/views/refinery/admin/pages/_template_changer.html.erb
118
+ - app/views/refinery/admin/pages/_widget_fields.slim
119
+ - app/views/refinery/widgets/_content_block_widget.slim
120
+ - app/views/refinery/widgets/_widget.slim
121
+ - app/views/refinery/widgets/admin/templates/_actions.html.erb
122
+ - app/views/refinery/widgets/admin/templates/_form.html.erb
123
+ - app/views/refinery/widgets/admin/templates/_page_part.slim
124
+ - app/views/refinery/widgets/admin/templates/_page_parts.html.erb
125
+ - app/views/refinery/widgets/admin/templates/_records.html.erb
126
+ - app/views/refinery/widgets/admin/templates/_sortable_list.html.erb
127
+ - app/views/refinery/widgets/admin/templates/_template.html.erb
128
+ - app/views/refinery/widgets/admin/templates/_templates.html.erb
129
+ - app/views/refinery/widgets/admin/templates/_widget_fields.slim
130
+ - app/views/refinery/widgets/admin/templates/edit.html.erb
131
+ - app/views/refinery/widgets/admin/templates/index.html.erb
132
+ - app/views/refinery/widgets/admin/templates/list.slim
133
+ - app/views/refinery/widgets/admin/templates/new.html.erb
134
+ - app/views/refinery/widgets/admin/widget_types/new_for_page.slim
135
+ - app/views/refinery/widgets/admin/widget_types/new_for_template.slim
136
+ - app/views/refinery/widgets/admin/widget_types/show_for_page.slim
137
+ - app/views/refinery/widgets/admin/widget_types/show_for_template.slim
138
+ - app/views/refinery/widgets/admin/widgets/_content_block_widget.slim
139
+ - app/views/refinery/widgets/admin/widgets/_content_block_widget_preview.slim
140
+ - app/views/refinery/widgets/admin/widgets/_widget.slim
141
+ - app/views/refinery/widgets/admin/widgets/_widget_preview.slim
142
+ - app/views/refinery/widgets/admin/widgets/new.slim
148
143
  - config/locales/cs.yml
149
- - config/locales/zh-CN.yml
150
144
  - config/locales/en.yml
145
+ - config/locales/es.yml
146
+ - config/locales/fr.yml
147
+ - config/locales/it.yml
151
148
  - config/locales/nb.yml
149
+ - config/locales/nl.yml
150
+ - config/locales/sk.yml
151
+ - config/locales/tr.yml
152
+ - config/locales/zh-CN.yml
152
153
  - config/routes.rb
153
- - db/seeds.rb
154
- - db/migrate/2_create_widgets_template_parts.rb
155
154
  - db/migrate/1_create_widgets_templates.rb
155
+ - db/migrate/2_create_widgets_template_parts.rb
156
+ - db/migrate/3_create_widgets_widgets.rb
156
157
  - db/migrate/4_create_widgets_content_block_widgets.rb
158
+ - db/migrate/5_add_template_id_to_refinery_pages.rb
157
159
  - db/migrate/6_add_locked_to_refinery_page_parts.rb
158
- - db/migrate/3_create_widgets_widgets.rb
159
160
  - db/migrate/7_add_reuse_to_refinery_widgets.rb
160
- - db/migrate/5_add_template_id_to_refinery_pages.rb
161
- - lib/tasks/refinery/widgets.rake
162
- - lib/refinery/widgets/configuration.rb
161
+ - db/seeds.rb
162
+ - lib/generators/refinery/templates/config/initializers/refinery/widgets.rb.erb
163
+ - lib/generators/refinery/widgets_generator.rb
164
+ - lib/refinery/widgets.rb
163
165
  - lib/refinery/widgets/acts_as_widget.rb
164
- - lib/refinery/widgets/widget_type.rb
166
+ - lib/refinery/widgets/configuration.rb
165
167
  - lib/refinery/widgets/engine.rb
166
- - lib/refinery/widgets.rb
168
+ - lib/refinery/widgets/widget_type.rb
167
169
  - lib/refinerycms-llama_widgets.rb
168
- - lib/generators/refinery/widgets_generator.rb
169
- - lib/generators/refinery/templates/config/initializers/refinery/widgets.rb.erb
170
+ - lib/tasks/refinery/widgets.rake
170
171
  homepage:
171
172
  licenses: []
172
173
  metadata: {}
@@ -176,17 +177,17 @@ require_paths:
176
177
  - lib
177
178
  required_ruby_version: !ruby/object:Gem::Requirement
178
179
  requirements:
179
- - - '>='
180
+ - - ">="
180
181
  - !ruby/object:Gem::Version
181
182
  version: '0'
182
183
  required_rubygems_version: !ruby/object:Gem::Requirement
183
184
  requirements:
184
- - - '>='
185
+ - - ">="
185
186
  - !ruby/object:Gem::Version
186
187
  version: '0'
187
188
  requirements: []
188
189
  rubyforge_project:
189
- rubygems_version: 2.0.14
190
+ rubygems_version: 2.2.2
190
191
  signing_key:
191
192
  specification_version: 4
192
193
  summary: Widgets extension for Refinery CMS