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 f675fc03754cf9620a68c76c1f72662d0c13285e Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Jan 28 21:35:33 2015 +0100 Refs-70 #6536 : Better show question status --- coselmar-ui/src/main/webapp/css/coselmar.css | 42 +++++++++++++++++++++ coselmar-ui/src/main/webapp/img/StatusIcons.png | Bin 0 -> 2005 bytes .../main/webapp/views/questions/editquestion.html | 2 +- .../views/questions/modalQuestionSearch.html | 2 +- .../src/main/webapp/views/questions/question.html | 2 +- .../src/main/webapp/views/questions/questions.html | 5 ++- .../main/webapp/views/questions/viewquestion.html | 2 +- 7 files changed, 50 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 0f6d88d..357e33f 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -126,6 +126,9 @@ a { .marginBottom20 { margin-bottom: 20px; } +.paddingLeft10 { + padding-left: 10px; +} /* Titles -------------------------------------------------- */ @@ -270,6 +273,41 @@ dl > dd { background: #FFF; } +.status-open, +.status-in_progress , +.status-closed, +.status-adjourned { + background: url("../img/StatusIcons.png") no-repeat 0 0 transparent; + display: block; + height: 20px; + width: 20px; + float: left; + margin-right: 2px; +} +.status-in_progress { + background-position: 0 -50px; +} +.status-closed { + background-position: 0 -100px; +} +.status-adjourned { + background-position: 0 -150px; +} +.table tbody tr td:first-child .status-open, +.table tbody tr td:first-child .status-in_progress, +.table tbody tr td:first-child .status-closed, +.table tbody tr td:first-child .status-adjourned { + position: absolute; + left: -11px; + float: none; +} +dl dd .status-open, +dl dd .status-in_progress, +dl dd .status-closed, +dl dd .status-adjourned { + float: right; +} + /* Override Boostrap default classes -------------------------------------------------- */ .btn-primary { @@ -366,6 +404,10 @@ a.dropdown-toggle:hover .caret { font-weight: normal; } +.table tbody tr td { + position: relative; +} + .btn.disabled, .btn[disabled] { opacity: 0.45; } diff --git a/coselmar-ui/src/main/webapp/img/StatusIcons.png b/coselmar-ui/src/main/webapp/img/StatusIcons.png new file mode 100644 index 0000000..a9af532 Binary files /dev/null and b/coselmar-ui/src/main/webapp/img/StatusIcons.png differ diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 8f1322a..21c670b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -175,7 +175,7 @@ </td> <td>{{parent.submissionDate | date:'mediumDate'}}</td> <td><span ng-repeat="theme in parent.themes">{{theme}}, </span></td> - <td>{{parent.status}}</td> + <td><span class="status-{{parent.status|lowercase}}"></span>{{parent.status}}</td> <td><a class="btn fa fa-minus" title="Remove parent question" ng-click="removeParent(parent)" ng-if="currentUser.role == 'SUPERVISOR'"/></td> diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 14c986e..14ae218 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -58,7 +58,7 @@ </td> <td>{{question.submissionDate | date:'mediumDate'}}</td> <td><span ng-repeat="theme in question.themes">{{theme}} ,</span></td> - <td>{{document.status}}</td> + <td><span class="status-{{question.status|lowercase}}"></span>{{question.status}}</td> <td> <a class="btn fa fa-plus" title="Add question as parent" ng-click="select(question)" ng-if="currentQuestionId != question.id"/></td> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index cc9eb2b..cbf786a 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -48,7 +48,7 @@ </div> <!-- bottom part : close and action --> - <div class="text-center" ng-if="question.closingDate"> + <div class="text-center clear" ng-if="question.closingDate"> {{ 'question.message.closedOn' | translate }} {{question.closingDate | date:'medium' }}. </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 1c9dec8..b279f52 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -61,7 +61,10 @@ </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'"> + <span class="status-{{question.status|lowercase}}" title="{{question.status}}"></span> + <a href="#/questions/{{question.id}}" class="paddingLeft10" 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> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index e210899..f072552 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -153,7 +153,7 @@ </dl> <dl> <dt>{{ 'question.metadata.status' | translate }}</dt> - <dd>{{question.status}}</dd> + <dd><span class="status-{{question.status|lowercase}}"></span>{{question.status}}</dd> </dl> <dl> <dt>{{ 'question.metadata.supervisors' | translate }}</dt> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.