scrivito_icon_box_widget 1.1.11 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2238da868dd25dfee689a65e8968f627e287f5a7
-  data.tar.gz: d57f952fbe6d52df21bd2e13088466b0c79b88fb
+  metadata.gz: fad4a41b40ad05278b267d862712b764363e7b6b
+  data.tar.gz: 03d4bb7f0196c28cb476cd7b8b1c045bcb7b27d5
 SHA512:
-  metadata.gz: 519168ea086b93c627dae42fd5233086222661d48fcfc7bb786bd01257a89bd5bbd0fe957f2bf72ae5fd9aec4cbd6b60b3195e41a4567f238b0af2a6e063b393
-  data.tar.gz: f2e9ad02873e28d6e90934726ea10f5b5d48a3537eaaa4b8d065ad535c09d6cbc7794dbd3280fad7e464486e9e4c12c807fe0737b7b6654d0d18b0874783d2e8
+  metadata.gz: 2e1164ab0ce9af961794f9e43ee4c19a8f454061904154fe5e6dec0f8eca28c6f615bf9c73587d2fe5ae9abd6517c526489fade487730a2a4fc1b8d440280080
+  data.tar.gz: 64bd2b2116b43eb591631f08ab1f29ed0d1b7b8dd887d8689521fb61ae4f9f66b0981a337607778a1b31956a912a405ae85c0b527cca7ea081d8cbf5fc9b8bad

data/app/assets/stylesheets/scrivito_icon_box_widget.css

@@ -1,5 +1,4 @@
 /*
  *= require font-awesome
- *= require scrivito_advanced_editors
  *= require_tree ./scrivito_icon_box_widget
  */

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

@@ -17,7 +17,7 @@
   text-align: center;
 }
 
-.scrivito_dialog .button_list button[data-editor="scrivito-toggle-button"].icon-select {
+.scrivito_dialog .icon-select .toggle_button_list .scrivito-toggle-button {
   padding: 6px 18px;
   font-size: 10px;
   line-height: 10px;

data/app/models/icon_box_widget.rb

@@ -14,25 +14,33 @@ class IconBoxWidget < Widget
   end
 
   def self.icons
-    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'
-      }
+    IconBoxWidget.icon_list
+  end
+
+  def self.caption
+    elems = {}
+    IconBoxWidget.icon_list.each do |elem|
+      elems[elem] = "<i class='fa fa-#{elem}'></i>#{elem}".html_safe
     end
+    return elems
   end
 
-  def background_class
-    self.background_color
+  def background_classes
+    c = ["scrivito-icon-box"]
+    c << self.size
+    c << self.style
+    c << self.background_color
+    c.join(' ')
   end
 
-  private
-  def self.fallback_colors
-    %w(transparent black gray light-gray red green blue yellow)
+  def icon_classes
+    c = ["fa"]
+    c << "fa-#{self.icon}"
+    c << self.color
+    c.join(' ')
   end
 
+  private
   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

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

@@ -3,17 +3,17 @@
 <% end %>
 
 <%= scrivito_details_for 'Size' do %>
-  <%= scrivito_toggle_button_editor(widget, :size) %>
+  <%= scrivito_tag(:div, widget, :size) %>
 <% end %>
 
 <%= scrivito_details_for 'Style' do %>
-  <%= scrivito_toggle_button_editor(widget, :style) %>
+  <%= scrivito_tag(:div, widget, :style) %>
 <% end %>
 
 <%= scrivito_details_for 'Icon Color' do %>
-  <%= render 'scrivito_advanced_editors/color_picker', widget: widget, attribute: :color  %>
+  <%= scrivito_tag :div, widget, :color, data: {colors_list: scrivito_selectable_color_classes('icon_box_widget', 'color')} %>
 <% end %>
 
 <%= scrivito_details_for 'Background Color' do %>
-  <%= render 'scrivito_advanced_editors/color_picker', widget: widget, attribute: :background_color  %>
+  <%= scrivito_tag :div, widget, :background_color, data: {colors_list: scrivito_selectable_color_classes('icon_box_widget', 'background_color')} %>
 <% end %>

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

@@ -1,4 +1,6 @@
-<%= scrivito_toggle_button_editor(widget, attribute, IconBoxWidget.icons) %>
+<div class="icon-select">
+  <%= scrivito_tag(:div, widget, attribute, data: {toggle_button_list: IconBoxWidget.icons, toggle_button_caption: IconBoxWidget.caption}) %>
+</div>
 <hr />
 <h4>Icon not in List</h4>
 <div class="alert alert-info">

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

@@ -1,3 +1,3 @@
-<div class="scrivito-icon-box <%= widget.size %> <%= widget.style %> <%= widget.background_class %>">
-  <i class="fa fa-<%= widget.icon %> <%= widget.color %>"></i>
+<div class="<%= widget.background_classes %>">
+  <i class="<%= widget.icon_classes %>"></i>
 </div>

data/lib/scrivito_icon_box_widget/engine.rb

@@ -1,4 +1,3 @@
-require 'scrivito_advanced_editors'
 require 'font-awesome-rails'
 
 module ScrivitoIconBoxWidget

data/lib/scrivito_icon_box_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoIconBoxWidget
-  VERSION = "1.1.11"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_icon_box_widget
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.2.0
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: scrivito_advanced_editors
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +76,6 @@ files:
 - LICENSE
 - Rakefile
 - 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.scss
 - app/assets/stylesheets/scrivito_icon_box_widget/colors.css

data/app/assets/javascripts/scrivito_icon_box_widget.js

@@ -1 +0,0 @@
-//= require scrivito_advanced_editors