scrivito_icon_box_widget 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a0952f6ddd8a3a553e8ad7b0b82171f641e91ce
-  data.tar.gz: 8e75d4f137769f0fb297e4a5f6c5d11ecc0727ca
+  metadata.gz: 7ddc0eb20a5de97b103b7e533562806c4fc5bea9
+  data.tar.gz: db179fb44f157e290c2e048b215c7cf5c6595b6e
 SHA512:
-  metadata.gz: ed7fd535f48d4a4338a6299ab30658a844ee6f81c9d0122f74ccd53ed8b204f7ea78fca47e366f8cc01bbd067183ed07536fb7817ef6b388fdcda0f9f0e61c35
-  data.tar.gz: 1af74c4af2d52f5ce4e4f57c7267d120a403229941f1c6e1489165fff266c310dc4beb5e3244684aa5938749fb1ff47d867e0f2138aa99b9edcf544da4571ab6
+  metadata.gz: 578c25c3afd8e626e19c77716fb1e7efe71e9efa47f17fb5b3c9b921b6b2a5f094fa2250ea5045384ee96d9a61d231d712e9f83e0b32445439a18109677d5055
+  data.tar.gz: e4cff782d8c8ea74d38568c40e1398633d0efed9bf05ce1ecb085e242d39ddef71776b3abf1e406881c4cf2bcffb2c4af5d986680a3ac2071788f83464223c3b

data/app/assets/stylesheets/scrivito_icon_box_widget/base.css.scss

@@ -0,0 +1,31 @@
+.scrivito-icon-box {
+  overflow: hidden;
+  margin: 10px auto;
+  padding: 10px;
+  width: 70px;
+  height: 70px;
+  box-sizing: initial;
+  -webkit-box-sizing: initial;
+  -moz-box-sizing: initial;
+}
+
+.scrivito-icon-box i {
+  margin: 10px 0;
+  font-size: 50px;
+  line-height: 50px;
+  width: 100%;
+  text-align: center;
+}
+
+.scrivito_dialog .button_list button[data-editor="scrivito-toggle-button"].icon-select {
+  padding: 6px 18px;
+  font-size: 10px;
+  line-height: 10px;
+  width: 81px;
+  height: 51px;
+  .fa {
+    font-size: 20px;
+    display: block;
+    margin-bottom: 4px;
+  }
+}

data/app/assets/stylesheets/scrivito_icon_box_widget/widget.css

@@ -15,7 +15,7 @@
 
 .scrivito-icon-box.circle,
 .scrivito-icon-box.filled-circle {
-  border-radius: 70px;
+  border-radius: 50%;
   text-align: center;
 }
 
@@ -29,21 +29,18 @@
 .scrivito-icon-box.small i {
   font-size: 30px;
   height: 30px;
-  width: 30px;
   line-height: 30px;
 }
 
 .scrivito-icon-box.medium i {
   font-size: 50px;
   height: 50px;
-  width: 50px;
   line-height: 50px;
 }
 
 .scrivito-icon-box.large i {
   font-size: 70px;
   height: 70px;
-  width: 70px;
   line-height: 70px;
 }
 

data/app/models/icon_box_widget.rb

@@ -1,9 +1,9 @@
 class IconBoxWidget < Widget
-  attribute :icon, :string
+  attribute :icon, :string, default: 'leaf'
   attribute :color, :string
   attribute :background_color, :string
-  attribute :size, :enum, values: ["small","medium","large"]
-  attribute :style, :enum, values: ["circle","square","filled-circle","filled-square"]
+  attribute :size, :enum, values: ["small","medium","large"], default: 'large'
+  attribute :style, :enum, values: ["circle","square","filled-circle","filled-square"], default: 'circle'
 
   def selectable_color_classes(class_name, attribute)
     if Obj.respond_to?('selectable_color_classes')
@@ -14,15 +14,26 @@ class IconBoxWidget < Widget
   end
 
   def self.icons
-    ["none", "plus","minus","warning","paw","send","car","sliders","tree","bell","certificate","cloud","comment","dashboard","female","male","flag","globe","heart","leaf","plane","refresh","rocket","question","star","unlock"]
+    IconBoxWidget.icon_list.map do |icon|
+      {
+        content: icon,
+        caption: "<i class='fa fa-#{icon}'></i>#{icon.present? ? icon : 'none'}".html_safe,
+        style: '',
+        css: 'icon-select'
+      }
+    end
   end
 
   def background_class
     self.background_color
   end
 
-  private 
+  private
   def self.fallback_colors
     %w(transparent black gray light-gray red green blue yellow)
   end
+
+  def self.icon_list
+    ["none", "plus","minus","warning","paw","send","car","sliders","tree","bell","certificate","cloud","comment","dashboard","female","male","flag","globe","heart","leaf","plane","refresh","rocket","question","star","unlock"]
+  end
 end

data/app/views/icon_box_widget/details.html.erb

@@ -11,9 +11,9 @@
 <% end %>
 
 <%= scrivito_details_for 'Icon Color' do %>
-  <%= render 'icon_box_widget/partials/color_picker', widget: widget, attribute: :color %>
+  <%= render 'scrivito_advanced_editors/color_picker', widget: widget, attribute: :background_color  %>
 <% end %>
 
 <%= scrivito_details_for 'Background Color' do %>
-  <%= render 'icon_box_widget/partials/color_picker', widget: widget, attribute: :background_color %>
+  <%= render 'scrivito_advanced_editors/color_picker', widget: widget, attribute: :background_color  %>
 <% end %>

data/app/views/icon_box_widget/partials/_icons_picker.html.erb

@@ -1,8 +1,4 @@
-<%= scrivito_toggle_button_editor(widget, attribute, IconBoxWidget.icons) do |elem|
-  scrivito_tag(:button, widget, attribute, class: elem == widget.send(attribute) ? 'active' : '', data: {editor: 'scrivito-toggle-button', content: elem}) do
-    content_tag(:i, '', :class => "fa fa-#{elem}") + " " + elem
-  end
-end %>
+<%= scrivito_toggle_button_editor(widget, attribute, IconBoxWidget.icons) %>
 <hr />
 <h4>Icon not in List</h4>
 <div class="alert alert-info">

data/lib/scrivito_icon_box_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoIconBoxWidget
-  VERSION = "1.1.9"
+  VERSION = "1.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_icon_box_widget
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,12 +92,11 @@ files:
 - app/assets/images/widget_preview_icon.png
 - app/assets/javascripts/scrivito_icon_box_widget.js
 - app/assets/stylesheets/scrivito_icon_box_widget.css
-- app/assets/stylesheets/scrivito_icon_box_widget/base.css
+- app/assets/stylesheets/scrivito_icon_box_widget/base.css.scss
 - app/assets/stylesheets/scrivito_icon_box_widget/colors.css
 - app/assets/stylesheets/scrivito_icon_box_widget/widget.css
 - app/models/icon_box_widget.rb
 - app/views/icon_box_widget/details.html.erb
-- app/views/icon_box_widget/partials/_color_picker.html.erb
 - app/views/icon_box_widget/partials/_icons_picker.html.erb
 - app/views/icon_box_widget/show.html.erb
 - app/views/icon_box_widget/thumbnail.html.erb
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Widget for scrivito to display an icon in a box.

data/app/assets/stylesheets/scrivito_icon_box_widget/base.css

@@ -1,17 +0,0 @@
-.scrivito-icon-box {
-  overflow: hidden;
-  margin: 10px auto;
-  padding: 10px;
-  width: 70px;
-  height: 70px;
-  box-sizing: initial;
-  -webkit-box-sizing: initial;
-  -moz-box-sizing: initial;
-}
-
-.scrivito-icon-box i {
-  margin: 10px;
-  font-size: 50px;
-  line-height: 50px;
-  text-align: center;
-}

data/app/views/icon_box_widget/partials/_color_picker.html.erb

@@ -1,5 +0,0 @@
-<%= scrivito_toggle_button_editor(widget, attribute, widget.selectable_color_classes(widget.class.to_s, attribute)) do |elem|
-  scrivito_tag(:button, widget, attribute, class: "#{elem == widget.send(attribute) ? 'active' : ''} #{elem}", data: {editor: 'scrivito-toggle-button', content: elem}) do
-    elem
-  end
-end %>