Skip to content

Commit

Permalink
GUACAMOLE-1479: Update front-end styles and translations for disabled…
Browse files Browse the repository at this point in the history
… users and user groups.
  • Loading branch information
necouchman committed Nov 29, 2023
1 parent e82b837 commit 2f2d372
Show file tree
Hide file tree
Showing 31 changed files with 73 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Inici de sessió desactivat:",
"FIELD_HEADER_EXPIRED" : "Contrasenya caducada:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "No permetre l'accés després:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Permet l'accés després:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Desactivat:",

"SECTION_HEADER_RESTRICTIONS" : "Restriccions de grup"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Login deaktiviert:",
"FIELD_HEADER_EXPIRED" : "Passwort abgelaufen:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Zugriff nach dieser Uhrzeit nicht mehr erlauben:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Zugriff erst nach dieser Uhrzeit erlauben:",
Expand All @@ -102,9 +101,7 @@
},

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Deaktiviert:",


"SECTION_HEADER_RESTRICTIONS" : "Gruppeneinschränkung"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Login disabled:",
"FIELD_HEADER_EXPIRED" : "Password expired:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Do not allow access after:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Allow access after:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Disabled:",

"SECTION_HEADER_RESTRICTIONS" : "Group Restrictions"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Inicio de sesión deshabilitado:",
"FIELD_HEADER_EXPIRED" : "Contraseña expirada:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "No permitir acceso despues de:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Permitir acceso despues de:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Deshabilitado:",

"SECTION_HEADER_RESTRICTIONS" : "Restricciones de grupo"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Connexion désactivée:",
"FIELD_HEADER_EXPIRED" : "Mot de passe expiré:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Ne pas autoriser l'accès après:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Autoriser l'accès après:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Désactivé:",

"SECTION_HEADER_RESTRICTIONS" : "Restrictions de groupe"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "ログインの無効化:",

"FIELD_HEADER_EXPIRED" : "パスワード変更の強制:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "指定した時刻からアクセスを禁止する:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "指定した時刻からアクセスを許可する:",
Expand All @@ -90,8 +90,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "グループの無効化:",

"SECTION_HEADER_RESTRICTIONS" : "グループ制限"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "로그인 비활성화:",
"FIELD_HEADER_EXPIRED" : "비밀번호 만료됨:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "다음 이후에 액세스 허용 안함 :",
"FIELD_HEADER_ACCESS_WINDOW_START" : "다음 이후에 엑세스 허용:",
Expand All @@ -103,8 +102,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "비활성화:",

"SECTION_HEADER_RESTRICTIONS" : "그룹 제한"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Logowanie zablokowane:",
"FIELD_HEADER_EXPIRED" : "Hasło wygasło:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Nie zezwalaj na dostęp po:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Zezwalaj na dostęp od:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Wyłączona:",

"SECTION_HEADER_RESTRICTIONS" : "Ograniczenia Grupy"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Login desativado:",
"FIELD_HEADER_EXPIRED" : "Senha expirada:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Não permitir acesso após:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Permitir acesso após:",
Expand All @@ -105,8 +104,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Desativado:",

"SECTION_HEADER_RESTRICTIONS" : "Restrições de Grupo"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Аккаунт отключен:",
"FIELD_HEADER_EXPIRED" : "Пароль просрочен:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "Запретить доступ после:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "Разрешить доступ после:",
Expand All @@ -103,8 +102,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "Группа отключена:",

"SECTION_HEADER_RESTRICTIONS" : "Ограничения"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@

"USER_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "已禁用登录:",
"FIELD_HEADER_EXPIRED" : "密码已过期:",
"FIELD_HEADER_ACCESS_WINDOW_END" : "之后不允许访问:",
"FIELD_HEADER_ACCESS_WINDOW_START" : "之后允许访问:",
Expand All @@ -104,8 +103,6 @@

"USER_GROUP_ATTRIBUTES" : {

"FIELD_HEADER_DISABLED" : "禁用:",

"SECTION_HEADER_RESTRICTIONS" : "组限制"

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ <h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2>
<th>{{'MANAGE_USER.FIELD_HEADER_PASSWORD_AGAIN' | translate}}</th>
<td><input ng-model="passwordMatch" type="password"></td>
</tr>
<tr>
<th>{{'MANAGE_USER.FIELD_HEADER_USER_DISABLED' | translate}}</th>
<td><input ng-model="user.disabled" type="checkbox"></td>
</tr>
</table>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ <h2>{{'MANAGE_USER_GROUP.SECTION_HEADER_EDIT_USER_GROUP' | translate}}</h2>
<span ng-hide="canEditIdentifier()">{{userGroup.identifier}}</span>
</td>
</tr>
<tr>
<th>{{'MANAGE_USER_GROUP.FIELD_HEADER_USER_GROUP_DISABLED' | translate}}</th>
<td><input ng-model="userGroup.disabled" type="checkbox"></td>
</tr>
</table>
</div>

Expand Down
11 changes: 11 additions & 0 deletions guacamole/src/main/frontend/src/app/manage/types/ManageableUser.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ angular.module('manage').factory('ManageableUser', [function defineManageableUse
* @type User
*/
this.user = template.user;

/**
* Return true if the underlying user account is disabled, otherwise
* return false.
*
* @returns
* True if the underlying user account is disabled, otherwise false.
*/
this.isDisabled = function isDisabled() {
return template.user.disabled;
};

};

Expand Down
5 changes: 5 additions & 0 deletions guacamole/src/main/frontend/src/app/rest/types/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ angular.module('rest').factory('User', [function defineUser() {
* @type Number
*/
this.lastActive = template.lastActive;

/**
* True if this user account is disabled, otherwise false.
*/
this.disabled = template.disabled;

/**
* Arbitrary name/value pairs which further describe this user. The
Expand Down
5 changes: 5 additions & 0 deletions guacamole/src/main/frontend/src/app/rest/types/UserGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ angular.module('rest').factory('UserGroup', [function defineUserGroup() {
* @type String
*/
this.identifier = template.identifier;

/**
* True if this user group is disabled, otherwise false.
*/
this.disabled = template.disabled;

/**
* Arbitrary name/value pairs which further describe this user group.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,17 @@
width: 100%;
}

.settings.user-groups table.user-group-list tr.user td.user-group-name a[href] {
.settings.user-groups table.user-group-list tr.user-group td.user-group-name a[href] {
display: block;
padding: .5em 1em;
}

.settings.user-groups table.user-group-list tr.user td.user-group-name {
padding: 0;
.settings.user-groups table.user-group-list tr.user-group.disabled,
.settings.user-groups table.user-group-list tr.user-group.disabled td.user-group-name a[href] {
color: gray;
font-style: italic;
}

.settings.user-groups table.user-group-list tr.user-group td.user-group-name {
padding: 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@
padding: .5em 1em;
}

.settings.users table.user-list tr.user.disabled,
.settings.users table.user-list tr.user.disabled td.username a[href] {
color: gray;
font-style: italic;
}

.settings.users table.user-list tr.user td.username {
padding: 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</tr>
</thead>
<tbody ng-class="{loading: !isLoaded()}">
<tr ng-repeat="manageableUserGroup in manageableUserGroupPage" class="user-group">
<tr ng-repeat="manageableUserGroup in manageableUserGroupPage" class="user-group" ng-class="{disabled: manageableUserGroup.userGroup.disabled}">
<td class="user-group-name">
<a ng-href="#/manage/{{manageableUserGroup.dataSource | escape}}/userGroups/{{manageableUserGroup.userGroup.identifier | escape}}">
<div class="icon user-group"></div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</tr>
</thead>
<tbody ng-class="{loading: !isLoaded()}">
<tr ng-repeat="manageableUser in manageableUserPage" class="user">
<tr ng-repeat="manageableUser in manageableUserPage" class="user" ng-class="{disabled: manageableUser.user.disabled}">
<td class="username">
<a ng-href="#/manage/{{manageableUser.dataSource | escape}}/users/{{manageableUser.user.username | escape}}">
<div class="icon user"></div>
Expand Down
2 changes: 2 additions & 0 deletions guacamole/src/main/frontend/src/translations/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "Crear noves connexions:",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "Crear grups de connexió nous:",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Crear nous perfils per compartir:",
"FIELD_HEADER_USER_DISABLED" : "Inici de sessió desactivat:",
"FIELD_HEADER_USERNAME" : "Nom d'usuari:",

"HELP_NO_USER_GROUPS" : "Actualment, aquest usuari no pertany a cap grup. Amplieu aquesta secció per afegir-lo a grups.",
Expand Down Expand Up @@ -373,6 +374,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
"FIELD_HEADER_USER_GROUP_DISABLED" : "Desactivat:",
"FIELD_HEADER_USER_GROUP_NAME" : "Nom del grup:",

"HELP_NO_USER_GROUPS" : "Actualment aquest grup no pertany a cap grup. Amplieu aquesta secció per afegir grups.",
Expand Down
2 changes: 2 additions & 0 deletions guacamole/src/main/frontend/src/translations/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Neues Verteil-Profil erstellen:",
"FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD",
"FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
"FIELD_HEADER_USER_DISABLED" : "Login deaktiviert:",
"FIELD_HEADER_USERNAME" : "Benutzername:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down Expand Up @@ -449,6 +450,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
"FIELD_HEADER_USER_GROUP_DISABLED" : "Deaktiviert:",
"FIELD_HEADER_USER_GROUP_NAME" : "Name der Benutzergruppe:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down
2 changes: 2 additions & 0 deletions guacamole/src/main/frontend/src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Create new sharing profiles:",
"FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD",
"FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
"FIELD_HEADER_USER_DISABLED" : "Login disabled:",
"FIELD_HEADER_USERNAME" : "Username:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down Expand Up @@ -452,6 +453,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
"FIELD_HEADER_USER_GROUP_DISABLED" : "Disabled:",
"FIELD_HEADER_USER_GROUP_NAME" : "Group name:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down
2 changes: 2 additions & 0 deletions guacamole/src/main/frontend/src/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Crear nuevos perfiles de compartir:",
"FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD",
"FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
"FIELD_HEADER_USER_DISABLED" : "Inicio de sesión deshabilitado:",
"FIELD_HEADER_USERNAME" : "Nombre de usuario:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down Expand Up @@ -355,6 +356,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
"FIELD_HEADER_USER_GROUP_DISABLED" : "Deshabilitado:",
"FIELD_HEADER_USER_GROUP_NAME" : "Nombre del grupo:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down
2 changes: 2 additions & 0 deletions guacamole/src/main/frontend/src/translations/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "Créer de nouveaux profils de partage:",
"FIELD_HEADER_PASSWORD" : "@:APP.FIELD_HEADER_PASSWORD",
"FIELD_HEADER_PASSWORD_AGAIN" : "@:APP.FIELD_HEADER_PASSWORD_AGAIN",
"FIELD_HEADER_USER_DISABLED" : "Connexion désactivée:",
"FIELD_HEADER_USERNAME" : "Identifiant:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down Expand Up @@ -354,6 +355,7 @@
"FIELD_HEADER_CREATE_NEW_CONNECTIONS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTIONS",
"FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_CONNECTION_GROUPS",
"FIELD_HEADER_CREATE_NEW_SHARING_PROFILES" : "@:MANAGE_USER.FIELD_HEADER_CREATE_NEW_SHARING_PROFILES",
"FIELD_HEADER_USER_GROUP_DISABLED" : "Désactivé:",
"FIELD_HEADER_USER_GROUP_NAME" : "Nom Groupe:",

"FIELD_PLACEHOLDER_FILTER" : "@:APP.FIELD_PLACEHOLDER_FILTER",
Expand Down
Loading

0 comments on commit 2f2d372

Please sign in to comment.