scrivito_advanced_editors 1.3.0 → 1.4.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ed94decf22d824ecbe0437780cdbaccdd4ca468
-  data.tar.gz: 5bbfbbc979e2cd4d9be1d474cb15612cc55c565d
+  metadata.gz: 461d4ae5a5653f43b8108eae56609267669d1b74
+  data.tar.gz: 9ef0e794d4535d7240b8631e2b9e600c0b241495
 SHA512:
-  metadata.gz: 5b13ba5c55d9c3a3877e27329c8926f8709e760a392d0e390e75b16d0cac140e4d0e3d070369a78974f3d4158ac96a496d1b7c30041ca023c810f84b976f5dec
-  data.tar.gz: c6be970fa52d38fcfdc5d4d54b26d9e83f697ba5765a528e61f29afb4c62c8cf6d04e29e9dbcb02ca839fc7ac140ac2d477114dccf9a52db8de70fcc6fc1a9b8
+  metadata.gz: 40e524e86d6d0818469095ff41139ad6ff4ac0eb7bf5e99cded5cd558a6c781eee9dcb528f205bce5d1268fc74cbc71a0baf752417e66a0cda7f6384a67ae0a7
+  data.tar.gz: f7a309248a87a7ec4194f18a540cc922d4377797d0af3b05c2162ba9f041fb8fbdaf3f351910aef9670a778112d1161f51abc91200268b2941868941ebf8f3b5

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

@@ -10,17 +10,19 @@
       if(with_text) $(scrivito_tag).addClass('with-text');
 
       $(scrivito_tag).addClass('scrivito_color_picker').html('');
-      return $.each(values, function(index, color) {
-        var css_class = (color === content) ? 'active' : 'inactive'
-        $('<button></button>')
-          .addClass('scrivito-color-select')
-          .addClass(color === "" ? "default" : color)
-          .addClass(color !== "" ? '' : 'transparent_bg')
-          .addClass(css_class)
-          .data('content', color)
-          .html('')
-          .appendTo($(scrivito_tag));
-      });
+
+      if(Array.isArray(values[0])) {
+        $.each(values, function(index, list) {
+          if(index > 0) $('<div class="clear"></div>').appendTo($(scrivito_tag));
+          if(list === null) {
+            $('<hr>').appendTo($(scrivito_tag));
+          } else {
+            ScrivitoColorPicker.buttons(list, content, scrivito_tag);
+          }
+        });
+      } else {
+        ScrivitoColorPicker.buttons(values, content, scrivito_tag);
+      }
     },
 
     clickFunction: function(event) {
@@ -32,6 +34,23 @@
 
       scrivito_tag.scrivito('save', text);
     },
+
+    buttons: function(values, content, scrivito_tag) {
+      $.each(values, function(index, color) {
+        var css_class = (color === content) ? 'active' : 'inactive'
+        ScrivitoColorPicker.button(color, css_class).appendTo($(scrivito_tag));
+      });
+    },
+
+    button: function(color, css_class) {
+      return $('<button></button>')
+        .addClass('scrivito-color-select')
+        .addClass(color === "" ? "default" : color)
+        .addClass(color !== "" ? '' : 'transparent_bg')
+        .addClass(css_class)
+        .data('content', color)
+        .html('')
+    }
   };
 
   scrivito.on('content', function() {

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

@@ -21,9 +21,9 @@
   overflow: hidden;
   position: relative;
   border: 0;
-  margin: 0 5px 0 0;
+  margin: 10px 10px 5px 0;
   box-shadow: 0 0 4px 1px rgba(0,0,0,0.1);
-  border-radius: 3px;
+  border-radius: 2px;
   background: transparent;
   top: -5px;
   outline: none;
@@ -33,6 +33,7 @@
   width: 55px;
   height: 55px;
   top: 0;
+  margin: 0px 5px 0px -5px;
 }
 
 .scrivito_dialog [data-colors-list] .scrivito-color-select.none {
@@ -64,6 +65,7 @@
   left: 0;
   right: 0;
   bottom: 0;
+  border-radius: 3px;
 }
 
 .scrivito_dialog [data-colors-list] .scrivito-color-select:after {
@@ -75,4 +77,5 @@
   left: 0;
   right: 0;
   bottom: 0;
-}
+  border-radius: 2px;
+}

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

@@ -0,0 +1,7 @@
+<%= link_to scrivito_path(obj), class: 'editing-button editing-blue', target: :_top do %>
+  <i class='scrivito_icon scrivito_icon_eye' style='font-size: 10px;'></i> Go to page
+<% end %>
+
+<%= link_to scrivito_path(obj).sub(/_scrivito_display_mode=\w+/,'_scrivito_display_mode=view'), class: 'editing-button editing-blue', target: :_blank do %>
+  <i class='scrivito_icon scrivito_icon_plus' style='font-size: 10px;'></i> Preview
+<% end %>

data/lib/scrivito_advanced_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoAdvancedEditors
-  VERSION = "1.3.0"
+  VERSION = "1.4.0.dev"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_advanced_editors
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0.dev
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,7 @@ files:
 - app/assets/stylesheets/scrivito_advanced_editors/textarea_editor.css
 - app/helpers/scrivito_advanced_editors/scrivito_advanced_tag_helper.rb
 - app/views/scrivito_advanced_editors/_create_obj.html.erb
+- app/views/scrivito_advanced_editors/_page_preview_buttons.html.erb
 - lib/scrivito_advanced_editors.rb
 - lib/scrivito_advanced_editors/engine.rb
 - lib/scrivito_advanced_editors/version.rb
@@ -114,9 +115,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5