branch develop updated (93c275a -> a6fe9d1)
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 93c275a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a6fe9d1 fixes #6502 : Change menu order 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 a6fe9d14df67e24cc9304cf6a87526f729c4f190 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 14:28:49 2015 +0100 fixes #6502 : Change menu order Summary of changes: coselmar-ui/src/main/webapp/index.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 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 a6fe9d14df67e24cc9304cf6a87526f729c4f190 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 14:28:49 2015 +0100 fixes #6502 : Change menu order --- coselmar-ui/src/main/webapp/index.html | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 413540f..142358f 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -79,18 +79,6 @@ <ul class="nav navbar-nav"> <a href="#" role="button" class="navbar-brand">{{ 'application.title' | translate}}</a> - <li class="dropdown" ng-if="currentUser.role == 'ADMIN' || currentUser.role == 'SUPERVISOR'"> - <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.users' | translate}}<span class="caret"></span></a> - <ul class="dropdown-menu" role="menu"> - <li><a href="#/users" role="menuitem">{{ 'menu.item.users.list' | translate}}</a></li> - <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'ADMIN'">{{ 'menu.item.users.add' | translate}}</a></li> - <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'SUPERVISOR'">{{ 'menu.item.users.add.client' | translate}}</a></li> - </ul> - </li> - <li ng-if="currentUser"> - <a href="#/documents" role="button" class="dropdown-toggle">{{ 'menu.item.documents' | translate}}</a> - </li> - <li class="dropdown" ng-if="currentUser"> <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.questions' | translate}}<span class="caret"></span></a> <ul class="dropdown-menu" role="menu"> @@ -98,10 +86,23 @@ <li><a href="#/questions/new" role="menuitem" ng-if="currentUser.role == 'SUPERVISOR'">{{ 'menu.item.questions.add' | translate}}</a></li> </ul> </li> + + <li ng-if="currentUser"> + <a href="#/documents" role="button" class="dropdown-toggle">{{ 'menu.item.documents' | translate}}</a> + </li> <li ng-if="currentUser"> <a href="#/referential" role="button" class="dropdown-toggle">{{ 'menu.item.referential' | translate}}</a> </li> + + <li class="dropdown" ng-if="currentUser.role == 'ADMIN' || currentUser.role == 'SUPERVISOR'"> + <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.users' | translate}}<span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> + <li><a href="#/users" role="menuitem">{{ 'menu.item.users.list' | translate}}</a></li> + <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'ADMIN'">{{ 'menu.item.users.add' | translate}}</a></li> + <li><a href="#/users/new" role="menuitem" ng-if="currentUser.role == 'SUPERVISOR'">{{ 'menu.item.users.add.client' | translate}}</a></li> + </ul> + </li> </ul> <!-- Login Part --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm