locomotive_cms 2.0.0.rc9 → 2.0.0.rc10

data/vendor/assets/javascripts/locomotive/toggle.js

@@ -34,6 +34,7 @@
     }
 
     settings = $.extend({
+      toggle_width: 28,
       on_label  : 'Yes',
       on_label_color : '#333333',
       on_bg_color : '#8FE38D',
@@ -48,22 +49,22 @@
     }, settings);
 
     // FIXME (Didier Lafforgue) it works but it doesn't scale if we handle another locale
-    if (typeof I18nLocale != 'undefined' && I18nLocale == 'fr') {
+    if (typeof window.locale != 'undefined' && window.locale == 'fr') {
       settings.on_label = 'Oui';
       settings.off_label = 'Non';
     }
 
     function showUncheckedState(element) {
-      element.parent().prev().css("color",settings.off_label_color);
-      element.parent().next().css("color",settings.on_label_color);
+      element.parent().prev().css("color",settings.off_label_color).removeClass('on');
+      element.parent().next().css("color",settings.on_label_color).addClass('on');
       element.parent().css("background-color", settings.off_bg_color).removeClass('on');
       element.parent().parent().prev().removeAttr("checked").trigger('change');
       element.removeClass("left").addClass("right");
     }
 
     function showCheckedState(element) {
-      element.parent().prev().css("color",settings.on_label_color);
-      element.parent().next().css("color",settings.off_label_color);
+      element.parent().prev().css("color",settings.on_label_color).addClass('on');
+      element.parent().next().css("color",settings.off_label_color).removeClass('on');
       element.parent().css("background-color", settings.on_bg_color).addClass('on');
       element.parent().parent().prev().attr("checked", "checked").trigger('change');
       element.removeClass("right").addClass("left");
@@ -88,7 +89,7 @@
         });
 
       } else {
-        $(element).animate({marginLeft: '15px'}, 100,
+        $(element).animate({marginLeft: settings.toggle_width + 'px'}, 100,
 
         // callback function
         function(){
@@ -114,9 +115,9 @@
 
         // insert the new toggle markup
         if($(this).attr("checked") == "checked" || $(this).attr("checked") == true){
-          $(this).after('<div class="toggleSwitch"><span class="leftLabel">'+settings.on_label+'<\/span><div class="switchArea on" style="background-color: '+settings.on_bg_color+'"><span class="switchHandle left" style="margin-left: 15px;"><\/span><\/div><span class="rightLabel" style="color:#cccccc">'+settings.off_label+'<\/span><\/div>');
+          $(this).after('<div class="toggleSwitch"><span class="leftLabel on">'+settings.on_label+'<\/span><div class="switchArea on" style="background-color: '+settings.on_bg_color+'"><span class="switchHandle left" style="margin-left: ' + settings.toggle_width + 'px;"><\/span><\/div><span class="rightLabel" style="color:#cccccc">'+settings.off_label+'<\/span><\/div>');
         }else{
-          $(this).after('<div class="toggleSwitch"><span class="leftLabel" style="color:#cccccc;">'+settings.on_label+'<\/span><div class="switchArea" style="background-color: '+settings.off_bg_color+'"><span class="switchHandle right" style="margin-left:0px"><\/span><\/div><span class="rightLabel">'+settings.off_label+'<\/span><\/div>');
+          $(this).after('<div class="toggleSwitch"><span class="leftLabel" style="color:#cccccc;">'+settings.on_label+'<\/span><div class="switchArea" style="background-color: '+settings.off_bg_color+'"><span class="switchHandle right" style="margin-left:0px"><\/span><\/div><span class="rightLabel on">'+settings.off_label+'<\/span><\/div>');
         }
 
         // Bind the switchHandle click events to the internal toggle function

data/vendor/assets/stylesheets/locomotive/liquid_mode.css

@@ -1,9 +1,7 @@
 .cm-liquid-tag {
-  color: #32273f;
-  background: #ead9ff;
+  color: #660066;
 }
 
 .cm-liquid-variable {
-  color: #29739b;
-  background: #c2e0f0;
-}
+  color: #009999;
+}

data/vendor/assets/stylesheets/locomotive/toggle.css.scss

@@ -1,25 +1,48 @@
 @import "compass/css3";
 
 .toggleSwitch {
+  display: inline-block;
   position: relative;
-  top: 3px;
-  line-height: 14px;
+  top: 0px;
+  line-height: 18px;
 
-  span.leftLabel {
-    float: left;
+  span.leftLabel.on {
+    width: 29px;
+    left: 0px;
+    padding-left: 1px;
+    color: #fff !important;
+    @include single-text-shadow(rgba(0, 0, 0, 0.3), 0, -1px, 0px);
+  }
+
+  span.rightLabel.on {
+    width: 27px;
+    right: 0px;
+    padding-right: 1px;
+    color: #888 !important;
   }
 
   span.leftLabel, span.rightLabel {
-    line-height: 14px;
-    padding: 0 2px;
-    font-size: 11px;
+    position: absolute;
+    top: 0px;
+    width: 27px;
+
+    line-height: 18px;
+    font-size: 10px;
     font-weight: bold;
+    text-align: center;
+    text-transform: uppercase;
+
+    display: none;
+
+    &.on {
+      display: inline;
+    }
   }
 
   div.switchArea {
     float: left;
-    width: 32px;
-    height: 12px;
+    width: 54px;
+    height: 16px;
     cursor: pointer;
 
     border: 1px solid #a3a3a3;
@@ -37,7 +60,7 @@
     position: relative;
     top: -1px;
     display: block;
-    width: 16px;
+    width: 25px;
     height: 100%;
     cursor: pointer;
     cursor: hand;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc9
+  version: 2.0.0.rc10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: 2.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.9
+        version: 2.4.12
 - !ruby/object:Gem::Dependency
   name: locomotive-mongoid-tree
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc12
+        version: 2.0.0.rc13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc12
+        version: 2.0.0.rc13
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -304,17 +304,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: formtastic
   requirement: !ruby/object:Gem::Requirement
@@ -705,6 +705,7 @@ files:
 - app/assets/javascripts/locomotive/views/shared/fields/file_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee
+- app/assets/javascripts/locomotive/views/shared/fields/select_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/form_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/list_item_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/list_view.js.coffee
@@ -751,7 +752,6 @@ files:
 - app/assets/stylesheets/locomotive/backoffice/datepicker.css.scss
 - app/assets/stylesheets/locomotive/backoffice/dialog_changes.css.scss
 - app/assets/stylesheets/locomotive/backoffice/editable_elements.css.scss
-- app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.css
 - app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss
 - app/assets/stylesheets/locomotive/backoffice/layout.css.scss
 - app/assets/stylesheets/locomotive/backoffice/menu/_colors.css.scss
@@ -901,6 +901,7 @@ files:
 - app/views/locomotive/current_site/_form.html.haml
 - app/views/locomotive/current_site/edit.html.haml
 - app/views/locomotive/custom_fields/_form.html.haml
+- app/views/locomotive/custom_fields/_select_templates.html.haml
 - app/views/locomotive/custom_fields/types/_belongs_to.html.haml
 - app/views/locomotive/custom_fields/types/_boolean.html.haml
 - app/views/locomotive/custom_fields/types/_date.html.haml
@@ -1163,7 +1164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2595751512290909456
+      hash: 874381137118230470
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: