branch develop updated (ba33c15 -> 5978299)
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 ba33c15 fixes #6545 fix i18n key in user form new dae9143 Fixes #6501: Add user profil in header & Fixes #6546: Add coselmar logo new 5978299 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 2 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 59782991dbfce11506a851bf91e614baac40a06b Merge: dae9143 ba33c15 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:32:12 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit dae9143b02964ebb50a98f9ea55c079de0b7f023 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:31:08 2015 +0100 Fixes #6501: Add user profil in header & Fixes #6546: Add coselmar logo Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 77 ++++++++++++++++++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 3 +- coselmar-ui/src/main/webapp/i18n/fr.js | 3 +- coselmar-ui/src/main/webapp/img/logo.gif | Bin 0 -> 4274 bytes coselmar-ui/src/main/webapp/index.html | 19 +++++-- 5 files changed, 94 insertions(+), 8 deletions(-) create mode 100644 coselmar-ui/src/main/webapp/img/logo.gif -- 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 dae9143b02964ebb50a98f9ea55c079de0b7f023 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:31:08 2015 +0100 Fixes #6501: Add user profil in header & Fixes #6546: Add coselmar logo --- coselmar-ui/src/main/webapp/css/coselmar.css | 77 ++++++++++++++++++++++++++- coselmar-ui/src/main/webapp/i18n/en.js | 3 +- coselmar-ui/src/main/webapp/i18n/fr.js | 3 +- coselmar-ui/src/main/webapp/img/logo.gif | Bin 0 -> 4274 bytes coselmar-ui/src/main/webapp/index.html | 19 +++++-- 5 files changed, 94 insertions(+), 8 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 5e49ddb..364c68b 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -59,6 +59,24 @@ body > .container { color: #FFF; } +.navbar .navbar-nav > li { + border-left: 1px solid #f9f9f9; +} +.navbar .navbar-nav > li:last-child { + border-right: 1px solid #f9f9f9; +} + +.navbar .navbar-form.navbar-right .user-info { + color: #39A0A8; + padding: 2px 0; + font-weight: bold; +} + +.navbar .navbar-form.navbar-right .user-info .user-role { + text-transform: lowercase; + font-weight: normal; +} + .footer { position: absolute; right: 0; @@ -165,14 +183,71 @@ h1, h2 { padding: 5px 0 0 0; } -.navbar-form.navbar-right { +.navbar { + height: 60px; +} + +.navbar .navbar-brand { + height: 50px; + padding: 10px 10px 0 0; + outline: none; +} + +.navbar .navbar-brand span.title { + padding: 0 0 0 10px; + text-transform: uppercase; + display: inline-block; + transform: scale(1,1.4); +} + +.navbar .navbar-brand .logo { + height: 46px; padding: 0; + float: left; +} + +.navbar .navbar-nav > li > a { + padding-top: 20px; + padding-bottom: 20px; + color: #39A0A8; +} + +.navbar .navbar-right { + padding: 0; +} + +.navbar .navbar-form.navbar-right { + background: rgba(53, 160, 168, 0.03); + padding: 0 10px; + margin: 0 -15px 0 0; + height: 60px; +} + +.navbar .navbar-form .btn { + padding: 4px 8px; + font-size: 13px; + background: #FFF; +} +.navbar .navbar-form .btn:hover { + background: #39A0A8; } body > .container .btn-primary { padding: 3px 10px; } +.caret { + border-left: 6px solid transparent; + border-right: 6px solid transparent; + border-top: 7px solid; + margin-left: 8px; + color: #39A0A8; + cursor: pointer; +} +a.dropdown-toggle:hover .caret { + color: #FFF; +} + /* remove the stupid float on right with bootstrap close class */ .close { float: none; diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 5cda814..41356e7 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -23,7 +23,7 @@ */ var translateEN = { -"application.title" : "Coselmar Platform", +"application.title" : "Platform", "menu.item.users" : "Users", "menu.item.users.list" : "List", @@ -186,6 +186,7 @@ var translateEN = { "user.message.wannaChangePassword" : "I want to change the password", "user.message.tooShortPassword" : "New password should contain at least 6 characters.", "user.message.passwordsNoMatch" : "The two new passwords don't match.", +"user.message.login" : "Login :", "user.button.add" : "Add an user", "user.button.add.client" : "Add a client", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 9400af0..61695fd 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -23,7 +23,7 @@ */ var translateFR = { -"application.title" : "Coselmar Plateforme", +"application.title" : "Plateforme", "menu.item.users" : "Utilisateurs", "menu.item.users.list" : "Liste", @@ -186,6 +186,7 @@ var translateFR = { "user.message.wannaChangePassword" : "Je veux changer mon mot de passe", "user.message.tooShortPassword" : "Le nouveau mot de passe doit contenir au moins 6 caractères.", "user.message.passwordsNoMatch" : "Les deux mots de passe entrés sont différents.", +"user.message.login" : "Connectez-vous :", "user.button.add" : "Ajouter un utilisateur", "user.button.add.client" : "Ajouter un client", diff --git a/coselmar-ui/src/main/webapp/img/logo.gif b/coselmar-ui/src/main/webapp/img/logo.gif new file mode 100644 index 0000000..63d7463 Binary files /dev/null and b/coselmar-ui/src/main/webapp/img/logo.gif differ diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 142358f..088f5bf 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -77,7 +77,10 @@ </div> <nav class="hidden-xs"> <ul class="nav navbar-nav"> - <a href="#" role="button" class="navbar-brand">{{ 'application.title' | translate}}</a> + <a href="#" role="button" class="navbar-brand"> + <img src="img/logo.gif" class="logo" /> + <span class="title">{{ 'application.title' | translate}}</span> + </a> <li class="dropdown" ng-if="currentUser"> <a class="dropdown-toggle" data-toggle="dropdown">{{ 'menu.item.questions' | translate}}<span class="caret"></span></a> @@ -107,6 +110,9 @@ <!-- Login Part --> <form class="navbar-form navbar-right" role="form" ng-if="!currentUser"> + <div class="user-info"> + {{ 'user.message.login' | translate}} + </div> <div class="form-group"> <input type="text" placeholder="Mail" class="form-control" ng-model="loginMail"> </div> @@ -117,14 +123,17 @@ </form> <form class="navbar-form navbar-right" role="form" ng-if="currentUser"> - <div class="form-group">{{currentUser.firstName}} {{currentUser.lastName}} + <div class="user-info text-center"> + {{currentUser.firstName}} {{currentUser.lastName}} <span class="user-role">({{currentUser.role}})</span> + </div> + <div class="form-group"> <a href="#/users/{{currentUser.userId}}?edit" class="btn btn-action"> <span class="glyphicon glyphicon-user" aria-hidden="true"></span>{{ 'menu.button.profile' | translate}} </a> + <button type="submit" class="btn btn-action" ng-click="logout()"> + <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>{{ 'menu.button.logout' | translate}} + </button> </div> - <button type="submit" class="btn btn-action" ng-click="logout()"> - <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>{{ 'menu.button.logout' | translate}} - </button> </form> <ul class="nav navbar-nav navbar-right"> -- 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 59782991dbfce11506a851bf91e614baac40a06b Merge: dae9143 ba33c15 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:32:12 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-ui/src/main/webapp/css/coselmar.css | 5 ++++- coselmar-ui/src/main/webapp/i18n/en.js | 22 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 22 ++++++++++++++++++++++ .../src/main/webapp/js/coselmar-controllers.js | 4 ++-- .../src/main/webapp/views/documents/documents.html | 4 ++-- .../main/webapp/views/documents/editDocument.html | 16 ++++++++++++++-- .../webapp/views/documents/modalDocumentEdit.html | 16 ++++++++++++++-- .../main/webapp/views/documents/newdocument.html | 16 ++++++++++++++-- .../main/webapp/views/documents/viewDocument.html | 16 ++++++++++++++-- .../main/webapp/views/questions/editquestion.html | 17 ++++++++++++----- .../main/webapp/views/questions/viewquestion.html | 4 +++- .../src/main/webapp/views/users/edituser.html | 2 +- 12 files changed, 124 insertions(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm