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 37bdcc10ea2bd7d2c4aa618cd47d9be39cb2f928 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Jan 28 16:37:54 2015 +0100 Refs-60 #6547: Change display of question, document, referential and users pages --- coselmar-ui/src/main/webapp/css/coselmar.css | 39 +++++++- .../src/main/webapp/views/documents/documents.html | 53 +++++----- .../src/main/webapp/views/questions/questions.html | 98 ++++++++++--------- .../main/webapp/views/questions/viewquestion.html | 107 ++++++++++++--------- .../main/webapp/views/referential/referential.html | 78 ++++++++------- .../src/main/webapp/views/users/adminUsers.html | 104 +++++++------------- .../src/main/webapp/views/users/searchPart.html | 20 ++-- .../main/webapp/views/users/supervisorUsers.html | 73 +++++++------- 8 files changed, 308 insertions(+), 264 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 0919142..0298214 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -123,6 +123,10 @@ a { clear: both; } +.marginBottom20 { + margin-bottom: 20px; +} + /* Titles -------------------------------------------------- */ h1, h2 { @@ -194,6 +198,15 @@ h1, h2 { /* Document & question view -------------------------------------------------- */ +dl > dt { + color: #888; + margin-bottom: 5px; +} + +dl > dd { + padding: 3px 8px; +} + .aside { border-left: 5px solid rgba(53, 160, 168, 0.04); padding-left: 10px; @@ -212,9 +225,11 @@ h1, h2 { .aside dl > dt { float: left; + padding: 0; } .aside dl > dd { text-align: right; + padding: 0; } .aside dl > dd ul { @@ -224,12 +239,22 @@ h1, h2 { } .aside dl > dd ul li { background-color: #FAFAFA; - border: 1px solid #f5f5f5; + border: 1px solid #F5F5F5; display: inline-block; margin: 3px; padding: 3px 7px; } +.search-zone { + background-color: #F5F5F5; + border: 1px solid #DDD; + padding: 5px 15px; + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); +} + +.search-zone .btn { + background: #FFF; +} /* Override Boostrap default classes -------------------------------------------------- */ @@ -309,6 +334,18 @@ a.dropdown-toggle:hover .caret { color: #FFF; } +.table { + font-size: inherit; + box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.1); +} + +.table thead tr th { + background: #F5F5F5; + border: 0; + color: #888; + font-weight: normal; +} + /* remove the stupid float on right with bootstrap close class */ .close { float: none; diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 52a032b..9a59b4d 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -34,7 +34,7 @@ <div class="form-group" ng-if="currentUser.role == 'EXPERT' || currentUser.role == 'SUPERVISOR'"> <a href="#/documents/new" class="form-inline navbar-left btn btn-primary">{{ 'document.button.add' | translate}}</a> </div> - <form class="form-inline pull-right" role="documentOptions" ng-submit="searchDocuments()"> + <form class="form-inline pull-right search-zone" role="documentOptions" ng-submit="searchDocuments()"> <div class="form-group"> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> @@ -45,30 +45,33 @@ </div> <br/> <table class="table"> - <tr> - <th>{{ 'document.metadata.name' | translate }}</th> - <th>{{ 'document.metadata.authors' | translate }}</th> - <th>{{ 'document.metadata.privacy' | translate }}</th> - <th>{{ 'document.metadata.keywords' | translate }}</th> - <th>{{ 'document.metadata.depositor' | translate }}</th> - <th>{{ 'document.metadata.depositDate' | translate }}</th> - <th>{{ 'document.metadata.relatedQuestions' | translate }}</th> - <th></th> - </tr> - <tr ng-repeat="document in documents"> - <td><a href="#/documents/{{document.id}}">{{document.name}}</a></td> - <td>{{document.authors}}</td> - <td>{{document.privacy}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> - <td>{{document.ownerName}}</td> - <td>{{document.depositDate | date:'mediumDate'}}</td> - <td class="text-center">{{document.nbRelatedQuestions || 0}}</td> - <td ng-if="currentUser.role == 'ADMIN'"><a class="btn btn-action btn-disable" - ng-confirm-message="document.message.delete" - ng-confirm-click="deleteDocument(document.id)"> - <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> - </td> - </tr> + <thead> + <tr> + <th>{{ 'document.metadata.name' | translate }}</th> + <th>{{ 'document.metadata.authors' | translate }}</th> + <th>{{ 'document.metadata.privacy' | translate }}</th> + <th>{{ 'document.metadata.keywords' | translate }}</th> + <th>{{ 'document.metadata.depositor' | translate }}</th> + <th>{{ 'document.metadata.depositDate' | translate }}</th> + <th>{{ 'document.metadata.relatedQuestions' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="document in documents"> + <td><a href="#/documents/{{document.id}}">{{document.name}}</a></td> + <td>{{document.authors}}</td> + <td>{{document.privacy}}</td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + <td>{{document.ownerName}}</td> + <td>{{document.depositDate | date:'mediumDate'}}</td> + <td class="text-center">{{document.nbRelatedQuestions || 0}}</td> + <td ng-if="currentUser.role == 'ADMIN'"><a class="btn btn-action btn-disable" + ng-confirm-message="document.message.delete" + ng-confirm-click="deleteDocument(document.id)"> + <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> + </td> + </tr> + </tbody> </table> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index b1b565a..1c9dec8 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -35,69 +35,73 @@ <div class="form-group" ng-if="currentUser.role == 'SUPERVISOR'"> <a href="#/questions/new" class="form-inline navbar-left btn btn-primary">{{ 'question.button.add' | translate }}</a> </div> - <form class="form-inline pull-right" role="questionOptions" ng-submit="searchQuestions()"> + <form class="form-inline pull-right search-zone" role="questionOptions" ng-submit="searchQuestions()"> <div class="form-group"> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.keywords" ng-list /> </div> <div class="form-group"> - <button type="submit" class="btn btn-default fa fa-search"></button> + <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> </div> </form> </div> <br/> - <table class="table"> - <tr> - <th>{{ 'question.metadata.title' | translate }}</th> - <th>{{ 'question.metadata.submissionDate' | translate }}</th> - <th>{{ 'question.metadata.themes' | translate }}</th> - <th>{{ 'question.metadata.deadline' | translate }}</th> - <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.clients' | translate }}</th> - <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.participants' | translate }}</th> - <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.relatedDocuments' | translate }}</th> - <th ng-if="currentUser.role == 'MEMBER' || currentUser.role == 'CLIENT'">{{ 'question.metadata.status' | translate }}</th> - <th></th> - </tr> - <tr ng-repeat="question in questions" > - <td ng-if="currentUser.role != 'MEMBER'"><a href="#/questions/{{question.id}}" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a></td> - <td ng-if="currentUser.role == 'MEMBER'">{{question.title}}</td> + <table class="table table-bordered"> + <thead> + <tr> + <th>{{ 'question.metadata.title' | translate }}</th> + <th>{{ 'question.metadata.submissionDate' | translate }}</th> + <th>{{ 'question.metadata.themes' | translate }}</th> + <th>{{ 'question.metadata.deadline' | translate }}</th> + <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.clients' | translate }}</th> + <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.participants' | translate }}</th> + <th ng-if="currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">{{ 'question.metadata.relatedDocuments' | translate }}</th> + <th ng-if="currentUser.role == 'MEMBER' || currentUser.role == 'CLIENT'">{{ 'question.metadata.status' | translate }}</th> + <th></th> + </tr> + </thead> + <tbody> + <tr ng-repeat="question in questions" > + <td ng-if="currentUser.role != 'MEMBER'"><a href="#/questions/{{question.id}}" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a></td> + <td ng-if="currentUser.role == 'MEMBER'">{{question.title}}</td> - <td>{{question.submissionDate | date:'mediumDate'}}</td> + <td>{{question.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> - <td>{{question.deadline | date:'mediumDate'}}</td> + <td>{{question.deadline | date:'mediumDate'}}</td> - <!-- clients : we use ng-if for better tooltip management --> - <td ng-if="question.clients && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> - </td> - <td ng-if="!question.clients && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> + <!-- clients : we use ng-if for better tooltip management --> + <td ng-if="question.clients && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> + <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> + </td> + <td ng-if="!question.clients && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> - <!-- participants --> - <td ng-if="question.participants && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> - </td> - <td ng-if="!question.participants && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> + <!-- participants --> + <td ng-if="question.participants && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> + <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> + </td> + <td ng-if="!question.participants && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> - <!-- related documents --> - <td ng-if="question.relatedDocuments && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> - </td> - <td ng-if="!question.relatedDocuments && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> + <!-- related documents --> + <td ng-if="question.relatedDocuments && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'"> + <span tooltip-placement="bottom" tooltip-html-unsafe="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> + </td> + <td ng-if="!question.relatedDocuments && currentUser.role != 'MEMBER' && currentUser.role != 'CLIENT'">0</td> - <td ng-if="currentUser.role == 'MEMBER' || currentUser.role == 'CLIENT'">{{question.status}}</td> + <td ng-if="currentUser.role == 'MEMBER' || currentUser.role == 'CLIENT'">{{question.status}}</td> - <td> - <!--<a class="btn btn-action btn-disable" ng-click="closeQuestion(question.id)"--> - <!--ng-if="currentUser.role == 'SUPERVISOR'">--> - <!--<span class="fa fa-close" aria-hidden="true"></span>Close</a>--> - <a class="btn btn-action btn-disable" - ng-confirm-message="question.message.delete" - ng-confirm-click="deleteQuestion(question.id)" - ng-if="currentUser.role == 'SUPERVISOR' || currentUser.role == 'ADMIN'"> - <span class="fa fa-close" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> - </td> - </tr> + <td> + <!--<a class="btn btn-action btn-disable" ng-click="closeQuestion(question.id)"--> + <!--ng-if="currentUser.role == 'SUPERVISOR'">--> + <!--<span class="fa fa-close" aria-hidden="true"></span>Close</a>--> + <a class="btn btn-action btn-disable" + ng-confirm-message="question.message.delete" + ng-confirm-click="deleteQuestion(question.id)" + ng-if="currentUser.role == 'SUPERVISOR' || currentUser.role == 'ADMIN'"> + <span class="fa fa-close" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> + </td> + </tr> + </tbody> </table> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index f72954d..362d4b4 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -40,20 +40,24 @@ <dd> <table class="table table-bordered table-condensed"> - <tr> - <th>{{ 'document.metadata.name' | translate }}</th> - <th>{{ 'document.metadata.authors' | translate }}</th> - <th>{{ 'document.metadata.keywords' | translate }}</th> - <th>{{ 'document.metadata.depositor' | translate }}</th> - <th>{{ 'document.metadata.depositDate' | translate }}</th> - </tr> - <tr ng-repeat="document in question.relatedDocuments"> - <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> - <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> - <td>{{document.ownerName}}</td> - <td>{{document.depositDate | date:'mediumDate'}}</td> - </tr> + <thead> + <tr> + <th>{{ 'document.metadata.name' | translate }}</th> + <th>{{ 'document.metadata.authors' | translate }}</th> + <th>{{ 'document.metadata.keywords' | translate }}</th> + <th>{{ 'document.metadata.depositor' | translate }}</th> + <th>{{ 'document.metadata.depositDate' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="document in question.relatedDocuments"> + <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> + <td>{{document.authors}}</td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> + <td>{{document.depositDate | date:'mediumDate'}}</td> + </tr> + </tbody> </table> </dd> </dl> @@ -69,42 +73,57 @@ <dd> <table class="table table-bordered table-condensed"> - <tr> - <th>{{ 'document.metadata.name' | translate }}</th> - <th>{{ 'document.metadata.authors' | translate }}</th> - <th>{{ 'document.metadata.keywords' | translate }}</th> - <th>{{ 'document.metadata.depositor' | translate }}</th> - <th>{{ 'document.metadata.depositDate' | translate }}</th> - </tr> - <tr ng-repeat="document in question.closingDocuments"> - <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> - <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> - <td>{{document.ownerName}}</td> - <td>{{document.depositDate | date:'mediumDate'}}</td> - </tr> + <thead> + <tr> + <th>{{ 'document.metadata.name' | translate }}</th> + <th>{{ 'document.metadata.authors' | translate }}</th> + <th>{{ 'document.metadata.keywords' | translate }}</th> + <th>{{ 'document.metadata.depositor' | translate }}</th> + <th>{{ 'document.metadata.depositDate' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="document in question.closingDocuments"> + <td><a href="#/documents/{{document.id}}" target="_blank">{{document.name}}</a></td> + <td>{{document.authors}}</td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + <td>{{document.ownerName}}</td> + <td>{{document.depositDate | date:'mediumDate'}}</td> + </tr> + </tbody> </table> </dd> </dl> <dl> - <dt>{{ 'question.metadata.parentsPhrase' | translate }}</dt> + <dt>{{ 'document.metadata.relatedQuestions' | translate }}</dt> <dd> - <ul> - <li ng-repeat="parent in question.parents"> - <a href="#/questions/{{parent.id}}" target="_blank">{{parent.title}}</a> - </li> - </ul> - </dd> - </dl> - <dl> - <dt>{{ 'question.metadata.childrenPhrase' | translate }}</dt> - <dd> - <ul> - <li ng-repeat="child in question.children"> - <a href="#/questions/{{child.id}}" target="_blank">{{child.title}}</a> - </li> - </ul> + <table class="table table-bordered table-condensed"> + <thead> + <tr> + <th><span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span> {{ 'question.metadata.parentsPhrase' | translate }}</th> + <th>{{ 'question.metadata.childrenPhrase' | translate }} <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span></th> + </tr> + </thead> + <tbody> + <tr> + <td> + <ul> + <li ng-repeat="parent in question.parents"> + <a href="#/questions/{{parent.id}}" target="_blank">{{parent.title}}</a> + </li> + </ul> + </td> + <td> + <ul> + <li ng-repeat="child in question.children"> + <a href="#/questions/{{child.id}}" target="_blank">{{child.title}}</a> + </li> + </ul> + </td> + </tr> + </tbody> + </table> </dd> </dl> </div> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index bf8351e..4aee12d 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -27,7 +27,7 @@ </div> <!-- Search Line --> - <div class="form-group row"> + <div class="form-group row search-zone"> <label class="col-md-2 control-label">{{ 'referential.search.keywords' | translate }}</label> <div class="col-md-4"> @@ -64,25 +64,29 @@ <!-- Documents Table --> <div class="" ng-if="result.documents && result.documents.length > 0"> - <h3 ng-if="result.documents.length > 1">{{result.documents.length}} {{ 'referential.search.multipleDocumentsFound' | translate }}</h3> - <h3 ng-if="result.documents.length < 2">{{result.documents.length}} {{ 'referential.search.singleDocumentFound' | translate }}</h3> + <p ng-if="result.documents.length > 1">{{result.documents.length}} {{ 'referential.search.multipleDocumentsFound' | translate }}</p> + <p ng-if="result.documents.length < 2">{{result.documents.length}} {{ 'referential.search.singleDocumentFound' | translate }}</p> <table class="table" title="Documents"> - <tr> - <th>{{ 'document.metadata.name' | translate }}</th> - <th>{{ 'document.metadata.depositDate' | translate }}</th> - <th>{{ 'document.metadata.authors' | translate }}</th> - <th>{{ 'document.metadata.keywords' | translate }}</th> - </tr> - <tr ng-repeat="document in result.documents"> - <td> - <a href="#/documents/{{document.id}}" target="_blank" - tooltip-placement="bottom" tooltip-html-unsafe="{{document.summary}}">{{document.name}}</a> - </td> - <td>{{document.depositDate | date:'mediumDate'}}</td> - <td>{{document.authors}}</td> - <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> - </tr> + <thead> + <tr> + <th>{{ 'document.metadata.name' | translate }}</th> + <th>{{ 'document.metadata.depositDate' | translate }}</th> + <th>{{ 'document.metadata.authors' | translate }}</th> + <th>{{ 'document.metadata.keywords' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="document in result.documents"> + <td> + <a href="#/documents/{{document.id}}" target="_blank" + tooltip-placement="bottom" tooltip-html-unsafe="{{document.summary}}">{{document.name}}</a> + </td> + <td>{{document.depositDate | date:'mediumDate'}}</td> + <td>{{document.authors}}</td> + <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> + </tr> + </tbody> </table> </div> @@ -92,26 +96,30 @@ <!-- Questions Table --> <div class="" ng-if="result.questions && result.questions.length > 0"> - <h3 ng-if="result.questions.length > 1">{{result.questions.length}} {{ 'referential.search.multipleQuestionsFound' | translate }}</h3> - <h3 ng-if="result.questions.length < 2">{{result.questions.length}} {{ 'referential.search.singleQuestionFound' | translate }}</h3> + <p ng-if="result.questions.length > 1">{{result.questions.length}} {{ 'referential.search.multipleQuestionsFound' | translate }}</p> + <p ng-if="result.questions.length < 2">{{result.questions.length}} {{ 'referential.search.singleQuestionFound' | translate }}</p> <table class="table" title="Questions"> - <tr> - <th>{{ 'question.metadata.title' | translate }}</th> - <th>{{ 'question.metadata.submissionDate' | translate }}</th> - <th>{{ 'question.metadata.themes' | translate }}</th> - <th>{{ 'question.metadata.status' | translate }}</th> - </tr> - <tr ng-repeat="question in result.questions"> - <td ng-if="currentUser.role != 'MEMBER'"> - <a href="#/questions/{{question.id}}" target="_blank" - tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> - </td> - <td>{{question.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> - <td>{{question.status}}</td> - </tr> + <thead> + <tr> + <th>{{ 'question.metadata.title' | translate }}</th> + <th>{{ 'question.metadata.submissionDate' | translate }}</th> + <th>{{ 'question.metadata.themes' | translate }}</th> + <th>{{ 'question.metadata.status' | translate }}</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="question in result.questions"> + <td ng-if="currentUser.role != 'MEMBER'"> + <a href="#/questions/{{question.id}}" target="_blank" + tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + </td> + <td>{{question.submissionDate | date:'mediumDate'}}</td> + <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> + <td>{{question.status}}</td> + </tr> + </tbody> </table> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/adminUsers.html b/coselmar-ui/src/main/webapp/views/users/adminUsers.html index fd03b84..ac17557 100644 --- a/coselmar-ui/src/main/webapp/views/users/adminUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/adminUsers.html @@ -26,74 +26,42 @@ <div ng-include="src='views/users/searchPart.html'" /> - <br/> - <table class="table"> - <tr ng-if="advanced"> - <form class="form-inline" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Name" ng-model="example.name" /> + <table class="table table-bordered"> + <thead> + <tr> + <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th> + <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th> + <th class="col-md-1"></th> + </tr> + </thead> + <tbody> + <tr ng-repeat="user in users"> + <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> + <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> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Mail" ng-model="example.mail" /> - </td> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Qualification" ng-model="example.qualification" /> - </td> - <td class="form-group"> - <input type="search" class="form-control" placeholder="Organization" ng-model="example.organization" /> - </td> - <td class="form-group"> - <select class="form-control" name="role" ng-model="example.role" title="role" > - <option value="ALL">{{ 'user.metadata.role.all' | translate }}</option> - <option value="ADMIN">{{ 'user.metadata.role.admin' | translate }}</option> - <option value="SUPERVISOR">{{ 'user.metadata.role.supervisor' | translate }}</option> - <option value="EXPERT">{{ 'user.metadata.role.expert' | translate }}</option> - <option value="MEMBER">{{ 'user.metadata.role.member' | translate }}</option> - <option value="CLIENT">{{ 'user.metadata.role.client' | translate }}</option> - </select> - </td> - <td class="form-group"> - <select class="form-control" name="active" ng-model="example.active" title="active" > - <option value="true">{{ 'user.metadata.status.enable' | translate }}</option> - <option value="false">{{ 'user.metadata.status.disable' | translate }}</option> - </select> - </td> - <td class="form-group text-center"> - <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> - </td> - </form> - </tr> - <tr> - <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th> - <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th> - <th class="col-md-1"></th> - </tr> - <tr ng-repeat="user in users"> - <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> - <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> + </tr> + </tbody> </table> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index 56e6592..7fe901a 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -1,7 +1,7 @@ <!-- Simple search part --> -<div class="row"> - <div class="form-group col-md-5"> +<div> + <div class="form-group"> <a href="#/users/new" class="form-inline navbar-left btn btn-primary" ng-if="currentUser.role == 'ADMIN'"> {{ 'user.button.add' | translate }} </a> @@ -11,7 +11,7 @@ </a> </div> - <form class="form-inline cold-md-7" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> + <form class="form-inline pull-right search-zone" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-if="!advanced"> <div class="form-group"> <input type="checkbox" class="form-control" ng-model="search.showDisable" /> <span>{{ 'user.button.showDisable' | translate }}</span> @@ -25,18 +25,18 @@ </form> </div> -<div class="row"> - <div class="form-group col-md-5" ng-show="!advanced"> +<div class="text-right clear"> + <div class="form-group" ng-show="!advanced"> <a ng-click="advanced=true" class="fa fa-sort-down">{{ 'common.button.advanceSearch' | translate }}</a> </div> - <div class="form-group col-md-5" ng-show="advanced"> + <div class="form-group" ng-show="advanced"> <a ng-click="advanced=false" class="fa fa-sort-up">{{ 'common.button.simpleSearch' | translate }}</a> </div> </div> <!-- Advanced Search part --> -<div ng-if="advanced" > +<div ng-if="advanced" class="search-zone marginBottom20"> <form class="form-horizontal" name="userFullOption" role="userFullOptions" ng-submit="advancedSearchUsers()"> <div class="form-group row"> @@ -89,8 +89,10 @@ <option value="false">{{ 'user.metadata.status.disable' | translate }}</option> </select> </div> - - <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> + + <div class="col-md-3 text-right"> + <button type="submit" class="btn btn-default fa fa-search" ng-click="advancedSearchUsers()">Search</button> + </div> </div> </form> diff --git a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html index 3542ea7..c87fd47 100644 --- a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html @@ -26,40 +26,43 @@ <div ng-include="src='views/users/searchPart.html'" /> - <br/> - <table class="table"> - <tr> - <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th> - <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th> - <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th> - <th class="col-md-1"></th> - </tr> - <tr ng-repeat="user in users"> - <td>{{user.firstName}} {{user.name}}</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.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> + <table class="table table-bordered"> + <thead> + <tr> + <th class="col-md-2">{{ 'user.metadata.name' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.mail' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.qualification' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.organization' | translate }}</th> + <th class="col-md-2">{{ 'user.metadata.role' | translate }}</th> + <th class="col-md-1">{{ 'user.metadata.status' | translate }}</th> + <th class="col-md-1"></th> + </tr> + </thead> + <tbody> + <tr ng-repeat="user in users"> + <td>{{user.firstName}} {{user.name}}</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.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> + </tbody> </table> </div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.