branch develop updated (c771001 -> 0fc7631)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from c771001 Add cancel button on Projects close session new 0fc7631 fixes #7977 add static links 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 0fc7631084293eaba2eefd60d420751d57190be5 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 11 11:30:59 2016 +0100 fixes #7977 add static links Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/index.html | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) -- 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.forge.codelutin.com/coselmar.git commit 0fc7631084293eaba2eefd60d420751d57190be5 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Feb 11 11:30:59 2016 +0100 fixes #7977 add static links --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/index.html | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index be7b136..7746165 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -37,6 +37,7 @@ var translateEN = { "menu.item.documents.add" : "Add a document", "menu.item.referential" : "Referential Search", "menu.item.admin" : "Admin", +"menu.item.links" : "Useful links", "menu.button.login" : "Sign in", "menu.button.profile" : "Profile", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index aa75c90..9a148d0 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -37,6 +37,7 @@ var translateFR = { "menu.item.documents.add" : "Ajouter un document", "menu.item.referential" : "Référentiel", "menu.item.admin" : "Admin", +"menu.item.links" : "Liens utiles", "menu.button.login" : "Connexion", "menu.button.profile" : "Profil", diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 0411d80..3eff44d 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -130,6 +130,20 @@ <li ng-if="context.currentUser.role == 'ADMIN'"> <a href="#/admin" role="button" class="dropdown-toggle">{{ 'menu.item.admin' | translate}}</a> </li> + + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.links' | translate}}<span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> + <li><a href="http://coselmar.fr/" role="menuitem" target="_blank">Projet Coselmar</a></li> + <li><a href="http://oceanext.sciencesconf.org" role="menuitem" target="_blank">Oceanext</a></li> + <li><a href="http://www.phycotox.fr" role="menuitem" target="_blank">Phycotox</a></li> + <li><a href="http://www.iuml-cnrs.fr" role="menuitem" target="_blank">Institut Universitaire Mer et Littoral</a></li> + <li><a href="http://www.univ-nantes.fr" role="menuitem" target="_blank">Université de Nantes</a></li> + <li><a href="http://www.univ-angers.fr" role="menuitem" target="_blank">Université d'Angers</a></li> + <li><a href="http://www.msh.univ-nantes.fr" role="menuitem" target="_blank">Maison des Sciences de l'Homme</a></li> + <li><a href="http://wwz.ifremer.fr" role="menuitem" target="_blank">Ifremer</a></li> + </ul> + </li> </ul> <!-- Login Part --> @@ -185,6 +199,20 @@ <li ng-if="context.currentUser"> <a href="#referential" ng-click="isCollapsed = !isCollapsed">{{ 'menu.item.referential' | translate}}</a> </li> + + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.links' | translate}}<span class="caret"></span></a> + <ul class="dropdown-menu" role="menu"> + <li><a href="http://coselmar.fr/" role="menuitem" target="_blank">Projet Coselmar</a></li> + <li><a href="http://oceanext.sciencesconf.org" role="menuitem" target="_blank">Oceanext</a></li> + <li><a href="http://www.phycotox.fr" role="menuitem" target="_blank">Phycotox</a></li> + <li><a href="http://www.iuml-cnrs.fr" role="menuitem" target="_blank">Institut Universitaire Mer et Littoral</a></li> + <li><a href="http://www.univ-nantes.fr" role="menuitem" target="_blank">Université de Nantes</a></li> + <li><a href="http://www.univ-angers.fr" role="menuitem" target="_blank">Université d'Angers</a></li> + <li><a href="http://www.msh.univ-nantes.fr" role="menuitem" target="_blank">Maison des Sciences de l'Homme</a></li> + <li><a href="http://wwz.ifremer.fr" role="menuitem" target="_blank">Ifremer</a></li> + </ul> + </li> </ul> </nav> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm