branch develop updated (1abd04e -> 7f19efc)
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 1abd04e Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 7f19efc Refs #6622: Display update for alerts 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 7f19efcaf0fee8bd01b40a1370e85ca64b7c2f64 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 18 12:37:21 2015 +0100 Refs #6622: Display update for alerts Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 17 +++++++++++++-- coselmar-ui/src/main/webapp/index.html | 4 +++- .../src/main/webapp/js/coselmar-controllers.js | 24 ++++++++++++++++++++++ .../src/main/webapp/js/coselmar-error-services.js | 1 + 4 files changed, 43 insertions(+), 3 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 7f19efcaf0fee8bd01b40a1370e85ca64b7c2f64 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 18 12:37:21 2015 +0100 Refs #6622: Display update for alerts --- coselmar-ui/src/main/webapp/css/coselmar.css | 17 +++++++++++++-- coselmar-ui/src/main/webapp/index.html | 4 +++- .../src/main/webapp/js/coselmar-controllers.js | 24 ++++++++++++++++++++++ .../src/main/webapp/js/coselmar-error-services.js | 1 + 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 9ac6fc8..1c4bdc1 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -33,11 +33,15 @@ body { margin-bottom: 60px; background: rgba( 57, 160, 168,0.5); } -body > .container { +#main-container .container { padding: 40px 20px 60px 20px; background: #FFF; border: 1px solid #EEE; } +#main-container { + position: relative; + margin: 0 auto; +} .container .text-muted { margin: 20px 0; } @@ -318,6 +322,7 @@ dl dd .status-adjourned { /* Override Boostrap default classes -------------------------------------------------- */ +#main-container, body .container { width: 970px; } @@ -387,7 +392,7 @@ body .container { background: #39A0A8; } -body > .container .btn-primary { +#main-container .btn-primary { padding: 3px 10px; } @@ -441,10 +446,18 @@ input[type="file"] { text-align: left; } +.cg-notify-message { + position: absolute; + left: auto; + right: 40px; + z-index: 99; +} + /* Media queries -------------------------------------------------- */ @media screen and (max-width: 1080px) { + #main-container, body .container { width: 90%; } diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 2f2ed88..cb067b3 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -181,7 +181,9 @@ </div> </header> - <div ng-view class="container"></div> + <div id="main-container"> + <div ng-view class="container" ></div> + </div> <footer class="footer"> <div class="container"> diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 81ff61a..599db36 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -158,6 +158,7 @@ coselmarControllers.controller("DocumentsCtrl", ['$scope', '$route', '$routePara notify({ message: "document.message.deleted", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to documents list @@ -236,6 +237,7 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif notify({ message: "document.message.created", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $location.path("/documents"); @@ -245,6 +247,7 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif notify({ message: "document.message.created", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $location.path("/documents"); @@ -308,6 +311,7 @@ coselmarControllers.controller("DocumentViewCtrl", notify({ message: "document.message.deleted", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to documents list @@ -375,6 +379,7 @@ coselmarControllers.controller("DocumentViewCtrl", notify({ message: "document.message.updated", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $location.search(""); @@ -384,6 +389,7 @@ coselmarControllers.controller("DocumentViewCtrl", notify({ message: "document.message.updated", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $location.search(""); @@ -504,6 +510,7 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', notify({ message: "user.message.delete", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to documents list @@ -519,6 +526,7 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', notify({ message: "user.message.disable", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to users list @@ -535,6 +543,7 @@ coselmarControllers.controller("UsersCtrl", ['$scope', '$route', '$routeParams', notify({ message: "user.message.enable", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to users list @@ -587,6 +596,7 @@ coselmarControllers.controller("NewUserCtrl", ['$scope', '$route', '$location', notify({ message: "user.message.created", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $location.path("/users"); @@ -597,6 +607,7 @@ coselmarControllers.controller("NewUserCtrl", ['$scope', '$route', '$location', notify({ message: "user.message.mail.alreadyExisting", classes: "alert-danger", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); } else if (error.status == 403) { @@ -639,6 +650,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "user.message.deleted", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to users list @@ -657,6 +669,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "user.message.disable", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to users list @@ -675,6 +688,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "user.message.enable", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // Go back to users list @@ -698,6 +712,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "user.message.updated", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // On success, back on users list for admin or supervisor @@ -713,6 +728,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "user.message.mail.alreadyExisting", classes: "alert-danger", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); } else if (error.status == 403) { @@ -728,6 +744,7 @@ coselmarControllers.controller("UserViewCtrl", notify({ message: "common.message.internalError", classes: "alert-danger", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); @@ -815,6 +832,7 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara notify({ message: "question.message.deleted", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // success : just reload the questions @@ -995,6 +1013,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.deleted", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); // success : goto questions list @@ -1018,6 +1037,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.saved", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); if ($routeParams.questionId) { @@ -1042,6 +1062,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.closed", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $route.reload(); @@ -1069,6 +1090,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.reopened", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $route.reload(); @@ -1088,6 +1110,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.adjourned", classes: "alert-warning", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $route.reload(); @@ -1105,6 +1128,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam notify({ message: "question.message.newDocuments.added", classes: "alert-success", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); $route.reload(); diff --git a/coselmar-ui/src/main/webapp/js/coselmar-error-services.js b/coselmar-ui/src/main/webapp/js/coselmar-error-services.js index aca69b4..5460bce 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-error-services.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-error-services.js @@ -58,6 +58,7 @@ coselmarServices.factory('errorService', ['$location', 'notify', function($locat notify({ message: "common.message.internalError", classes: "alert-danger", + container: "#main-container", templateUrl: "views/notificationTemplate.html" }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm