This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository mum. See http://git.chorem.org/mum.git commit 0e6b0d90d1153bba3f1df200a1086548275c7908 Author: Alexis Guilbaud <guilbaud@codelutin.com> Date: Thu Mar 12 15:36:01 2015 +0100 bonne version de angular-toastr pour les dépendances --- app/app.py | 2 +- bower.json | 5 +++-- static/js/controllers/headCtrl.js | 4 ++++ views/index.html | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/app.py b/app/app.py index 3f2df3d..ea5f78c 100755 --- a/app/app.py +++ b/app/app.py @@ -174,6 +174,6 @@ if __name__ == '__main__': ml.load_all_connection_modules() ml.load_all_detection_modules() wsc = WebSocketContainer(ml.get_db()) - process_monitoring.init(ml, wsc) + #process_monitoring.init(ml, wsc) port = int(os.environ.get('PORT', 1337)) run(host='0.0.0.0', port=port, debug=True, server=GeventWebSocketServer) \ No newline at end of file diff --git a/bower.json b/bower.json index 2b7c589..dfcc7f0 100644 --- a/bower.json +++ b/bower.json @@ -4,13 +4,14 @@ "dependencies": { "bootstrap": "~3.2.0", "angular": "~1.2.28", - "angular-toastr": "~0.5.2", + "angular-toastr": "0.4.2", "angular-route": "~1.2.28", "angular-bootstrap": "~0.12.1", "angular-sanitize": "~1.2.28", "angular-file-upload": "~1.1.5" }, "resolutions": { - "angular": "~1.2.28" + "angular": "~1.2.28", + "angular-toastr": "0.4.2" } } diff --git a/static/js/controllers/headCtrl.js b/static/js/controllers/headCtrl.js index f1467c7..65f331c 100644 --- a/static/js/controllers/headCtrl.js +++ b/static/js/controllers/headCtrl.js @@ -82,6 +82,10 @@ mumApp.controller('headCtrl', function($scope, $rootScope, toastr, $interval, $r }; + $scope.toto = function(){ + $scope.pop_success("abwabwa", "trololo") + } + $scope.pop_success = function(title, msg){ toastr.success(msg, title); }; diff --git a/views/index.html b/views/index.html index 1bb2ed5..a4c5dab 100644 --- a/views/index.html +++ b/views/index.html @@ -55,6 +55,7 @@ <p class="navbar-text navbar-left"><a href="#dashboard/success" style="color:green">OK : {{stateNumber()[0]}}</a></p> <p class="navbar-text navbar-left"><a href="#dashboard/warning" style="color:orange">Warning : {{stateNumber()[1]}}</a></p> <p class="navbar-text navbar-left"><a href="#dashboard/danger" style="color:red">KO : {{stateNumber()[2]}}</a></p> + <button type="button" class="btn btn-primary btn-xs" ng-click="toto()">tut</button> </div> <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.