integrate with guanlecoja-ui 1.1 (notifications)

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
buildbot · Aug 18, 2014 · 0b3bb5b · benallard · Oct 22, 2014 · tardyp
1 parent b5093d2
commit 0b3bb5b
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 109 deletions.
diff --git a/www/base/guanlecoja/config.coffee b/www/base/guanlecoja/config.coffee
@@ -30,8 +30,8 @@ config =
         # JavaScript libraries (order matters)
         deps:
             "guanlecoja-ui":
-                version: '~1.0.0'
-                files: 'scripts.js'
+                version: '~1.1.0'
+                files: ['vendors.js', 'scripts.js']
             moment:
                 version: "~2.6.0"
                 files: 'moment.js'

diff --git a/www/base/src/app/about/about.controller.coffee b/www/base/src/app/about/about.controller.coffee
@@ -1,8 +1,8 @@
 class About extends Controller
-    constructor: ($scope, bower_configs, config, buildbotService) ->
+    constructor: ($scope, config, buildbotService) ->
         # translate github urls to http urls for link generations
-        for module in bower_configs
-            module.http_url = module.repository?.url?.replace("git://", "http://")
+        #for module in bower_configs
+        #    module.http_url = module.repository?.url?.replace("git://", "http://")
         # todo should get that info from data api
         $scope.config =
             bbversion: "0.9.0"
@@ -11,6 +11,6 @@ class About extends Controller
             projectversion: "0.0.1"
             projecturl: "http://buildbot.net"
             config: config
-        $scope.bower_configs = bower_configs
+        #$scope.bower_configs = bower_configs
         buildbotService.all('application.spec').getList().then (specs) ->
             $scope.specs = specs
diff --git a/www/base/src/app/alert-panel/alert.factory.coffee b/www/base/src/app/alert-panel/alert.factory.coffee
diff --git a/www/base/src/app/alert-panel/alertpanel.config.coffee b/www/base/src/app/alert-panel/alertpanel.config.coffee
diff --git a/www/base/src/app/alert-panel/alertpanel.controller.coffee b/www/base/src/app/alert-panel/alertpanel.controller.coffee
diff --git a/www/base/src/app/app.run.coffee b/www/base/src/app/app.run.coffee
@@ -1,11 +1,10 @@
 class RouteChangeListener extends Run
-    constructor: ($rootScope, $log, config, alert) ->
+    constructor: ($rootScope, $log, config, glNotificationService) ->
         # fire an event related to the current route
         $rootScope.$on '$routeChangeSuccess', (event, currentRoute, priorRoute) ->
             $rootScope.$broadcast "#{currentRoute.controller}$routeChangeSuccess",
                                   currentRoute, priorRoute
         if config.on_load_warning?
             setTimeout ->
-                alert.warning(config.on_load_warning)
-                console.log config.on_load_warning
-            , 500
+                glNotificationService.notify(msg:config.on_load_warning)
+            , 500
diff --git a/www/base/src/app/common/directives/topmenu/topmenu.directive.coffee b/www/base/src/app/common/directives/topmenu/topmenu.directive.coffee
diff --git a/www/base/src/app/common/directives/topmenu/topmenu.tpl.jade b/www/base/src/app/common/directives/topmenu/topmenu.tpl.jade
diff --git a/www/base/src/app/index.jade b/www/base/src/app/index.jade
@@ -2,4 +2,6 @@ extends layout
 block content
     gl-page-with-sidebar
         gl-topbar
+            gl-notification
+            loginbar
         ui-view