Merge branch 'Develop'

cps/static/css/style.css

@@ -511,16 +511,3 @@ body > div.container-fluid  {
 .input-group .toggle-password {
   height: 40px;
 }
-
-.input-group .toggle-password {
-  min-width: 40px;
-  width: 40px;
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.input-group .toggle-password .glyphicon {
-  font-size: 16px;
-  line-height: 1;
-  top: 0;
-}

cps/static/js/main.js

@@ -168,21 +168,23 @@ $("#form-upload-format").uploadprogress({
 
 $(document).on('click', '.toggle-password', function (event) {
     event.preventDefault();
-    var $button = $(this);
-    var selector = $button.data('target');
-    var $passwordInput = $(selector);
-    if (!$passwordInput.length) {
+    var button = $(this);
+    var selector = button.data('target');
+    var passwordInput = $(selector);
+    if (!passwordInput.length) {
         return;
     }
-    var isPassword = $passwordInput.attr('type') === 'password';
-    $passwordInput.attr('type', isPassword ? 'text' : 'password');
-    var $icon = $button.find('.glyphicon');
-    if ($icon.length) {
-        $icon.toggleClass('glyphicon-eye-open', !isPassword);
-        $icon.toggleClass('glyphicon-eye-close', isPassword);
+    var isPassword = passwordInput.attr('type') === 'password';
+    passwordInput.attr('type', isPassword ? 'text' : 'password');
+    var icon = button.find('.glyphicon');
+    if (icon.length) {
+        icon.toggleClass('glyphicon-eye-open', !isPassword);
+        icon.toggleClass('glyphicon-eye-close', isPassword);
     }
-    var label = isPassword ? _('Hide password') : _('Show password');
-    $button.attr({
+    var showLabel = button.attr('data-password-show') || button.attr('aria-label') || button.attr('title');
+    var hideLabel = button.attr('data-password-hide') || showLabel;
+    var label = isPassword ? hideLabel : showLabel;
+    button.attr({
         'aria-label': label,
         'title': label
     });

cps/themes/caliblur/templates/login.html

@@ -14,8 +14,8 @@
       <div class="input-group">
         <input type="password" class="form-control" id="password" name="password" placeholder="{{_('Password')}}" value="{{ password }}">
         <span class="input-group-btn">
-          <button type="button" class="btn btn-default toggle-password" data-target="#password" aria-label="{{_('Show password')}}" title="{{_('Show password')}}">
-            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+          <button type="button" class="btn btn-default toggle-password" data-target="#password" data-password-show="{{_('Show password')}}" data-password-hide="{{_('Hide password')}}" aria-label="{{_('Show password')}}" title="{{_('Show password')}}">
+            <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
           </button>
         </span>
       </div>

cps/themes/standard/templates/layout.html

@@ -111,7 +111,7 @@
         {% if current_user.is_authenticated or g.allow_anonymous %}
         <div class="col-sm-2">
           <nav class="navigation">
-            <ul class="list-unstyled" id="scnd-nav" intent in-standard-append="nav.navigation" in-tablet-after="#main-nav" in-tablet-class="nav navbar-nav" in-mobile-after="#main-nav" in-mobile-class="nav navbar-nav">
+            <ul class="list-unstyled" id="scnd-nav" intent in-standard-append="nav.navigation" in-mobile-after="#main-nav" in-mobile-class="nav navbar-nav">
               <li class="nav-head hidden-xs">{{_('Browse')}}</li>
               {% for element in sidebar %}
                 {% if current_user.check_visibility(element['visibility']) and element['public'] %}

cps/themes/standard/templates/login.html

@@ -14,8 +14,8 @@
       <div class="input-group">
         <input type="password" class="form-control" id="password" name="password" placeholder="{{_('Password')}}" value="{{ password }}">
         <span class="input-group-btn">
-          <button type="button" class="btn btn-default toggle-password" data-target="#password" aria-label="{{_('Show password')}}" title="{{_('Show password')}}">
-            <span class="glyphicon glyphicon-eye-open" aria-hidden="true"></span>
+          <button type="button" class="btn btn-default toggle-password" data-target="#password" data-password-show="{{_('Show password')}}" data-password-hide="{{_('Hide password')}}" aria-label="{{_('Show password')}}" title="{{_('Show password')}}">
+            <span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span>
           </button>
         </span>
       </div>