This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 1a124bead44a744b8e49b46d9d259bfec7e38208 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Mon Feb 1 12:18:11 2016 +0100 Refs #7927 Modifications d'affichage sur la liste des utilisateurs et sur la fiche d'un utilisateur --- coselmar-ui/src/main/webapp/css/coselmar.css | 49 ++++++++++++-- .../src/main/webapp/views/users/adminUsers.html | 28 ++++---- .../main/webapp/views/users/supervisorUsers.html | 32 +++++---- coselmar-ui/src/main/webapp/views/users/user.html | 77 ++++++++++++---------- 4 files changed, 121 insertions(+), 65 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 694563e..8868f35 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -199,14 +199,14 @@ h2 { margin-left: 15px; } -.btn-action:hover { - background-color: #39a0a8 !important; - color: #FFF !important; -} .btn-action:active, .btn-action:visited { color: #39a0a8 !important; } +.btn-action:hover { + background-color: #39a0a8 !important; + color: #FFF !important; +} .table .btn-action { margin-left: 0; @@ -217,13 +217,14 @@ h2 { color: #f0ad4e !important; border-color: #f0ad4e; } -.btn-edit:hover { - background-color: #f0ad4e !important; -} .btn-edit:active, .btn-edit:visited { color: #f0ad4e !important; } +.btn-edit:hover { + background-color: #f0ad4e !important; + color: #FFF !important; +} .btn-disable { color: #d9534f !important; @@ -262,6 +263,29 @@ h2 { border-color: initial } +.actions-notification { + background: #fafafa; + color: #aaa; + text-align: center; + padding: 10px 0; + border-top: 1px solid #EEE; +} + + +/* Tableaux +-------------------------------------------------- */ +.table tbody tr td.cell-with-btn-icon { + white-space: nowrap; +} +.table tbody tr td.cell-with-btn-icon a.btn-icon { + padding-top: 3px; + padding-bottom: 3px; + margin-left: 5px; +} +.table tbody tr td.cell-with-btn-icon a.btn-icon span.fa { + padding-right: 0; +} + /* Document & question view -------------------------------------------------- */ @@ -383,6 +407,13 @@ dl dd .status-adjourned { float: right; } +/* User view +-------------------------------------------------- */ + +.project-list { + list-style: none; +} + /* Override Boostrap default classes -------------------------------------------------- */ #main-container, @@ -506,6 +537,10 @@ input[type="file"] { height: auto; } +.modal h2 { + padding-left: 15px; +} + .modal-footer { text-align: left; } diff --git a/coselmar-ui/src/main/webapp/views/users/adminUsers.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html index 40eb185..19152b4 100644 --- a/coselmar-ui/src/main/webapp/views/users/adminUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html @@ -45,21 +45,27 @@ <td>{{user.qualification}}</td> <td>{{user.organization}}</td> <td>{{user.role}}</td> - <td ng-if="user.active">{{ 'user.metadata.status.enable' | translate }}</td> - <td ng-if="!user.active">{{ 'user.metadata.status.disable' | translate }}</td> + <td ng-if="user.active" class="cell-with-btn-icon"> + {{ 'user.metadata.status.enable' | translate }} + <a class="btn btn-action btn-disable btn-icon" + ng-confirm-message="user.message.disable" + ng-confirm-click="disableUser(user)" + title="{{ 'user.button.disable' | translate }}"> + <span class="fa fa-remove" aria-hidden="true"></span> + </a> + </td> + <td ng-if="!user.active" class="cell-with-btn-icon"> + {{ 'user.metadata.status.disable' | translate }} + <a class="btn btn-action btn-icon" + ng-click="enableUser(user)" + title="{{ 'user.button.enable' | translate }}"> + <span class="fa fa-check" aria-hidden="true"></span> + </a> + </td> <td> <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> - <a class="btn btn-action btn-disable" ng-if="user.active" - ng-confirm-message="user.message.disable" - ng-confirm-click="disableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'user.button.disable' | translate }} - </a> - <a class="btn btn-action" ng-if="!user.active" - ng-click="enableUser(user)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'user.button.enable' | translate }} - </a> </td> </tr> </tbody> diff --git a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html index 6945b52..ab95f0f 100644 --- a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html @@ -40,26 +40,34 @@ </thead> <tbody> <tr ng-repeat="user in users"> - <td>{{user.firstName}} {{user.name}}</td> + <td><a href="#/users/{{user.id}}">{{user.firstName}} {{user.name}}</a></td> <td>{{user.mail}}</td> <td>{{user.qualification}}</td> <td>{{user.organization}}</td> <td>{{user.role}}</td> - <td ng-if="user.active">{{ 'user.metadata.status.enable' | translate }}</td> - <td ng-if="!user.active">{{ 'user.metadata.status.disable' | translate }}</td> + <td ng-if="user.active" class="cell-with-btn-icon"> + {{ 'user.metadata.status.enable' | translate }} + <a ng-if="user.role == 'CLIENT'" + class="btn btn-action btn-disable btn-icon" + ng-confirm-message="user.message.disable" + ng-confirm-click="disableUser(user)" + title="{{ 'user.button.disable' | translate }}"> + <span class="fa fa-remove" aria-hidden="true"></span> + </a> + </td> + <td ng-if="!user.active" class="cell-with-btn-icon"> + {{ 'user.metadata.status.disable' | translate }} + <a ng-if="user.role == 'CLIENT'" + class="btn btn-action btn-icon" + ng-click="enableUser(user)" + title="{{ 'user.button.enable' | translate }}"> + <span class="fa fa-check" aria-hidden="true"></span> + </a> + </td> <td ng-if="user.role == 'CLIENT'"> <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> - <a class="btn btn-action btn-disable" ng-if="user.active" - ng-confirm-message="user.message.disable" - ng-confirm-click="disableUser(user)"> - <span class="fa fa-remove" aria-hidden="true"></span>{{ 'user.button.disable' | translate }} - </a> - <a class="btn btn-action" ng-if="!user.active" - ng-click="enableUser(user)"> - <span class="fa fa-remove" aria-hidden="true"></span>{{ 'user.button.enable' | translate }} - </a> </td> <td ng-if="user.role != 'CLIENT'"></td> </tr> diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html index 07e7e8a..7989dab 100644 --- a/coselmar-ui/src/main/webapp/views/users/user.html +++ b/coselmar-ui/src/main/webapp/views/users/user.html @@ -28,8 +28,8 @@ </h1> </div> <div ng-if="!editMode" > - <uib-tabset> - <uib-tab heading="{{'user.info.title' | translate}}"> + + <h2>{{'user.info.title' | translate}}</h2> <table class="table table-striped"> <tr> @@ -68,75 +68,82 @@ <a class="btn btn-action btn-edit" ng-confirm-message="user.message.disable" ng-confirm-click="disableUser()" - ng-if="context.currentUser.role == 'ADMIN' && user.active">{{ 'user.button.disable' | translate }}</a> + ng-if="user.active && + ((context.currentUser.role == 'ADMIN') || (context.currentUser.role == 'SUPERVISOR' && user.role == 'CLIENT'))"> + {{ 'user.button.disable' | translate }} + </a> <a class="btn btn-action" ng-click="enableUser()" - ng-if="context.currentUser.role == 'ADMIN' && !user.active">{{ 'user.button.enable' | translate }}</a> + ng-if="!user.active && + ((context.currentUser.role == 'ADMIN') || (context.currentUser.role == 'SUPERVISOR' && user.role == 'CLIENT'))"> + {{ 'user.button.enable' | translate }} + </a> <a class="btn btn-action btn-disable" ng-confirm-message="user.message.delete" ng-confirm-click="deleteUser(user.id)" ng-if="context.currentUser.role == 'ADMIN'">Delete</a> </div> - </uib-tab> - <uib-tab heading="{{ 'user.projects.title' | translate}}"> + <h2>{{ 'user.projects.title' | translate}}</h2> - <dl ng-if="supervisorProjects && supervisorProjects.length > 0"> - <dt>{{'user.metadata.projects.asSupervisor' | translate}}</dt> + <table class="table table-striped"> + <tr ng-if="supervisorProjects && supervisorProjects.length > 0"> + <td>{{'user.metadata.projects.asSupervisor' | translate}}</td> - <dd> - <ul> + <td> + <ul class="project-list"> <li ng-repeat="project in supervisorProjects"> <a href="#/questions/{{project.id}}" target="_blank">{{project.title}}</a> </li> </ul> - </dd> - </dl> + </td> + </tr> - <dl ng-if="participantProjects && participantProjects.length > 0"> - <dt>{{'user.metadata.projects.asParticipant' | translate}}</dt> + <tr ng-if="participantProjects && participantProjects.length > 0"> + <td>{{'user.metadata.projects.asParticipant' | translate}}</td> - <dd> - <ul> + <td> + <ul class="project-list"> <li ng-repeat="project in participantProjects"> <a href="#/questions/{{project.id}}" target="_blank">{{project.title}}</a> </li> </ul> - </dd> - </dl> + </td> + </tr> - <dl ng-if="contributorProjects && contributorProjects.length > 0"> - <dt>{{'user.metadata.projects.asContributor' | translate}}</dt> + <tr ng-if="contributorProjects && contributorProjects.length > 0"> + <td>{{'user.metadata.projects.asContributor' | translate}}</td> - <dd> - <ul> + <td> + <ul class="project-list"> <li ng-repeat="project in contributorProjects"> <a href="#/questions/{{project.id}}" target="_blank">{{project.title}}</a> </li> </ul> - </dd> - </dl> + </td> + </tr> - <dl ng-if="clientProjects && clientProjects.length > 0"> - <dt>{{'user.metadata.projects.asClient' | translate}}</dt> + <tr ng-if="clientProjects && clientProjects.length > 0"> + <td>{{'user.metadata.projects.asClient' | translate}}</td> - <dd> - <ul> + <td> + <ul class="project-list"> <li ng-repeat="project in clientProjects"> <a href="#/questions/{{project.id}}" target="_blank">{{project.title}}</a> </li> </ul> - </dd> - </dl> + </td> + </tr> - <div ng-if="(!supervisorProjects || supervisorProjects.length == 0) + <tr ng-if="(!supervisorProjects || supervisorProjects.length == 0) && (!participantProjects || participantProjects.length == 0) && (!contributorProjects || contributorProjects.length == 0) && (!clientProjects || clientProjects.length == 0)"> - {{'user.message.noProject' | translate }} - </div> + <td colspan="2"> + {{'user.message.noProject' | translate }} + </td> + </tr> + </table> - </uib-tab> - </uib-tabset> </div> <div ng-if="editMode" style="padding: 30px 0px 50px 0px"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.