Removed editable from username (#12698)

Removed '-' when editing password, so it does not need to be manually removed
Fixed indentation issues.

2 files changed, 18 insertions, 21 deletions

diff --git a/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js b/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js
index 78f776de26..1ca2ae0c88 100644
--- a/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js
+++ b/plugins/UsersManager/angularjs/manage-users/manage-users.controller.js
@@ -104,12 +104,10 @@
                 // make the fields editable
                 // change the EDIT button to VALID button
                 function (i, n) {
-                    var contentBefore = $(n).text();
                     var idName = $(n).attr('id');
-                    if (idName != 'userLogin') {
-                        var contentAfter = '<input id="' + idName + '" value="' + piwikHelper.htmlEntities(contentBefore) + '" size="25" />';
-                        $(n).html(contentAfter);
-                    }
+                    var contentBefore = idName != 'password' ? $(n).text() : '';
+                    var contentAfter = '<input id="' + idName + '" value="' + piwikHelper.htmlEntities(contentBefore) + '" size="25" />';
+                    $(n).html(contentAfter);
                 }
             );
 
@@ -123,12 +121,12 @@
                         piwikHelper.redirect();
                     })
                 ).prepend($('<input type="submit" class="btn updateuser"  value="' + _pk_translate('General_Save') + '" />')
-                .click(function () {
-                    var $tr = $('tr#' + idRow);
+                    .click(function () {
+                        var $tr = $('tr#' + idRow);
 
-                    sendUpdateUserAJAX($tr);
-                })
-            );
+                        sendUpdateUserAJAX($tr);
+                    })
+                );
         }
         
         this.createUser = function () {
@@ -146,17 +144,16 @@
             newRowId = 'row' + newRowId;
 
             $($.parseHTML(' <tr id="' + newRowId + '" class="addNewUserRow">\
-				<td><input id="useradd_login" placeholder="username" size="10" maxlength="100" /></td>\
-				<td><input id="useradd_password" placeholder="password" size="10" /></td>\
-				<td><input id="useradd_email" placeholder="email@domain.com" size="15" maxlength="100" /></td>\
-				<td><input id="useradd_alias" placeholder="alias" size="15" maxlength="45" /></td>\
-				<td>-</td>\
+                <td><input id="useradd_login" placeholder="username" size="10" maxlength="100" /></td>\
+                <td><input id="useradd_password" placeholder="password" size="10" /></td>\
+                <td><input id="useradd_email" placeholder="email@domain.com" size="15" maxlength="100" /></td>\
+                <td><input id="useradd_alias" placeholder="alias" size="15" maxlength="45" /></td>\
+                <td>-</td>\
                 <td>-</td>\
-				<td><input type="submit" class="btn adduser"  value="' + _pk_translate('General_Save') + '" /></td>\
-	  			<td><span class="cancel">' + sprintf(_pk_translate('General_OrCancel'), "", "") + '</span></td>\
-	 		</tr>'))
-                .appendTo('#users')
-            ;
+                <td><input type="submit" class="btn adduser"  value="' + _pk_translate('General_Save') + '" /></td>\
+                    <td><span class="cancel">' + sprintf(_pk_translate('General_OrCancel'), "", "") + '</span></td>\
+                </tr>')
+                ).appendTo('#users');
             $('#' + newRowId).keypress(submitOnEnter);
             $('.adduser').click(function () { sendAddUserAJAX($('tr#' + newRowId)); });
             $('.cancel').click(function () {
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 0f92717998..941affc6e3 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -214,7 +214,7 @@
             {% for i,user in users %}
                 {% if user.login != 'anonymous' %}
                     <tr class="editable" id="row{{ i }}">
-                        <td id="userLogin" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.login }}</td>
+                        <td id="userLogin" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.login }}</td>
                         <td id="password" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>-</td>
                         <td id="email" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.email }}</td>
                         <td id="alias" class="editable" ng-click='manageUsers.editUser("row{{ i|e('js') }}")'>{{ user.alias|raw }}</td>