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 d2753faf564fd618877ff4c3d80ff3cddd303341 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Dec 3 12:49:42 2014 +0100 Css changes for display update --- coselmar-ui/src/main/webapp/css/coselmar.css | 128 ++++++++++++++++++--- coselmar-ui/src/main/webapp/index.html | 12 +- .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../main/webapp/views/documents/newdocument.html | 15 ++- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/newuser.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 +- 10 files changed, 143 insertions(+), 34 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 3c3b180..b79fd0a 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -31,14 +31,34 @@ html { body { /* Margin bottom by footer height */ margin-bottom: 60px; + background: rgba( 57, 160, 168,0.5); } body > .container { - padding: 60px 15px 0; + padding: 40px 20px 60px 20px; + background: #FFF; + border: 1px solid #EEE; } .container .text-muted { margin: 20px 0; } +.navbar { + margin: 0; + background: #FFF; + margin-bottom: 20px; +} + +.navbar .navbar-nav > .navbar-brand:hover { + background-color: transparent; + color: #39a0a8; +} + +.navbar .navbar-nav > li > a:hover, +.navbar .navbar-nav > li > a:focus { + background-color: #39a0a8; + color: #FFF; +} + .footer { position: absolute; right: 0; @@ -51,20 +71,94 @@ body > .container { color: #999; text-align: center; z-index:1000; + border-top: 1px solid #aaa; + font-size: 90%; +} + +.footer .separator { + padding: 0 15px; +} + + + +/* General +-------------------------------------------------- */ +a { + color: #008EB4; +} + +.float-right { + float: right; +} + +.info-panel { + border: 1px solid #EEE; + border-left: 3px solid #39a0a8; + margin: 30px 0; + padding: 5px 20px; +} + +/* Titles +-------------------------------------------------- */ +h1, h2 { + color: #39a0a8; + border-bottom: 1px solid rgba( 57, 160, 168,0.2); + padding-left: 5px; +} + - .separator { - padding-left:.75%; - padding-right:.75%; - } - - a { - color: #999; - text-decoration:none; - - &:hover { - color:#fff; - background-color:transparent; - text-decoration:none; - } - } -} \ No newline at end of file +/* Icons / Buttons +-------------------------------------------------- */ +.btn .glyphicon { + padding-right: 8px; +} + +.btn-action { + background-color: transparent; + transition: all 0.4s ease-in-out 0s; + border: 1px solid #39a0a8; + color: #39a0a8; + margin-left: 15px; +} + +.btn-action:hover { + background-color: #39a0a8; + color: #FFF; +} + +.btn-edit { + color: #f0ad4e; + border-color: #f0ad4e; +} +.btn-edit:hover { + background-color: #f0ad4e; +} + +.btn-disable { + color: #d9534f; + border-color: #d9534f; +} +.btn-disable:hover { + background-color: #d9534f; +} + +/* Override Boostrap default classes +-------------------------------------------------- */ +.btn-primary { + background-color: #39a0a8; + border-color: #3a8a8a; +} + +.page-header { + background-color: #FAFAFA; + border: 0; + padding: 5px 0 0 0; +} + +.navbar-form.navbar-right { + padding: 0; +} + +body > .container .btn-primary { + padding: 3px 10px; +} diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index b3f9405..312f480 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -87,7 +87,7 @@ <div class="form-group"> <input type="password" placeholder="Password" class="form-control" ng-model="loginPassword"> </div> - <button type="submit" class="btn btn-success" ng-click="login(loginMail, loginPassword)">Sign in</button> + <button type="submit" class="btn btn-action" ng-click="login(loginMail, loginPassword)">Sign in</button> </form> <div ng-init="loginMessage = {fail: false}" class="navbar-form navbar-right"> <ng-messages for="loginMessage"> @@ -96,8 +96,14 @@ </div> <form class="navbar-form navbar-right" role="form" ng-if="currentUser"> - <div class="form-group">{{currentUser.firstName}} {{currentUser.lastName}} <a href="#/users/{{currentUser.userId}}?edit" class="glyphicon glyphicon-pencil"></a></div> - <button type="submit" class="btn btn-danger" ng-click="logout()">Logout</button> + <div class="form-group">{{currentUser.firstName}} {{currentUser.lastName}} + <a href="#/users/{{currentUser.userId}}?edit" class="btn btn-action"> + <span class="glyphicon glyphicon-user" aria-hidden="true"></span>Profile + </a> + </div> + <button type="submit" class="btn btn-action" ng-click="logout()"> + <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>Logout + </button> </form> </nav> <nav class="visible-xs" collapse="!isCollapsed"> diff --git a/coselmar-ui/src/main/webapp/views/documents/document.html b/coselmar-ui/src/main/webapp/views/documents/document.html index d40c006..c4f4ffd 100644 --- a/coselmar-ui/src/main/webapp/views/documents/document.html +++ b/coselmar-ui/src/main/webapp/views/documents/document.html @@ -84,7 +84,7 @@ <td ng-if="!document.withFile">External Link</td> </tr> </table> - <div style="padding-left: 200px"> + <div class="float-right"> <a href="{{container.baseUrl}}/documents/{{document.id}}/file" class="btn btn-primary" ng-if="document.withFile">Download</a> <a href="{{document.externalUrl}}" target="_blank" class="btn btn-primary" ng-if="!document.withFile">Open Link</a> <a class="btn btn-danger" ng-click="deleteDocument(document.id)">Delete</a> diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index cc3cf44..d1a656b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -61,7 +61,9 @@ <td><span ng-repeat="keyword in document.keywords">{{keyword}} ,</span></td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td>N/A</td> - <td><a class="btn btn-danger" ng-click="deleteDocument(document.id)">Delete</a></td> + <td><a class="btn btn-action btn-disable" ng-click="deleteDocument(document.id)"> + <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Delete</a> + </td> </tr> </table> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index cb5803b..c87c2e0 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -26,7 +26,7 @@ <h2>New Document</h2> </div> - <div style="padding-top: 15px"> + <div class="info-panel"> <!-- Summary goes here --> Here you can add a new document in the repository. For each document, some keywords are needed to make easier search of the document, and you @@ -138,10 +138,13 @@ <label class="col-md-4 control-label">Publication date</label> <div class="col-md-5"> - <input type="text" class="form-control" name="publicationDate" - ng-model="document.publicationDate" - datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" - ng-click="publicationDateOpened = true"/> + <div class="input-group"> + <input type="text" class="form-control" name="publicationDate" + ng-model="document.publicationDate" + datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" + ng-click="publicationDateOpened = true"/> + <span class="input-group-addon"><span class="glyphicon glyphicon-calendar" aria-hidden="true"></span></span> + </div> </div> </div> @@ -203,7 +206,7 @@ </div> <div class="form-group"> - <div style="padding-left: 200px"> + <div class="float-right col-md-4"> <input type="submit" value="Submit" class="btn btn-primary" ng-if="documentForm.$valid && privacy != 'RESTRICTED'"/> </div> diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index 8aac4d3..9fe01ba 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -24,7 +24,7 @@ <div> <h1><small>Bienvenue sur l'</small>Application de suivi Coselmar</h1> - <p> + <p style="margin-top: 50px;"> L'application a pour but de faciliter le suivi des demandes d'expertises scientifiques et de fournir un référentiel de documents, permettant de faciliter les réponses aux demandes. diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index a471184..52e49f5 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -116,7 +116,7 @@ </div> <div class="form-group" ng-if="userForm.$valid || currentUser.role == 'ADMIN'"> - <div style="padding-left: 200px"> + <div class="float-right col-md-4"> <input type="submit" value="Validate" class="btn btn-primary"/> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/newuser.html b/coselmar-ui/src/main/webapp/views/users/newuser.html index e07ff44..ae13e0e 100644 --- a/coselmar-ui/src/main/webapp/views/users/newuser.html +++ b/coselmar-ui/src/main/webapp/views/users/newuser.html @@ -26,7 +26,7 @@ <h2>Add new user</h2> </div> - <div style="padding-top: 15px"> + <div class="info-panel"> Create new user, with one of following roles : <ul> <li>Supervisor : Kind of big manager, who relays member/client question and assigns expert on questions</li> diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html index 2668d32..8df8457 100644 --- a/coselmar-ui/src/main/webapp/views/users/user.html +++ b/coselmar-ui/src/main/webapp/views/users/user.html @@ -51,7 +51,7 @@ <td ng-if="!user.active">Deleted</td> </tr> </table> - <div style="padding-left: 200px"> + <div class="float-right"> <a class="btn btn-warning" ng-click="modifyUser()" ng-if="user.active">Modify</a> <a class="btn btn-danger" ng-click="deleteUser(user.id)" ng-if="currentUser.role == 'ADMIN' && user.active">Delete</a> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index 9646be8..1109e7d 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -68,8 +68,12 @@ <td ng-if="user.active">Active</td> <td ng-if="!user.active">Deleted</td> <td> - <a class="btn btn-warning" href="#/users/{{user.id}}?edit">Modify</a> - <a class="btn btn-danger" ng-if="user.active" ng-click="deleteUser(user.id)">Disable</a> + <a class="btn btn-action btn-edit" href="#/users/{{user.id}}?edit"> + <span class="glyphicon glyphicon-edit" aria-hidden="true"></span>Modify + </a> + <a class="btn btn-action btn-disable" ng-if="user.active" ng-click="deleteUser(user.id)"> + <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>Disable + </a> <!--<a class="btn btn-primary" ng-if="!user.active" ng-click="enableUser(user.id)">Enable</a>--> </td> </tr> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.