diff --git a/web/css/main.css b/web/css/main.css index fafce272..0ba47267 100644 --- a/web/css/main.css +++ b/web/css/main.css @@ -1291,11 +1291,11 @@ label:active { .toggle-psw-visibility-icon { cursor: pointer; - opacity: 0.4; + opacity: 1; } .show-passwords-enabled-action { - opacity: 1; + opacity: 0.4; } diff --git a/web/js/events.js b/web/js/events.js index fd2f1bc7..4d84f6dd 100644 --- a/web/js/events.js +++ b/web/js/events.js @@ -142,7 +142,7 @@ VE.helpers.initAdditionalPasswordFieldElements = function(ref) { $(ref).prop('autocomplete', 'off'); var enabled_html = enabled ? '' : 'show-passwords-enabled-action'; - var html = ''; + var html = ''; $(ref).after(html); } diff --git a/web/js/jquery.finder.js b/web/js/jquery.finder.js index 7eed0b18..4ae3264a 100644 --- a/web/js/jquery.finder.js +++ b/web/js/jquery.finder.js @@ -172,7 +172,7 @@ var c = f.get.clicks(p,o,$(this)); var ref = $(e.target); - if (ref.parents('.data-row').hasClass('selected') && $('.selected').length == 1) {console.warn(1); + if (ref.parents('.data-row').hasClass('selected') && $('.selected').length == 1) { ref.parents('.data-row').removeClass('selected'); ref.parents('.data-row').find('.ch-toggle').attr('checked', false); return; @@ -203,7 +203,7 @@ p.on('mouseout', function(){ d.off("keydown", turnOff); }); - + function turnOff(e) { if (f.detect.ctrl(e)) { if (e.keyCode == 65) { @@ -562,6 +562,7 @@ hAll: function(p,o) { f.h.on(p.find(o.children), o); f.t.update(p, o); + o.toggleAllHook && o.toggleAllHook(); }, unHExist: function(bool,el,o) { if(bool) { diff --git a/web/js/pages/add.package.js b/web/js/pages/add.package.js index d6fc5805..2d71a6cc 100644 --- a/web/js/pages/add.package.js +++ b/web/js/pages/add.package.js @@ -41,7 +41,6 @@ App.Listeners.PACKAGE.init = function() { if ($(ref).val().trim() == App.Constants.UNLIM_VALUE || $(ref).val().trim() == App.Constants.UNLIM_TRANSLATED_VALUE) { $(ref).val('0'); App.Actions.PACKAGE.enable_unlimited(ref, elm); - //$(elm).attr('checked', true); } else { App.Actions.PACKAGE.disable_unlimited(ref, elm); @@ -54,7 +53,7 @@ App.Listeners.PACKAGE.init = function() { // Trigger listeners App.Listeners.PACKAGE.init(); App.Listeners.PACKAGE.checkbox_unlimited_feature(); -$('form[name="v_edit_package"]').bind('submit', function(evt) { +$('form[name="v_add_package"]').bind('submit', function(evt) { $('input:disabled').each(function(i, elm) { $(elm).attr('disabled', false); }); diff --git a/web/js/pages/edit.package.js b/web/js/pages/edit.package.js index d6fc5805..63178e86 100644 --- a/web/js/pages/edit.package.js +++ b/web/js/pages/edit.package.js @@ -41,7 +41,6 @@ App.Listeners.PACKAGE.init = function() { if ($(ref).val().trim() == App.Constants.UNLIM_VALUE || $(ref).val().trim() == App.Constants.UNLIM_TRANSLATED_VALUE) { $(ref).val('0'); App.Actions.PACKAGE.enable_unlimited(ref, elm); - //$(elm).attr('checked', true); } else { App.Actions.PACKAGE.disable_unlimited(ref, elm); diff --git a/web/templates/admin/add_package.html b/web/templates/admin/add_package.html index 9b8e12a4..6815f4ee 100644 --- a/web/templates/admin/add_package.html +++ b/web/templates/admin/add_package.html @@ -146,7 +146,7 @@ + @@ -157,7 +157,7 @@ + @@ -168,7 +168,7 @@ + @@ -179,7 +179,7 @@ + @@ -190,7 +190,7 @@ + @@ -201,7 +201,7 @@ + @@ -212,7 +212,7 @@ + @@ -223,7 +223,7 @@ + @@ -244,7 +244,7 @@ + @@ -255,7 +255,7 @@ + diff --git a/web/templates/admin/edit_package.html b/web/templates/admin/edit_package.html index 23de6585..91a24dcd 100644 --- a/web/templates/admin/edit_package.html +++ b/web/templates/admin/edit_package.html @@ -152,7 +152,7 @@ + @@ -163,7 +163,7 @@ + @@ -174,7 +174,7 @@ + @@ -185,7 +185,7 @@ + @@ -196,7 +196,7 @@ + @@ -207,7 +207,7 @@ + @@ -218,7 +218,7 @@ + @@ -229,7 +229,7 @@ + @@ -250,7 +250,7 @@ + @@ -261,7 +261,7 @@ + diff --git a/web/templates/footer.html b/web/templates/footer.html index e8e9cd9d..cb4d14f9 100644 --- a/web/templates/footer.html +++ b/web/templates/footer.html @@ -5,28 +5,39 @@