branch develop updated (a4555ef -> 3862881)
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 a4555ef Syntaxical corrections new 3862881 Refs-30 #6547 : Change display of question page 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 3862881ae8b5e7b88d04dad09b3f3eb54fbcdcd2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 19:07:38 2015 +0100 Refs-30 #6547 : Change display of question page Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 66 +++++- .../src/main/webapp/views/questions/question.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 232 ++++++++------------- 3 files changed, 156 insertions(+), 148 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 3862881ae8b5e7b88d04dad09b3f3eb54fbcdcd2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 19:07:38 2015 +0100 Refs-30 #6547 : Change display of question page --- coselmar-ui/src/main/webapp/css/coselmar.css | 66 +++++- .../src/main/webapp/views/questions/question.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 232 ++++++++------------- 3 files changed, 156 insertions(+), 148 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 50015d2..0919142 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -147,16 +147,17 @@ h1, h2 { } .btn-action:hover { - background-color: #39a0a8; + background-color: #39a0a8 !important; color: #FFF; } + .btn-edit { color: #f0ad4e; border-color: #f0ad4e; } .btn-edit:hover { - background-color: #f0ad4e; + background-color: #f0ad4e !important; } .btn-disable { @@ -164,7 +165,11 @@ h1, h2 { border-color: #d9534f; } .btn-disable:hover { - background-color: #d9534f; + background-color: #d9534f !important; +} + +.btn .fa { + padding-right: 5px; } /* Forms @@ -173,6 +178,59 @@ h1, h2 { border-color: #a94442; } +.actions { + background-color: rgba(53, 160, 168, 0.01); + clear: both; + padding: 10px 0; + border-top: 1px solid #EEE; + text-align: center; +} + +.actions .btn { + background-color: #FFF; + box-shadow: -2px -1px 8px rgba(0, 0, 0, 0.15) inset; +} + +/* Document & question view +-------------------------------------------------- */ + +.aside { + border-left: 5px solid rgba(53, 160, 168, 0.04); + padding-left: 10px; + font-size: 90%; + color: #888; +} + +.aside dl { + border-bottom: 1px solid #F5F5F5; + margin: 5px 0; + padding: 8px 0; +} +.aside dl:last-child { + border-bottom: 0 none; +} + +.aside dl > dt { + float: left; +} +.aside dl > dd { + text-align: right; +} + +.aside dl > dd ul { + margin: 0; + padding: 0; + list-style: none; +} +.aside dl > dd ul li { + background-color: #FAFAFA; + border: 1px solid #f5f5f5; + display: inline-block; + margin: 3px; + padding: 3px 7px; +} + + /* Override Boostrap default classes -------------------------------------------------- */ .btn-primary { @@ -181,7 +239,7 @@ h1, h2 { } .page-header { - background-color: #FAFAFA; + background-color: #FFF; border: 0; padding: 5px 0 0 0; } diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 72696b5..49bef59 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h2> {{question.title}} @@ -56,13 +56,13 @@ ng-if="currentUser.role == 'SUPERVISOR' && closeSession"> </div> - <div class="text-center" ng-if="question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false"> + <div class="actions" ng-if="question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false"> <a class="btn btn-action btn-success" ng-click="reopenQuestion()"> <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.reopen' | translate }} </a> </div> - <div class="text-center" ng-if="!question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false && !closeSession"> + <div class="actions" ng-if="!question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false && !closeSession"> <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true && currentUser.role == 'SUPERVISOR'"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 5837189..f72954d 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -24,46 +24,104 @@ <div class=""> - <div class="form-group col-md-12"> - <div class="col-md-3"> - <dl> - <dt>{{ 'question.metadata.type' | translate }}</dt> - <dd ng-if="question.type == 'REUNION'">{{ 'question.metadata.type.reunion' | translate }}</dd> - <dd ng-if="question.type == 'EXPERTISE'">{{ 'question.metadata.type.expertise' | translate }}</dd> - <dd ng-if="question.type == 'PROJECT'">{{ 'question.metadata.type.project' | translate }}</dd> - </dl> - </div> - <div class="col-md-3"> + <div class="form-group col-md-8"> + <dl> + <dt>{{ 'question.metadata.type' | translate }}</dt> + <dd ng-if="question.type == 'REUNION'">{{ 'question.metadata.type.reunion' | translate }}</dd> + <dd ng-if="question.type == 'EXPERTISE'">{{ 'question.metadata.type.expertise' | translate }}</dd> + <dd ng-if="question.type == 'PROJECT'">{{ 'question.metadata.type.project' | translate }}</dd> + </dl> + <dl> + <dt>{{ 'question.metadata.summary' | translate }}</dt> + <dd>{{question.summary}}</dd> + </dl> + <dl ng-if="currentUser.role == 'SUPERVISOR' || isCurrentParticipant "> + <dt>{{ 'question.metadata.relatedDocuments' | translate }}</dt> + + <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> + </table> + </dd> + </dl> + + <dl ng-if="question.closingDate && question.conclusion"> + <dt>{{ 'question.metadata.conclusion' | translate }}</dt> + <dd>{{question.conclusion}}</dd> + </dl> + + <dl ng-if="question.closingDate && question.closingDocuments + && question.closingDocuments.length > 0"> + <dt>{{ 'question.metadata.conclusionDocuments' | translate }}</dt> + + <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> + </table> + </dd> + </dl> + + <dl> + <dt>{{ 'question.metadata.parentsPhrase' | 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> + </dd> + </dl> + </div> + <div class="form-group col-md-4 aside"> + <div> <dl> <dt>{{ 'question.metadata.privacy' | translate }}</dt> <dd>{{question.privacy | lowercase}}</dd> </dl> - </div> - <div class="col-md-3"> <dl> <dt>{{ 'question.metadata.submissionDate' | translate }}</dt> <dd>{{question.submissionDate | date:'mediumDate'}}</dd> </dl> - </div> - <div class="col-md-3" ng-if="question.deadline"> - <dl> + <dl ng-if="question.deadline"> <dt>{{ 'question.metadata.deadline' | translate }}</dt> <dd>{{question.deadline | date:'mediumDate'}}</dd> </dl> - </div> - </div> - - <div class="form-group col-md-12"> - <div class="col-md-12" > - <dl> - <dt>{{ 'question.metadata.summary' | translate }}</dt> - <dd>{{question.summary}}</dd> - </dl> - </div> - </div> - - <div class="form-group col-md-12"> - <div class="col-md-4"> <dl> <dt>{{ 'question.metadata.themes' | translate }}</dt> <dd> @@ -74,9 +132,10 @@ </ul> </dd> </dl> - </div> - - <div class="col-md-4"> + <dl> + <dt>{{ 'question.metadata.status' | translate }}</dt> + <dd>{{question.status}}</dd> + </dl> <dl> <dt>{{ 'question.metadata.supervisors' | translate }}</dt> <dd> @@ -87,18 +146,6 @@ </ul> </dd> </dl> - </div> - - <div class="cold-md-4"> - <dl> - <dt>{{ 'question.metadata.status' | translate }}</dt> - <dd>{{question.status}}</dd> - </dl> - </div> - </div> - - <div class="form-group col-md-12"> - <div class="col-md-4"> <dl> <dt>{{ 'question.metadata.experts' | translate }}</dt> <dd> @@ -111,9 +158,6 @@ </ul> </dd> </dl> - </div> - - <div class="col-md-4"> <dl> <dt>{{ 'question.metadata.clients' | translate }}</dt> <dd> @@ -124,9 +168,6 @@ </ul> </dd> </dl> - </div> - - <div class="col-md-4"> <dl> <dt>{{ 'question.metadata.contributors' | translate }}</dt> <dd> @@ -140,98 +181,7 @@ </div> </div> - <div class="form-group col-md-12" - ng-if="currentUser.role == 'SUPERVISOR' || isCurrentParticipant "> - - <dl> - <dt>{{ 'question.metadata.relatedDocuments' | translate }}</dt> - - <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> - </table> - </dd> - </dl> - - </div> - - <div class="form-group col-md-12" - ng-if="question.closingDate && question.conclusion"> - <div class="col-md-12" > - <dl> - <dt>{{ 'question.metadata.conclusion' | translate }}</dt> - <dd>{{question.conclusion}}</dd> - </dl> - </div> - </div> - <div class="form-group col-md-12" - ng-if="question.closingDate && question.closingDocuments - && question.closingDocuments.length > 0"> - <dl> - <dt>{{ 'question.metadata.conclusionDocuments' | translate }}</dt> - - <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> - </table> - </dd> - </dl> - - </div> - - <div class="form-group col-md-12"> - <div class="col-md-6"> - <dl> - <dt>{{ 'question.metadata.parentsPhrase' | 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> - </div> - <div class="col-md-6"> - <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> - </dd> - </dl> - </div> - </div> </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>.
participants (1)
-
codelutin.com scm