scrivito_advanced_editors 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6812757790c4b39db1e079941b07335eeb49d689
-  data.tar.gz: d153d49a8623dd765c6f5a9a765cb733e8e52c79
+  metadata.gz: b51dfae24a2825a862c6e7eaa6e333335834b705
+  data.tar.gz: 17687e42c503593f89216d0e9514848e553d1994
 SHA512:
-  metadata.gz: 8b13224bfbac76e597ff861d7a8358f5dffd35fd80c298ec19dd499a0624ff8c9832c165608ee786346d3f9249a2aa9f7a40c5b241f29246f95de16ab7ef5959
-  data.tar.gz: e06893831b87eedfe44ff79e625d6d853714d278f3632435acab762060a1d7be1e79e02adbaf2dec54df2e8380972fe84d37554b04c2babb43e0fc3b0848bbf5
+  metadata.gz: 02307b30f93e3823a72602f7e9d5a92050a9fadd9110ad0cb46b461080684bd063aa6ac447c9731857cc02c065acec20cde5111db94a65e9039611208c675f60
+  data.tar.gz: 9f80b016caace20101fe72d5dae4afca54135cc6106f9f558134e011d8bc33738ca33ffaac0d5b464dafb51ae7fbaea4729604b57d190f31e8127d1c15cc5e6a

data/app/assets/javascripts/scripts/scrivito_dialog.js

@@ -3,11 +3,11 @@
 
   $(function() {
     scrivito.on('content', function(content) {
-      $(content).find('[data-scrivito-tab-toggle-details]').on('click', function() {
-        var tab_details_link = $(this);
-        var tab_details_id = tab_details_link.attr('data-scrivito-tab-toggle-details');
-        var tab_details = tab_details_link.parent().find('.scrivito-tab-details-'+tab_details_id);
-        tab_details.toggle();
+      $(content).find('[data-scrivito-toggle-details]').on('click', function() {
+        var details_link = $(this);
+        var details_id = details_link.data('scrivito-toggle-details');
+        var details = details_link.parent().find('.scrivito-details-' + details_id);
+        details.toggle();
         return false;
       });
     });

data/app/assets/javascripts/scripts/scrivito_list_editor.js

@@ -5,14 +5,15 @@
     App.ScrivitoListEditor = {
       // set selector for Editor
       selector: "[data-editor='scrivito-list-editor']",
-      
+
       // Function that will be called on scrivito load
       initFunction: function() { },
-      
+
       // set function triggert on click
       clickFunction: function(scrivito_tag, text, delimiter) {
         var delimiter = $(scrivito_tag).data('delimiter') || '|';
-        return scrivito_tag.scrivito('save', text.join(delimiter));
+        var content = scrivito_tag.data('scrivito-field-type') == 'string' ? text.join(delimiter) : text;
+        return scrivito_tag.scrivito('save', content);
       },
     };
 
@@ -22,8 +23,9 @@
         var elems = $(ScrivitoListEditor.selector);
         $.each(elems, function(index, elem) {
           var delimiter = $(elem).data('delimiter') || '|';
+          var content = $(elem).data('scrivito-field-type') == 'string' ? $(elem).html().split(delimiter) : $(elem).scrivito('content');
           $(elem).tagEditor({
-            initialTags: $(elem).html().split(delimiter),
+            initialTags: content,
             delimiter: delimiter,
             forceLowercase: false,
             maxLength: 1000,

data/app/assets/javascripts/scripts/scrivito_multi_select_button.js

@@ -0,0 +1,47 @@
+(function($, App) {
+  'use strict';
+
+  $(function() {
+
+    App.ScrivitoMultiSelectButton = {
+      // set selector for Editor
+      selector: "[data-editor='scrivito-multi-select-button']",
+
+      // Function that will be called on scrivito load
+      initFunction: function() {},
+
+      // set function triggert on click
+      clickFunction: function(scrivito_tag) {
+        var content = scrivito_tag.data('content');
+        //var text = scrivito_tag.scrivito('content');
+        var buttons = scrivito_tag.parent().find('button');
+
+        var text = [];
+        $.each(buttons, function(index, elem) {
+          var button = $(elem);
+          if(button.hasClass('active')) text.push(button.data('content'));
+        });
+
+        if(scrivito_tag.hasClass('active')) {
+          text.splice( text.indexOf(content), 1 );
+        } else {
+          text.push(content);
+        }
+
+        scrivito_tag.toggleClass('active');
+
+        return scrivito_tag.scrivito('save', text);
+      },
+    };
+
+    // Set click event
+    scrivito.on('load', function() {
+      if(scrivito.in_editable_view()) {
+        return $('body').on('click', ScrivitoMultiSelectButton.selector, function(event) {
+          ScrivitoMultiSelectButton.clickFunction($(event.target));
+        });
+      }
+    });
+  });
+
+})(jQuery, this);

data/app/assets/stylesheets/scrivito_advanced_editors/scrivito_dialog.css

@@ -7,24 +7,24 @@
   content: "?";
 }
 
-.scrivito-tab-title-details {
+.scrivito-title-details {
   background: #ddd;
   padding: 10px;
   margin-bottom: 2px;
 }
 
-.scrivito-tab-title-details h4 {
+.scrivito-title-details h4 {
   display: inline;
 }
 
-[data-scrivito-tab-toggle-details] {
+[data-scrivito-toggle-details] {
   font-size: 12px;
   padding-left: 5px;
 }
 
-[class^=scrivito-tab-details-] {
+[class^=scrivito-details-] {
   display: none;
   background: #eee;
   padding: 10px;
-  margin-top: 5px;
+  margin: 5px -10px -10px;
 }

data/app/assets/stylesheets/scrivito_advanced_editors/scrivito_mutli_select_button.css.scss

@@ -0,0 +1,32 @@
+.scrivito_dialog .button_list button[data-editor="scrivito-multi-select-button"] {
+  margin: 4px 0;
+  min-width: 28px;
+  text-shadow: 0 0 2px #222;
+  background: #444;
+  color: #fff;
+  outline: none !important;
+  border: none;
+  box-shadow: 0 0 5px rgba(0, 0, 0, 0.2);
+  font-size: 15px;
+  border-radius: 0;
+  line-height: 15px;
+  width: initial;
+  float: left;
+  &:first-child {
+    margin-left: 4px;
+    border-radius: 5px 0 0 5px;
+  }
+  &:last-child {
+    margin-right: 4px;
+    border-radius: 0 5px 5px 0;
+  }
+}
+
+.scrivito_dialog .button_list button[data-editor='scrivito-multi-select-button']:hover {
+  background: #888;
+}
+
+.scrivito_dialog .button_list button[data-editor='scrivito-multi-select-button'].active {
+  box-shadow: 0 0px 5px rgba(0,0,0,0.4) inset;
+  background: #888;
+}

data/app/helpers/scrivito_advanced_editors/scrivito_advanced_tag_helper.rb

@@ -1,42 +1,71 @@
 module ScrivitoAdvancedEditors
   module ScrivitoAdvancedTagHelper
 
+    def scrivito_multi_select_button_editor(obj, attribute, list=nil)
+      scrivito_button_editor(obj, attribute, 'select', list)
+    end
+
     def scrivito_toggle_button_editor(obj, attribute, list=nil)
+      scrivito_button_editor(obj, attribute, 'toggle', list)
+    end
+
+    def scrivito_button_editor(obj, attribute, type, list=nil)
       list = enum_list(obj, attribute) if list.nil?
 
       buttons = if block_given?
         list.map { |elem| yield(elem) }.join('').html_safe
       else
-        list.map { |elem| fallback_toggle_button(obj, attribute, elem, obj.send(attribute)) }.join('').html_safe
+        list.map { |elem| fallback_toggle_button(obj, attribute, elem, obj.send(attribute), type) }.join('').html_safe
       end
 
       content_tag :div, buttons, class: 'button_list'
     end
 
     def scrivito_selectable_color_classes(class_name, attribute)
-      if Obj.respond_to?('selectable_color_classes')
+      colors = if Obj.respond_to?('selectable_color_classes')
         Obj.selectable_color_classes(class_name, attribute)
       else
         fallback_colors
       end
+
+      colors.map { |color| color_hash(color) }
     end
 
     private
 
     def fallback_colors
-      %w(transparent black gray light-gray red green blue yellow)
+      ['','transparent', 'black', 'gray', 'light-gray', 'red', 'green', 'blue', 'yellow']
     end
 
-    def fallback_toggle_button(obj, attribute, elem, active)
-      scrivito_tag(:button, obj, attribute, class: css_class(elem, active), data: data_attribute(elem)) do
-        elem.to_s
+    def fallback_toggle_button(obj, attribute, elem, active, type)
+      content = elem.is_a?(Hash) ? elem : content_hash(elem)
+      scrivito_tag(:button, obj, attribute, class: (css_class(elem, active,) + content[:css]), style: content[:style], data: data_attribute(content, type)) do
+        content[:caption]
       end
     end
 
-    def data_attribute(elem)
+    def content_hash(elem)
       {
-        editor: 'scrivito-toggle-button',
         content: elem,
+        caption: (elem.present? ? elem.to_s : 'none'),
+        style: '',
+        css: ''
+      }
+    end
+
+    def color_hash(color)
+      {
+        content: color,
+        caption: (color.present? ? color : 'no selection'),
+        style: '',
+        css: color,
+      }
+    end
+
+    def data_attribute(elem, type)
+      {
+        editor: (type == 'toggle' ? 'scrivito-toggle-button' : 'scrivito-multi-select-button'),
+        content: elem[:content],
       }
     end
 
@@ -45,7 +74,9 @@ module ScrivitoAdvancedEditors
     end
 
     def css_class(elem, active)
-      elem.to_s == active ? 'active' : ''
+      return '' if active.nil?
+      return active == elem ? 'active' : '' if active.is_a? String
+      active.include?(elem) ? 'active' : ''
     end
   end
 end

data/app/views/scrivito_advanced_editors/_color_picker.html.erb

@@ -1,5 +1 @@
-<%= scrivito_toggle_button_editor(widget, attribute, scrivito_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 %>
+<%= scrivito_toggle_button_editor(widget, attribute, scrivito_selectable_color_classes(widget.class.to_s, attribute)) %>

data/lib/scrivito_advanced_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoAdvancedEditors
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_advanced_editors
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - app/assets/javascripts/scripts/jquery.tag-editor.min.js
 - app/assets/javascripts/scripts/scrivito_dialog.js
 - app/assets/javascripts/scripts/scrivito_list_editor.js
+- app/assets/javascripts/scripts/scrivito_multi_select_button.js
 - app/assets/javascripts/scripts/scrivito_tabs.js
 - app/assets/javascripts/scripts/scrivito_textarea_editor.js
 - app/assets/javascripts/scripts/scrivito_toggle_button.js
@@ -88,6 +89,7 @@ files:
 - app/assets/stylesheets/scrivito_advanced_editors/create_obj.css
 - app/assets/stylesheets/scrivito_advanced_editors/jquery.tag-editor.css
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_dialog.css
+- app/assets/stylesheets/scrivito_advanced_editors/scrivito_mutli_select_button.css.scss
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_tabs.css
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_toggle_button.css
 - app/assets/stylesheets/scrivito_advanced_editors/textarea_editor.css.scss