scrivito_advanced_editors 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af77a23fa670392e4bc74bc1d477b9909e05d519
-  data.tar.gz: 68308ab407999cc610bae5a09cd1c9b1bbe00225
+  metadata.gz: b27b6cd44c8c7986a24697828d93333a7b5a1488
+  data.tar.gz: 77e6a7c4bea27ba81948013f6672f6dd566d10c2
 SHA512:
-  metadata.gz: 01e13c2acf6de13c20d0826f7b7d66edfa2d9811424964363610569af2230de15c5bb6b7d8f5305d87573df766a87b1edff4eb770f97dc060f590fd715cb2a04
-  data.tar.gz: 2034a6ee9f968413784ebd9ebb946d78d7b8c1daba4eb40990afe2b1b6341a220b82d31a1aa30abad79d6a7c0121d41341c7d66ba994c00255e2f16d2419cfd1
+  metadata.gz: 7964f367f3909d6ae991e5150adc5a1da9919b27bbcf10d75e44a2cdc9680a08390f72ca2c47b1171d199091df1620ee2e390285d3e3df58167bb208e1bbaad7
+  data.tar.gz: a16d7ec6d09949fd94227c913f83bd10551ffc62fd738791b65096c2979f495939f45cacbda5b1990c3ae38e5abf30185410e85c1b404ec78b49f9874a83c8ba

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

@@ -10,10 +10,12 @@
 
       tab_list.on('click', 'li', function() {
         var target = $(this).data('panel-target');
-        $(target).siblings('.active').removeClass('active');
-        $(this).siblings('.active').removeClass('active');
-        $(target).addClass('active');
-        $(this).addClass('active');
+        if(!$(this).hasClass('inactive')) {
+          $(target).siblings('.active').removeClass('active');
+          $(this).siblings('.active').removeClass('active');
+          $(target).addClass('active');
+          $(this).addClass('active');
+        }
       });
     });
   });

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

@@ -0,0 +1,10 @@
+.scrivito_dialog .button_list button[data-editor="scrivito-toggle-button"].color-select {
+  padding: 3px;
+  font-size: 0px;
+  line-height: 10px;
+  width: 45px;
+  height: 45px;
+  &.none {
+    font-size: 10px;
+  }
+}

data/app/assets/stylesheets/scrivito_advanced_editors/{scrivito_dialog.css → scrivito_dialog.css.scss}

@@ -1,9 +1,9 @@
-.details-view abbr {
+.scrivito_dialog abbr {
   color: #444;
   font-size: 13px;
 }
 
-.details-view abbr:after {
+.scrivito_dialog abbr:after {
   content: "?";
 }
 
@@ -27,4 +27,13 @@
   background: #eee;
   padding: 10px;
   margin: 5px -10px -10px;
+}
+
+.scrivito_content_group {
+  h1,h2,h3,h4,h5,h6 {
+    small {
+      color: #bbb;
+      margin-left: 20px;
+    }
+  }
 }

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

@@ -8,28 +8,33 @@
   border-radius: 4px;
 }
 
-.tab-list li {
+.tab-list li[data-panel-target] {
   float: left;
-  padding: 5px 10px;
   cursor: pointer;
   background: #f3f3f3;
   color: #666;
   padding: 8px;
 }
 
-.tab-list li:hover {
+.tab-list li[data-panel-target]:hover {
   background: #fff;
 }
 
-.tab-list li.active {
+.tab-list li[data-panel-target].active {
   background: #444;
   color: #f3f3f3;
 }
 
-.tab-list li.active:hover {
+.tab-list li[data-panel-target].active:hover {
   background: #888;
 }
 
+.tab-list li.inactive {
+  color: #aaa;
+  float: left;
+  padding: 8px;
+}
+
 .tab-panels .tab-panel {
   display: none;
 }

data/app/helpers/scrivito_advanced_editors/scrivito_advanced_tag_helper.rb

@@ -39,7 +39,7 @@ module ScrivitoAdvancedEditors
 
     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
+      scrivito_tag(:button, obj, attribute, class: (content[:css] + " " + css_class(elem, active)), style: content[:style], data: data_attribute(content, type)) do
         content[:caption]
       end
     end
@@ -58,7 +58,7 @@ module ScrivitoAdvancedEditors
         content: color,
         caption: (color.present? ? color : 'no selection'),
         style: '',
-        css: color,
+        css: "color-select #{color == "" ? "none" : color}",
       }
     end
 
@@ -75,7 +75,8 @@ module ScrivitoAdvancedEditors
 
     def css_class(elem, active)
       return '' if active.nil?
-      return active == elem ? 'active' : '' if active.is_a? String
+      return active == elem[:content] ? 'active' : '' if elem.is_a? Hash
+      return active == elem ? 'active' : '' if elem.is_a? String
       active.include?(elem) ? 'active' : ''
     end
   end

data/lib/scrivito_advanced_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoAdvancedEditors
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_advanced_editors
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,9 +86,10 @@ files:
 - app/assets/javascripts/scripts/scrivito_toggle_button.js
 - app/assets/javascripts/scrivito_advanced_editors.js
 - app/assets/stylesheets/scrivito_advanced_editors.css
+- app/assets/stylesheets/scrivito_advanced_editors/color_picker.css.scss
 - 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_dialog.css.scss
 - 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