branch develop updated (4a93aad -> 767c8a8)
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 4a93aad Fixes display issues new 767c8a8 Display improvments 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 767c8a847b758610f65569fdef95dc4cd435f54e Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 19 16:25:26 2015 +0100 Display improvments Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 3 + .../src/main/webapp/views/questions/questions.html | 105 +++++++++++---------- .../main/webapp/views/referential/referential.html | 2 +- 3 files changed, 57 insertions(+), 53 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 767c8a847b758610f65569fdef95dc4cd435f54e Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 19 16:25:26 2015 +0100 Display improvments --- coselmar-ui/src/main/webapp/css/coselmar.css | 3 + .../src/main/webapp/views/questions/questions.html | 105 +++++++++++---------- .../main/webapp/views/referential/referential.html | 2 +- 3 files changed, 57 insertions(+), 53 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index d2423f1..6e60ab3 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -178,6 +178,9 @@ h2 { background-color: #39a0a8 !important; color: #FFF; } +.table .btn-action { + margin-left: 0; +} .btn-edit { diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 7bd3506..dd16287 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -45,65 +45,66 @@ </div> </form> </div> - <br/> - <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="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.clients' | translate }}</th> - <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.participants' | translate }}</th> - <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.relatedDocuments' | translate }}</th> - <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"></th> - </tr> - </thead> - <tbody> - <tr ng-repeat="question in questions" > - <td ng-if="context.currentUser.role != 'MEMBER'"> - <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> - <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> - </td> - <td ng-if="context.currentUser.role == 'MEMBER'">{{question.title}}</td> + <div class="clear table-responsive paddingLeft10"> + <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="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.clients' | translate }}</th> + <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.participants' | translate }}</th> + <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">{{ 'question.metadata.relatedDocuments' | translate }}</th> + <th ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"></th> + </tr> + </thead> + <tbody> + <tr ng-repeat="question in questions" > + <td ng-if="context.currentUser.role != 'MEMBER'"> + <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> + <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + </td> + <td ng-if="context.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 && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> - </td> - <td ng-if="!question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <!-- clients : we use ng-if for better tooltip management --> + <td ng-if="question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> + </td> + <td ng-if="!question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> - <!-- participants --> - <td ng-if="question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> - </td> - <td ng-if="!question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <!-- participants --> + <td ng-if="question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> + </td> + <td ng-if="!question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> - <!-- related documents --> - <td ng-if="question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.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 && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <!-- related documents --> + <td ng-if="question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.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 && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> - <td ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <!--<a class="btn btn-action btn-disable" ng-click="closeQuestion(question.id)"--> - <!--ng-if="context.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="context.currentUser.role == 'SUPERVISOR' || context.currentUser.role == 'ADMIN'"> - <span class="fa fa-close" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> - </td> - </tr> - </tbody> - </table> + <td ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <!--<a class="btn btn-action btn-disable" ng-click="closeQuestion(question.id)"--> + <!--ng-if="context.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="context.currentUser.role == 'SUPERVISOR' || context.currentUser.role == 'ADMIN'"> + <span class="fa fa-close" aria-hidden="true"></span>{{ 'common.button.delete' | translate }}</a> + </td> + </tr> + </tbody> + </table> + </div> <p ng-if="questions && questions.length == 0" translate="common.search.noResult" class="info"/> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 4bff497..7dfb30b 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -129,7 +129,7 @@ </td> <td>{{question.submissionDate | date:'mediumDate'}}</td> <td><span ng-repeat="theme in question.themes">{{theme}}, </span></td> - <td>{{question.status}}</td> + <td><span class="status-{{question.status|lowercase}}"></span>{{question.status | translate}}</td> </tr> </tbody> </table> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm