- added new toggle button for lazy "update" or "update + delete old" signatures, closed #445

- updated js plugin "bootstrap-toggle"
- some button CSS changes

js/app.js

@@ -53,7 +53,7 @@ requirejs.config({
         blueImpGalleryHelper: 'lib/blueimp-helper',                     // helper function for Blue Imp Gallery
         blueImpGalleryBootstrap: 'lib/bootstrap-image-gallery',         // v3.4.2 Bootstrap extension for Blue Imp Gallery - https://blueimp.github.io/Bootstrap-Image-Gallery
         bootstrapConfirmation: 'lib/bootstrap-confirmation',            // v1.0.5 Bootstrap extension for inline confirm dialog - https://github.com/tavicu/bs-confirmation
-        bootstrapToggle: 'lib/bootstrap2-toggle.min',                   // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com
+        bootstrapToggle: 'lib/bootstrap-toggle.min',                    // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com
         lazyload: 'lib/jquery.lazyload.min',                            // v1.9.5 LazyLoader images - http://www.appelsiini.net/projects/lazyload
         sortable: 'lib/sortable.min',                                   // v1.6.0 Sortable - drag&drop reorder - https://github.com/rubaxa/Sortable
 

js/app/ui/dialog/account_settings.js

@@ -200,7 +200,7 @@ define([
                     off: 'Disable&nbsp;<i class="fa fa-fw fa-ban"></i>',
                     onstyle: 'success',
                     offstyle: 'warning',
-                    width: 90,
+                    width: 100,
                     height: 30
                 });
 

js/app/ui/system_signature.js

@@ -36,6 +36,7 @@ define([
         signatureScannedProgressBarClass: 'pf-system-progress-scanned',         // class for signature progress bar
 
         // toolbar
+        sigTableLazyToggleButtonClass: 'pf-sig-table-lazy-button',              // class for "lazy update" toggle button
         sigTableClearButtonClass: 'pf-sig-table-clear-button',                  // class for "clear" signatures button
 
         // signature table
@@ -970,19 +971,19 @@ define([
 
             if( clearButton.is(':hidden') ){
                 // show button
-                clearButton.velocity('transition.bounceIn', {
-                    duration: 180
+                clearButton.velocity('transition.expandIn', {
+                    duration: 100
                 });
             }else{
                 // highlight button
                 clearButton.velocity('callout.pulse', {
-                    duration: 240
+                    duration: 200
                 });
             }
         }else{
             // hide button
-            clearButton.velocity('transition.bounceOut', {
-                duration: 180
+            clearButton.velocity('transition.expandOut', {
+                duration: 100
             });
         }
     };
@@ -1053,6 +1054,12 @@ define([
                     checkDeleteSignaturesButton(moduleElement);
                 }
             })
+        ).append(
+            $('<input>', {
+                type: 'checkbox',
+                class: [config.sigTableLazyToggleButtonClass, 'btn-labeled'].join(' '),
+                value: 1,
+            }).attr('data-toggle', 'toggle')
         ).append(
             getLabledButton({
                 type: 'danger',
@@ -1078,6 +1085,24 @@ define([
 
         moduleElement.append(tableToolbar);
 
+        // "lazy update" toggle button --------------------------------------------------------------------------------
+        let lazyToggleCheckbox = moduleElement.find('.' + config.sigTableLazyToggleButtonClass).bootstrapToggle({
+            size: 'small' ,
+            on: '<i class="fa fa-fw fa-exchange"></i>&nbsp;&nbsp;lazy&nbsp;delete',
+            off: '<i class="fa fa-fw fa-clipboard"></i>&nbsp;&nbsp;lazy&nbsp;update',
+            onstyle: 'warning' ,
+            offstyle: 'default' ,
+            width: 110
+        });
+
+        let lazyToggleButton = lazyToggleCheckbox.parent();
+        lazyToggleButton.find('.toggle-on').attr('title', 'lazy \'update\' and \'delete\' old<br>from clipboard |ctrl&nbsp;+&nbsp;v|');
+        lazyToggleButton.find('.toggle-off').attr('title', 'lazy \'update\' signatures<br>from clipboard |ctrl&nbsp;+&nbsp;v|');
+        lazyToggleButton.initTooltips({
+            container: 'body',
+            html: true
+        });
+
         // add toolbar action for table -------------------------------------------------------------------------------
         let tableToolbarAction = $('<div>', {
             class: config.tableToolsActionClass
@@ -2327,7 +2352,12 @@ define([
 
         // event listener for global "paste" signatures into the page -------------------------------------------------
         moduleElement.on('pf:updateSystemSignatureModuleByClipboard', function(e, clipboard){
-            $(this).updateSignatureTableByClipboard(systemData, clipboard, {});
+            // check "lazy update" toggle button
+            let signatureOptions = {
+                deleteOld: moduleElement.find('.' + config.sigTableLazyToggleButtonClass).is(':checked') ? 1 : 0
+            };
+
+            $(this).updateSignatureTableByClipboard(systemData, clipboard, signatureOptions);
         });
     };
 

js/lib/bootstrap-toggle.min.js

@@ -0,0 +1,8 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);

js/lib/bootstrap2-toggle.min.js

@@ -1,8 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-large":"small"===this.options.size?"btn-small":"mini"===this.options.size?"btn-mini":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.width(),d.width())+e.outerWidth()/2,i=this.options.height||Math.max(c.height(),d.height());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);

public/js/v1.3.1/app.js

@@ -53,7 +53,7 @@ requirejs.config({
         blueImpGalleryHelper: 'lib/blueimp-helper',                     // helper function for Blue Imp Gallery
         blueImpGalleryBootstrap: 'lib/bootstrap-image-gallery',         // v3.4.2 Bootstrap extension for Blue Imp Gallery - https://blueimp.github.io/Bootstrap-Image-Gallery
         bootstrapConfirmation: 'lib/bootstrap-confirmation',            // v1.0.5 Bootstrap extension for inline confirm dialog - https://github.com/tavicu/bs-confirmation
-        bootstrapToggle: 'lib/bootstrap2-toggle.min',                   // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com
+        bootstrapToggle: 'lib/bootstrap-toggle.min',                    // v2.2.0 Bootstrap Toggle (Checkbox) - http://www.bootstraptoggle.com
         lazyload: 'lib/jquery.lazyload.min',                            // v1.9.5 LazyLoader images - http://www.appelsiini.net/projects/lazyload
         sortable: 'lib/sortable.min',                                   // v1.6.0 Sortable - drag&drop reorder - https://github.com/rubaxa/Sortable
 

public/js/v1.3.1/app/ui/dialog/account_settings.js

@@ -200,7 +200,7 @@ define([
                     off: 'Disable&nbsp;<i class="fa fa-fw fa-ban"></i>',
                     onstyle: 'success',
                     offstyle: 'warning',
-                    width: 90,
+                    width: 100,
                     height: 30
                 });
 

public/js/v1.3.1/app/ui/system_signature.js

@@ -36,6 +36,7 @@ define([
         signatureScannedProgressBarClass: 'pf-system-progress-scanned',         // class for signature progress bar
 
         // toolbar
+        sigTableLazyToggleButtonClass: 'pf-sig-table-lazy-button',              // class for "lazy update" toggle button
         sigTableClearButtonClass: 'pf-sig-table-clear-button',                  // class for "clear" signatures button
 
         // signature table
@@ -970,19 +971,19 @@ define([
 
             if( clearButton.is(':hidden') ){
                 // show button
-                clearButton.velocity('transition.bounceIn', {
-                    duration: 180
+                clearButton.velocity('transition.expandIn', {
+                    duration: 100
                 });
             }else{
                 // highlight button
                 clearButton.velocity('callout.pulse', {
-                    duration: 240
+                    duration: 200
                 });
             }
         }else{
             // hide button
-            clearButton.velocity('transition.bounceOut', {
-                duration: 180
+            clearButton.velocity('transition.expandOut', {
+                duration: 100
             });
         }
     };
@@ -1053,6 +1054,12 @@ define([
                     checkDeleteSignaturesButton(moduleElement);
                 }
             })
+        ).append(
+            $('<input>', {
+                type: 'checkbox',
+                class: [config.sigTableLazyToggleButtonClass, 'btn-labeled'].join(' '),
+                value: 1,
+            }).attr('data-toggle', 'toggle')
         ).append(
             getLabledButton({
                 type: 'danger',
@@ -1078,6 +1085,29 @@ define([
 
         moduleElement.append(tableToolbar);
 
+        // "lazy update" toggle button --------------------------------------------------------------------------------
+        let lazyToggleCheckbox = moduleElement.find('.' + config.sigTableLazyToggleButtonClass).bootstrapToggle({
+            size: 'small' ,
+            on: '<i class="fa fa-fw fa-exchange"></i>&nbsp;&nbsp;lazy&nbsp;delete',
+            off: '<i class="fa fa-fw fa-clipboard"></i>&nbsp;&nbsp;lazy&nbsp;update',
+            onstyle: 'warning' ,
+            offstyle: 'default' ,
+            width: 110
+        });
+
+        //let lazyToggleButton = lazyToggleCheckbox.parent();
+        let lazyToggleButton = lazyToggleCheckbox.parent();
+        lazyToggleButton.find('.toggle-on').attr('title', 'lazy \'update\' and \'delete\' old<br>from clipboard |ctrl&nbsp;+&nbsp;v|');
+        lazyToggleButton.find('.toggle-off').attr('title', 'lazy \'update\' signatures<br>from clipboard |ctrl&nbsp;+&nbsp;v|');
+
+        //lazyToggleButton.attr('title', 'lazy \'update\' or \'sync,delete\' from clipboard: ctrl + v') ;
+
+
+        lazyToggleButton.initTooltips({
+            container: 'body',
+            html: true
+        });
+
         // add toolbar action for table -------------------------------------------------------------------------------
         let tableToolbarAction = $('<div>', {
             class: config.tableToolsActionClass
@@ -2327,7 +2357,12 @@ define([
 
         // event listener for global "paste" signatures into the page -------------------------------------------------
         moduleElement.on('pf:updateSystemSignatureModuleByClipboard', function(e, clipboard){
-            $(this).updateSignatureTableByClipboard(systemData, clipboard, {});
+            // check "lazy update" toggle button
+            let signatureOptions = {
+                deleteOld: moduleElement.find('.' + config.sigTableLazyToggleButtonClass).is(':checked') ? 1 : 0
+            };
+
+            $(this).updateSignatureTableByClipboard(systemData, clipboard, signatureOptions);
         });
     };
 

public/js/v1.3.1/lib/bootstrap-toggle.min.js

@@ -0,0 +1,8 @@
+/*! ========================================================================
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
+ * http://www.bootstraptoggle.com
+ * ========================================================================
+ * Copyright 2014 Min Hur, The New York Times Company
+ * Licensed under MIT
+ * ======================================================================== */
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);

public/js/v1.3.1/lib/bootstrap2-toggle.min.js

@@ -1,8 +1,8 @@
 /*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
+ * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
  * http://www.bootstraptoggle.com
  * ========================================================================
  * Copyright 2014 Min Hur, The New York Times Company
  * Licensed under MIT
  * ======================================================================== */
-+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-large":"small"===this.options.size?"btn-small":"mini"===this.options.size?"btn-mini":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.width(),d.width())+e.outerWidth()/2,i=this.options.height||Math.max(c.height(),d.height());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
++function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);

sass/_main.scss

@@ -1290,7 +1290,7 @@ input[type="email"]{
   will-change: background-color, border-color;
   @include border-radius(2px);
   //@include transition( all 0.06s linear );
-  @include transition( all 0.18s ease-in-out );
+  @include transition( color 0.18s ease-in-out, background-color 0.18s ease-in-out, border-color 0.18s ease-in-out, box-shadow 0.18s ease-in-out );
   //@include box-shadow(0 1px 3px 0 rgba(red($black), green($black), blue($black), 0.12), 0 1px 2px 0 rgba(red($black), green($black), blue($black), 0.24));
 }
 .btn:active {
@@ -1549,7 +1549,7 @@ input[type="email"]{
   display: inline-block;
   padding: 5px 8px;
   background: rgba(red($black), green($black), blue($black), 0.15);
-  border-radius: 3px 0 0 3px;
+  border-radius: 2px 0 0 2px;
 }
 
 .btn-labeled {

sass/bootstrap/_mixins.scss

@@ -506,7 +506,7 @@
   &:hover,
   &:focus,
   &:active,
-  &.active {
+  &.active:not(.toggle-on):not(.toggle-off) {
     color: $color;
     background-color: lighten($background, 8%);
         border-color: lighten($border, 12%);

sass/layout/_forms.scss

@@ -129,8 +129,4 @@ fieldset[disabled]{
   &.btn:active{
     box-shadow: none;
   }
-
-  .toggle-group .btn{
-    padding: 0px 5px;
-  }
 }

sass/layout/_main.scss

@@ -362,7 +362,7 @@ table{
 .pf-table-tools{
   height: 45px;
 
-  .btn:not(:last-child){
+  & > .btn-labeled:not(:last-child){
     margin-right: 10px;
   }
 }

sass/library/bootstrap-toggle/_bootstrap-toggle.scss

@@ -1,5 +1,5 @@
 /*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.css v2.2.0
+ * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
  * http://www.bootstraptoggle.com
  * ========================================================================
  * Copyright 2014 Min Hur, The New York Times Company
@@ -7,14 +7,13 @@
  * ======================================================================== */
 
 
-label.checkbox .toggle,
-label.checkbox.inline .toggle {
+.checkbox label .toggle,
+.checkbox-inline .toggle{
   margin-left: -20px;
   margin-right: 5px;
 }
+
 .toggle {
-  min-width: 40px;
-  height: 20px;
   position: relative;
   overflow: hidden;
 }
@@ -27,8 +26,8 @@ label.checkbox.inline .toggle {
   top: 0;
   bottom: 0;
   left: 0;
-  transition: left 0.35s;
-  -webkit-transition: left 0.35s;
+  transition: left 0.18s ease-in-out;
+  -webkit-transition: left 0.18s ease-in-out;
   -moz-user-select: none;
   -webkit-user-select: none;
 }
@@ -58,28 +57,29 @@ label.checkbox.inline .toggle {
 .toggle-handle {
   position: relative;
   margin: 0 auto;
-  padding-top: 0px;
-  padding-bottom: 0px;
+  padding-top: 0;
+  padding-bottom: 0;
   height: 100%;
-  width: 0px;
+  width: 0;
   border-width: 0 1px;
+  background: #54585a;
 }
-.toggle-handle.btn-mini {
-  top: -2px;
-}
-.toggle.btn { min-width: 30px; }
+
+.toggle.btn { min-width: 59px; min-height: 34px; }
 .toggle-on.btn { padding-right: 24px; }
 .toggle-off.btn { padding-left: 24px; }
 
-.toggle.btn-large { min-width: 40px; }
-.toggle-on.btn-large { padding-right: 35px; }
-.toggle-off.btn-large { padding-left: 35px; }
+.toggle.btn-lg { min-width: 79px; min-height: 45px; }
+.toggle-on.btn-lg { padding-right: 31px; }
+.toggle-off.btn-lg { padding-left: 31px; }
+.toggle-handle.btn-lg { width: 40px; }
 
-.toggle.btn-small { min-width: 25px; }
-.toggle-on.btn-small { padding-right: 20px; }
-.toggle-off.btn-small { padding-left: 20px; }
+.toggle.btn-sm { min-width: 50px; min-height: 28px;}
+.toggle-on.btn-sm { padding-right: 10px; padding-left: 0; }
+.toggle-off.btn-sm { padding-left: 10px; padding-right: 0; }
+
+.toggle.btn-xs { min-width: 35px; min-height: 22px;}
+.toggle-on.btn-xs { padding-right: 5px; }
+.toggle-off.btn-xs { padding-left: 5px; }
 
-.toggle.btn-mini { min-width: 20px; }
-.toggle-on.btn-mini { padding-right: 12px; }
-.toggle-off.btn-mini { padding-left: 12px; }
 

sass/pathfinder.scss

@@ -38,7 +38,7 @@
 @import "library/blue-imp-gallery/_blueimp-gallery";                // Blue Imp Gallery
 @import "library/blue-imp-gallery/_bootstrap-image-gallery";        // Blue Imp Gallery Bootstrap
 @import "library/blue-imp-gallery/_bootstrap-image-gallery";        // Blue Imp Gallery Bootstrap
-@import "library/bootstrap-toggle/_bootstrap2-toggle";              // Bootstrap Toggle v2.2.0
+@import "library/bootstrap-toggle/_bootstrap-toggle";              // Bootstrap Toggle v2.2.0
 @import "library/bootstrap-checkbox/_awesome-bootstrap-checkbox";   // Bootstrap Customized Checkboxes v0.3.7 - https://github.com/flatlogic/awesome-bootstrap-checkbox
 
 // Main THEME (Imports by order - do not change order)