branch develop updated (2107c8d -> 31d7b3e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 2107c8d Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 31d7b3e Fixes #6547 : Change display of question, document, referential and users pages The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 31d7b3e7ba077cb892cdaa018ecd0850c51e80ab Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Jan 28 18:48:32 2015 +0100 Fixes #6547 : Change display of question, document, referential and users pages Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 28 +++- .../main/webapp/views/documents/editDocument.html | 80 ++++----- .../main/webapp/views/documents/newdocument.html | 79 +++++---- .../main/webapp/views/documents/viewDocument.html | 185 ++++++++++++--------- .../main/webapp/views/questions/editquestion.html | 163 +++++++++--------- .../main/webapp/views/questions/newquestion.html | 9 +- .../src/main/webapp/views/questions/question.html | 2 - .../main/webapp/views/questions/viewquestion.html | 4 +- .../main/webapp/views/referential/referential.html | 57 +++---- .../src/main/webapp/views/users/edituser.html | 7 +- .../src/main/webapp/views/users/newuser.html | 1 + 11 files changed, 332 insertions(+), 283 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 31d7b3e7ba077cb892cdaa018ecd0850c51e80ab Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Jan 28 18:48:32 2015 +0100 Fixes #6547 : Change display of question, document, referential and users pages --- coselmar-ui/src/main/webapp/css/coselmar.css | 28 +++- .../main/webapp/views/documents/editDocument.html | 80 ++++----- .../main/webapp/views/documents/newdocument.html | 79 +++++---- .../main/webapp/views/documents/viewDocument.html | 185 ++++++++++++--------- .../main/webapp/views/questions/editquestion.html | 163 +++++++++--------- .../main/webapp/views/questions/newquestion.html | 9 +- .../src/main/webapp/views/questions/question.html | 2 - .../main/webapp/views/questions/viewquestion.html | 4 +- .../main/webapp/views/referential/referential.html | 57 +++---- .../src/main/webapp/views/users/edituser.html | 7 +- .../src/main/webapp/views/users/newuser.html | 1 + 11 files changed, 332 insertions(+), 283 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 0298214..0f6d88d 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -222,6 +222,11 @@ dl > dd { .aside dl:last-child { border-bottom: 0 none; } +.aside dl:after { + content: ""; + display: table; + clear: both; +} .aside dl > dt { float: left; @@ -244,6 +249,15 @@ dl > dd { margin: 3px; padding: 3px 7px; } +.tag { + background-color: #F5F5F5; + border: 1px solid #DDD; + margin: 0 10px; + padding: 3px 3px 3px 7px; +} +.tag .close { + padding-left: 5px; +} .search-zone { background-color: #F5F5F5; @@ -259,8 +273,14 @@ dl > dd { /* Override Boostrap default classes -------------------------------------------------- */ .btn-primary { - background-color: #39a0a8; - border-color: #3a8a8a; + background-color: #39a0a8; + border-color: #3a8a8a; + color: #FFF; +} +.btn-primary:hover { + background-color: #097078 !important; + color: #FFF; + border-color: #3a8a8a; } .page-header { @@ -346,6 +366,10 @@ a.dropdown-toggle:hover .caret { font-weight: normal; } +.btn.disabled, .btn[disabled] { + opacity: 0.45; +} + /* remove the stupid float on right with bootstrap close class */ .close { float: none; diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 64c296b..61bd0f9 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -31,7 +31,7 @@ <form class="form-horizontal" name="documentForm" role="form" > - <!-- Line with Title, type and privacy --> + <!-- Line with Title & Authors --> <div class="form-group row"> <div ng-class="{'has-error' : documentForm.name.$invalid && !documentForm.name.$pristine}"> <label class="col-md-2 control-label">{{ 'document.metadata.name' | translate }} *</label> @@ -45,12 +45,28 @@ class="help-block">{{ 'document.message.requiredName' | translate }}</p> </div> </div> + <div ng-class="{'has-error' : documentForm.authors.$invalid + && !documentForm.authors.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> + + <div class="col-md-4"> + <input type="text" class="form-control" name="authors" + placeholder="Name FirstName" + ng-model="document.authors" required/> + <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" + class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> + </div> + </div> + </div> + + <!-- Line with Type and privacy --> + <div class="form-group row"> <div class="" ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> - <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'document.metadata.type' | translate }} *</label> - <div class="col-md-2"> + <div class="col-md-4"> <select class="form-control" name="type" ng-model="document.type" required> <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> @@ -76,9 +92,9 @@ <div> - <label class="col-md-1 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <input type="text" class="form-control" name="type" data-ng-model="document.privacy" disabled="disabled"/> </div> @@ -140,7 +156,7 @@ <div class="col-md-7"> - <span ng-repeat="keyword in document.keywords" class="" aria-hidden="true"> + <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> {{keyword}} <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> × @@ -150,22 +166,8 @@ </div> </div> - <!-- Line with Authors and copyright--> + <!-- Line with copyright & License --> <div class="form-group"> - <div ng-class="{'has-error' : documentForm.authors.$invalid - && !documentForm.authors.$pristine}"> - <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> - - <div class="col-md-4"> - <input type="text" class="form-control" name="authors" - placeholder="Name FirstName" - ng-model="document.authors" required/> - - <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" - class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> - </div> - </div> - <div ng-class="{'has-error' : documentForm.copyright.$invalid && !documentForm.copyright.$pristine}"> @@ -180,10 +182,6 @@ class="help-block">{{ 'document.message.requiredCopyright' | translate }}</p> </div> </div> - </div> - - <!-- Line with License, publication date and language --> - <div class="form-group"> <div > <label class="col-md-2 control-label">{{ 'document.metadata.licence' | translate }}</label> @@ -193,21 +191,14 @@ ng-model="document.licence"/> </div> </div> + </div> - <div> - <label class="col-md-1 control-label">{{ 'document.metadata.language' | translate }}</label> - - <div class="col-md-1"> - <input type="text" class="form-control" name="language" - placeholder="en,fr,..." - ng-model="document.language"/> - </div> - </div> - + <!-- Line with Publication date and language --> + <div class="form-group"> <div> <label class="col-md-2 control-label">{{ 'document.metadata.publicationDate' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" placeholder="dd/MM/yyyy" @@ -219,6 +210,15 @@ </div> </div> + <div> + <label class="col-md-2 control-label">{{ 'document.metadata.language' | translate }}</label> + + <div class="col-md-1"> + <input type="text" class="form-control" name="language" + placeholder="en,fr,..." + ng-model="document.language"/> + </div> + </div> </div> <!-- Summary --> @@ -247,13 +247,13 @@ </div> </div> - <div class="form-group"> - <div ng-if="hasErrors" class="has-error"> + <div> + <div ng-if="documentForm.$invalid" class="has-error"> <div class="text-center help-block">{{ 'common.message.missingMandatoryFields' | translate }}</div> </div> - <div class="float-right col-md-4"> + <div class="actions"> <input type="submit" value="Submit" class="btn btn-action btn-success" - ng-click="saveDocument()" /> + ng-click="saveDocument()" ng-disabled="documentForm.$invalid" /> </div> </div> </form> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 3fd948f..0484a2d 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -38,7 +38,7 @@ <form class="form-horizontal" name="documentForm" role="form" ng-submit="createNewDocument(documentForm.$valid)"> - <!-- Line with Title, type and privacy --> + <!-- Line with Title & Authors --> <div class="form-group row"> <div class="" ng-class="{'has-error' : documentForm.name.$invalid && !documentForm.name.$pristine}"> @@ -53,12 +53,29 @@ class="help-block">{{ 'document.message.requiredName' | translate }}</p> </div> </div> + + <div ng-class="{'has-error' : documentForm.authors.$invalid + && !documentForm.authors.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> + + <div class="col-md-4"> + <input type="text" class="form-control" name="authors" + placeholder="Name Firstname" + ng-model="document.authors" required/> + <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" + class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> + </div> + </div> + </div> + + <!-- Line with Type and privacy --> + <div class="form-group"> <div class="" ng-class="{'has-error' : documentForm.type.$invalid && !documentForm.type.$pristine}"> - <label class="col-md-1 control-label">{{ 'document.metadata.type' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'document.metadata.type' | translate }} *</label> - <div class="col-md-2"> + <div class="col-md-4"> <select class="form-control" name="type" ng-model="document.type" required> <option value="PERIODICAL_PUBLICATION">{{ 'document.metadata.type.periodicalPublication' | translate }}</option> <option value="MEETING_PUBLICATION">{{ 'document.metadata.type.meetingPublication' | translate }}</option> @@ -84,9 +101,9 @@ <div> - <label class="col-md-1 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <select class="form-control" name="privacy" ng-model="document.privacy"> <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> @@ -166,22 +183,8 @@ </div> </div> - <!-- Line with Authors and copyright--> + <!-- Line with copyright & License --> <div class="form-group"> - <div ng-class="{'has-error' : documentForm.authors.$invalid - && !documentForm.authors.$pristine}"> - <label class="col-md-2 control-label">{{ 'document.metadata.authors' | translate }} *</label> - - <div class="col-md-4"> - <input type="text" class="form-control" name="authors" - placeholder="Name Firstname" - ng-model="document.authors" required/> - - <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" - class="help-block">{{ 'document.message.requiredAuthors' | translate }}</p> - </div> - </div> - <div ng-class="{'has-error' : documentForm.copyright.$invalid && !documentForm.copyright.$pristine}"> @@ -196,10 +199,6 @@ class="help-block">{{ 'document.message.requiredCopyright' | translate }}</p> </div> </div> - </div> - - <!-- Line with License, publication date and language --> - <div class="form-group"> <div > <label class="col-md-2 control-label">{{ 'document.metadata.licence' | translate }}</label> @@ -209,21 +208,14 @@ ng-model="document.licence"/> </div> </div> + </div> - <div> - <label class="col-md-1 control-label">{{ 'document.metadata.language' | translate }}</label> - - <div class="col-md-1"> - <input type="text" class="form-control" name="language" - placeholder="en,fr,..." - ng-model="document.language"/> - </div> - </div> - + <!-- Line with Publication date and language --> + <div class="form-group"> <div> <label class="col-md-2 control-label">{{ 'document.metadata.publicationDate' | translate }}</label> - <div class="col-md-2"> + <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" placeholder="dd/MM/yyyy" @@ -233,7 +225,16 @@ <span class="input-group-addon"><span class="glyphicon glyphicon-calendar" aria-hidden="true"></span></span> </div> </div> + </div> + + <div> + <label class="col-md-2 control-label">{{ 'document.metadata.language' | translate }}</label> + <div class="col-md-1"> + <input type="text" class="form-control" name="language" + placeholder="en,fr,..." + ng-model="document.language"/> + </div> </div> </div> @@ -263,11 +264,9 @@ </div> </div> - <div class="form-group"> - <div class="float-right col-md-4"> - <input type="submit" value="Submit" class="btn btn-primary" - ng-if="documentForm.$valid && privacy != 'RESTRICTED'"/> - </div> + <div class="form-group actions" ng-if="privacy != 'RESTRICTED'"> + <input type="submit" value="Submit" class="btn btn-action" + ng-disabled="documentForm.$invalid"/> </div> </form> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 7287fbb..2cced64 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -29,93 +29,114 @@ </h1> </div> <div> - <table class="table table-striped"> - <tr> - <td>{{ 'document.metadata.name' | translate }}</td> - <td>{{document.name}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.depositor' | translate }}</td> - <td>{{document.ownerName}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.type' | translate }}</td> + + <div class="form-group col-md-8"> + <dl> + <dt>{{ 'document.metadata.name' | translate }}</dt> + <dd>{{document.name}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.type' | translate }}</dt> <!-- Manage translation of document type --> - <td ng-if="document.type == 'PERIODICAL_PUBLICATION'">{{ 'document.metadata.type.periodicalPublication' | translate }}</td> - <td ng-if="document.type == 'MEETING_PUBLICATION'">{{ 'document.metadata.type.meetingPublication' | translate }}</td> - <td ng-if="document.type == 'THESIS'">{{ 'document.metadata.type.thesis' | translate }}</td> - <td ng-if="document.type == 'REPORT'">{{ 'document.metadata.type.report' | translate }}</td> - <td ng-if="document.type == 'SCIENTIFIC_REPORT'">{{ 'document.metadata.type.scientificReport' | translate }}</td> - <td ng-if="document.type == 'SCIENTIFIC_WORK'">{{ 'document.metadata.type.scientificWork' | translate }}</td> - <td ng-if="document.type == 'CHAPTER_WORK'">{{ 'document.metadata.type.chapterWork' | translate }}</td> - <td ng-if="document.type == 'CONTRACT_REPORT'">{{ 'document.metadata.type.contractReport' | translate }}</td> - <td ng-if="document.type == 'EXPERTISE'">{{ 'document.metadata.type.expertise' | translate }}</td> - <td ng-if="document.type == 'POSTER'">{{ 'document.metadata.type.poster' | translate }}</td> - <td ng-if="document.type == 'CONFERENCE_ARTICLE'">{{ 'document.metadata.type.conferenceArticle' | translate }}</td> - <td ng-if="document.type == 'CONFERENCE_SUMMARY'">{{ 'document.metadata.type.conferenceSummary' | translate }}</td> - </tr> - <tr> - <td>{{ 'document.metadata.keywords' | translate }}</td> - <td>{{document.keywords}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.privacy' | translate }}</td> - <td>{{document.privacy}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.depositDate' | translate }}</td> - <td>{{document.depositDate | date:'mediumDate'}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.summary' | translate }}</td> - <td>{{document.summary}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.authors' | translate }}</td> - <td>{{document.authors}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.copyright' | translate }}</td> - <td>{{document.copyright}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.licence' | translate }}</td> - <td>{{document.license}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.language' | translate }}</td> - <td>{{document.language}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.publicationDate' | translate }}</td> - <td>{{document.publicationDate | date:'mediumDate'}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.mimetype' | translate }}</td> - <td ng-if="document.withFile">{{document.mimeType}}</td> - <td ng-if="!document.withFile">{{ 'document.metadata.externalLink' | translate }}</td> - </tr> - <tr ng-if="document.withFile && document.fileName"> - <td>{{ 'document.metadata.fileName' | translate }}</td> - <td>{{document.fileName}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.comment' | translate }}</td> - <td>{{document.comment}}</td> - </tr> - <tr> - <td>{{ 'document.metadata.view.relatedQuestions' | translate }}</td> - <td>{{document.relatedQuestions.length || 0}}</td> - </tr> - </table> - <div class="float-right"> + <dd ng-if="document.type == 'PERIODICAL_PUBLICATION'">{{ 'document.metadata.type.periodicalPublication' | translate }}</dd> + <dd ng-if="document.type == 'MEETING_PUBLICATION'">{{ 'document.metadata.type.meetingPublication' | translate }}</dd> + <dd ng-if="document.type == 'THESIS'">{{ 'document.metadata.type.thesis' | translate }}</dd> + <dd ng-if="document.type == 'REPORT'">{{ 'document.metadata.type.report' | translate }}</dd> + <dd ng-if="document.type == 'SCIENTIFIC_REPORT'">{{ 'document.metadata.type.scientificReport' | translate }}</dd> + <dd ng-if="document.type == 'SCIENTIFIC_WORK'">{{ 'document.metadata.type.scientificWork' | translate }}</dd> + <dd ng-if="document.type == 'CHAPTER_WORK'">{{ 'document.metadata.type.chapterWork' | translate }}</dd> + <dd ng-if="document.type == 'CONTRACT_REPORT'">{{ 'document.metadata.type.contractReport' | translate }}</dd> + <dd ng-if="document.type == 'EXPERTISE'">{{ 'document.metadata.type.expertise' | translate }}</dd> + <dd ng-if="document.type == 'POSTER'">{{ 'document.metadata.type.poster' | translate }}</dd> + <dd ng-if="document.type == 'CONFERENCE_ARTICLE'">{{ 'document.metadata.type.conferenceArticle' | translate }}</dd> + <dd ng-if="document.type == 'CONFERENCE_SUMMARY'">{{ 'document.metadata.type.conferenceSummary' | translate }}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.mimetype' | translate }}</dt> + <dd ng-if="document.withFile">{{document.mimeType}}</sd> + <dd ng-if="!document.withFile">{{ 'document.metadata.externalLink' | translate }}</sd> + </dl> + <dl ng-if="document.withFile && document.fileName"> + <dt>{{ 'document.metadata.fileName' | translate }}</dt> + <dd>{{document.fileName}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.summary' | translate }}</dt> + <dd>{{document.summary}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.comment' | translate }}</dt> + <dd>{{document.comment}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.relatedQuestions' | translate }}</dt> + <dd>/* FIXME : add related questions */</dd> + </dl> + </div> + + <div class="form-group col-md-4 aside"> + <dl> + <dt>{{ 'document.metadata.depositor' | translate }}</dt> + <dd>{{document.ownerName}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.authors' | translate }}</dt> + <dd>{{document.authors}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.keywords' | translate }}</dt> + <dd> + <ul> + <li ng-if="document.keywords" ng-repeat="keyword in document.keywords"> + {{keyword}} + </li> + </ul> + </dd> + </dl> + <dl> + <dt>{{ 'document.metadata.privacy' | translate }}</dt> + <dd>{{document.privacy}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.depositDate' | translate }}</dt> + <dd>{{document.depositDate | date:'mediumDate'}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.publicationDate' | translate }}</dt> + <dd>{{document.publicationDate | date:'mediumDate'}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.copyright' | translate }}</dt> + <dd>{{document.copyright}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.licence' | translate }}</dt> + <dd>{{document.license}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.language' | translate }}</dt> + <dd>{{document.language}}</dd> + </dl> + <dl> + <dt>{{ 'document.metadata.view.relatedQuestions' | translate }}</dt> + <dd>{{document.relatedQuestions.length || 0}}</dd> + </dl> + </div> + + <div class="actions"> <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true && canEdit"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> - <a href="{{container.baseUrl}}/documents/{{document.id}}/file" class="btn btn-action btn-success" ng-if="document.withFile">{{ 'document.button.download' | translate }}</a> - <a href="{{document.externalUrl}}" target="_blank" class="btn btn-action btn-success" ng-if="document.externalUrl">{{ 'document.button.openLink' | translate }}</a> + <a href="{{container.baseUrl}}/documents/{{document.id}}/file" class="btn btn-action btn-success" ng-if="document.withFile"> + <span class="fa fa-download" aria-hidden="true"></span>{{ 'document.button.download' | translate }} + </a> + <a href="{{document.externalUrl}}" target="_blank" class="btn btn-action btn-success" ng-if="document.externalUrl"> + <span class="fa fa-external-link" aria-hidden="true"></span>{{ 'document.button.openLink' | translate }} + </a> <a class="btn btn-action btn-disable" ng-if="currentUser.role == 'ADMIN'" ng-confirm-message="Do you really want to delete this document ?" - ng-confirm-click="deleteDocument(document.id)">{{ 'common.button.delete' | translate }}</a> + ng-confirm-click="deleteDocument(document.id)"> + <span class="fa fa-remove" aria-hidden="true"></span>{{ 'common.button.delete' | translate }} + </a> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 3c0044b..8f1322a 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -135,7 +135,7 @@ <div class="col-md-7"> - <span ng-repeat="theme in question.themes" class="" aria-hidden="true"> + <span ng-repeat="theme in question.themes" class="tag" aria-hidden="true"> {{theme}} <button type="button" class="close" title="remove" ng-click="removeTheme(theme);"> × @@ -147,8 +147,91 @@ <!-- End Line with Themes --> + <!-- Line with Parent Questions --> + + <div class="form-group" > + + + <label class="col-md-2 control-label">{{ 'question.metadata.parents' | translate }}</label> + + <div class="col-md-10"> + <table class="table table-bordered table-condensed"> + <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> + <th> + <a class="btn fa fa-search" title="Search parent question" + ng-click="modalSearchParents()" /> + </th> + </tr> + </thead> + <tbody> + <tr ng-repeat="parent in question.parents"> + <td tooltip-placement="bottom" tooltip-html-unsafe="{{parent.summary}}"> + {{parent.title}} + </td> + <td>{{parent.submissionDate | date:'mediumDate'}}</td> + <td><span ng-repeat="theme in parent.themes">{{theme}}, </span></td> + <td>{{parent.status}}</td> + <td><a class="btn fa fa-minus" title="Remove parent question" + ng-click="removeParent(parent)" + ng-if="currentUser.role == 'SUPERVISOR'"/></td> + </tr> + </tbody> + </table> + </div> + + </div> + + <!-- End Line with Parent Questions --> + + <!-- Line with Related Document --> + + <div class="form-group" > + + + <label class="col-md-2 control-label">{{ 'question.metadata.relatedDocuments' | translate }}</label> + + <div class="col-md-10"> + <table class="table table-bordered table-condensed"> + <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> + <th> + <a class="btn fa fa-search" title="Search document" + ng-click="modalSearchDocuments(question.relatedDocuments)" /> + <a class="btn fa fa-plus" title="Add new Document" + ng-click="modalCreateDocument(question.relatedDocuments)"/> + </th> + </tr> + </thead> + <tbody> + <tr ng-repeat="document in question.relatedDocuments"> + <td>{{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> + <td><a class="btn fa fa-minus" title="Remove document" + ng-click="removeDocument(document, question.relatedDocuments)" + ng-if="currentUser.role == 'SUPERVISOR'"/></td> + </tr> + </tbody> + </table> + </div> + + </div> + + <!-- End Line with Related Document --> - <!-- Line with Experts and clients --> +<!-- Line with Experts and clients --> <div class="form-group row" > @@ -256,79 +339,3 @@ <!-- End Line with External Experts and Supervisor --> - - <!-- Line with Parent Questions --> - - <div class="form-group" > - - - <label class="col-md-2 control-label">{{ 'question.metadata.parents' | translate }}</label> - - <div class="col-md-10"> - <table class="table table-bordered table-condensed"> - <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> - <th> - <a class="btn fa fa-search" title="Search parent question" - ng-click="modalSearchParents()" /> - </th> - </tr> - <tr ng-repeat="parent in question.parents"> - <td tooltip-placement="bottom" tooltip-html-unsafe="{{parent.summary}}"> - {{parent.title}} - </td> - <td>{{parent.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in parent.themes">{{theme}}, </span></td> - <td>{{parent.status}}</td> - <td><a class="btn fa fa-minus" title="Remove parent question" - ng-click="removeParent(parent)" - ng-if="currentUser.role == 'SUPERVISOR'"/></td> - </tr> - </table> - </div> - - </div> - - <!-- End Line with Parent Questions --> - - <!-- Line with Related Document --> - - <div class="form-group" > - - - <label class="col-md-2 control-label">{{ 'question.metadata.relatedDocuments' | translate }}</label> - - <div class="col-md-10"> - <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> - <th> - <a class="btn fa fa-search" title="Search document" - ng-click="modalSearchDocuments(question.relatedDocuments)" /> - <a class="btn fa fa-plus" title="Add new Document" - ng-click="modalCreateDocument(question.relatedDocuments)"/> - </th> - </tr> - <tr ng-repeat="document in question.relatedDocuments"> - <td>{{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> - <td><a class="btn fa fa-minus" title="Remove document" - ng-click="removeDocument(document, question.relatedDocuments)" - ng-if="currentUser.role == 'SUPERVISOR'"/></td> - </tr> - </table> - </div> - - </div> - - <!-- End Line with Related Document --> diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index 03a33bc..fb9969e 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -22,8 +22,9 @@ #L% --> <div style="padding: 0px 0px 0px 30px"> - <div class="page-header" style="margin: 0"> + <div class="page-header" style="margin: 0 0 20px 0;"> <h2>{{ 'question.add.title' | translate }}</h2> + <span translate="common.message.mandatoryFieldsInfo"></span> </div> <div style="padding-bottom: 50px" ng-if="currentUser.role == 'SUPERVISOR'"> @@ -32,10 +33,8 @@ <div ng-include="src='views/questions/editquestion.html'"></div> - <div class="form-group" ng-if="questionForm.$valid && question.themes.length > 0"> - <div style="padding-left: 200px"> - <input type="submit" value="Validate" class="btn btn-primary" ng-click="saveQuestion(questionForm.$valid)"/> - </div> + <div class="form-group actions"> + <input type="submit" value="Validate" class="btn btn-action" ng-click="saveQuestion(questionForm.$valid)" ng-disabled="questionForm.$invalid"/> </div> </form> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 49bef59..cc9eb2b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -70,11 +70,9 @@ <a class="btn btn-action btn-success" ng-click="openCloseQuestionSession()"> <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.close' | translate }} </a> - - <a class="btn btn-action btn-edit" ng-click="adjournQuestion()"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'question.button.adjourn' | translate }} </a> - - <a class="btn btn-action btn-disable" ng-confirm-message="Do you really want to delete this question ?" ng-confirm-click="deleteQuestion()"> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 362d4b4..e210899 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -101,8 +101,8 @@ <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> + <th><span class="fa fa-level-down" aria-hidden="true"></span> {{ 'question.metadata.parentsPhrase' | translate }}</th> + <th>{{ 'question.metadata.childrenPhrase' | translate }} <span class="fa fa-level-up" aria-hidden="true"></span></th> </tr> </thead> <tbody> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 4aee12d..cbb2fc9 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -27,35 +27,36 @@ </div> <!-- Search Line --> - <div class="form-group row search-zone"> - <label class="col-md-2 control-label">{{ 'referential.search.keywords' | translate }}</label> - - <div class="col-md-4"> - <input type="text" class="form-control" name="keywords" - ng-model="search.keywords" ng-list placeholder="keyword1,keyword2,..."/> - </div> - - <div class="col-md-2"> - <label> - <input type="checkbox" name="onDocuments" ng-model="search.onDocuments" /> - {{ 'referential.search.documents' | translate }} - </label> - </div> - - <div class="col-md-2"> - <label> - <input type="checkbox" name="onQuestions" ng-model="search.onQuestions" /> - {{ 'referential.search.questions' | translate }} - </label> + <div class="search-zone"> + <div class="form-group row"> + <label class="col-md-2 control-label">{{ 'referential.search.keywords' | translate }}</label> + + <div class="col-md-4"> + <input type="text" class="form-control" name="keywords" + ng-model="search.keywords" ng-list placeholder="keyword1,keyword2,..."/> + </div> + + <div class="col-md-2"> + <label> + <input type="checkbox" name="onDocuments" ng-model="search.onDocuments" /> + {{ 'referential.search.documents' | translate }} + </label> + </div> + + <div class="col-md-2"> + <label> + <input type="checkbox" name="onQuestions" ng-model="search.onQuestions" /> + {{ 'referential.search.questions' | translate }} + </label> + </div> + + <div class="col-md-2"> + <a class="btn btn-action btn-success" ng-click="searchInReferential()"> + <span class="fa fa-search" aria-hidden="true"></span>{{ 'common.button.search' | translate }} + </a> + + </div> </div> - - <div class="col-md-2"> - <a class="btn btn-action btn-success" ng-click="searchInReferential()"> - <span class="fa fa-search" aria-hidden="true"></span>{{ 'common.button.search' | translate }} - </a> - - </div> - </div> <!-- End Search Line --> diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index aa09fbf..dd0bb34 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -171,10 +171,9 @@ </div> - <div class="form-group"> - <div class="float-right col-md-4"> - <input type="submit" value="Validate" class="btn btn-primary" ng-disabled="userForm.$invalid"/> - </div> + + <div class="actions"> + <input type="submit" value="Validate" class="btn btn-action" ng-disabled="userForm.$invalid"/> </div> </form> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/newuser.html b/coselmar-ui/src/main/webapp/views/users/newuser.html index 32ed5b8..db88f4d 100644 --- a/coselmar-ui/src/main/webapp/views/users/newuser.html +++ b/coselmar-ui/src/main/webapp/views/users/newuser.html @@ -24,6 +24,7 @@ <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h2>{{ 'user.create.title' | translate }}</h2> + <span translate="common.message.mandatoryFieldsInfo"></span> </div> <div class="info-panel" ng-if="currentUser.role == 'ADMIN'"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm