add IlabCtrl as main controler

Tang,Hejun · Tang,Hejun · commit 4f7be3232a0f · 2015-09-01T12:53:15.000+08:00
diff --git a/app/index.html b/app/index.html
@@ -17,7 +17,7 @@
 
 </head>
 
-<body ng-app="ilab">
+<body ng-app="ilab" ng-controller="IlabCtrl as Ilab">
     <nav class="navbar navbar-default navbar-fixed-top">
         <div class="container-fluid">
             <div class="navbar-header">
@@ -39,6 +39,11 @@
     <div class="loader-backdrop" ng-show="isLoading">
         <div class="spin-box"></div>
     </div>
+    <!-- alerts -->
+    <div class="alert-box col-xs-10 col-sm-8 col-md-6">
+        <alert ng-repeat="alert in $root.alerts" type="{{alert.type}}" close="Ilab.close(alert.index)" ng-click="Ilab.close(alert.index)">{{alert.message}}</alert>
+    </div>
+
     <!-- bower:js -->
     <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
diff --git a/app/main/components/directives/menu.directive.js b/app/main/components/directives/menu.directive.js
@@ -5,9 +5,9 @@
     angular.module('ilabDirective')
         .directive('ilabMenu', ilabMenu);
 
-    ilabMenu.$inject = ['$window'];
+    ilabMenu.$inject = ['$window', '$state'];
 
-    function ilabMenu($window) {
+    function ilabMenu($window, $state) {
         return {
             restrict: 'E',
             templateUrl: 'main/templates/menu.tpl.html',
@@ -24,7 +24,17 @@
             var environmentLink = element.find('a[ui-sref^="envs"]');
             var labLink = element.find('a[ui-sref^="lab"]');
 
-            $($window).ready(checkWindowSize);
+            scope.$on('$viewContentLoaded', function() {
+                checkWindowSize();
+                var currentState = $state.current;
+               /*first clear id of all link, and add the id to the corresponding link*/
+               allLink.attr('id', '');
+               if (environmentPageRegex.test(currentState.name)) {
+                   environmentLink.attr('id', 'selected-link');
+               } else if (labPageRegex.test(currentState.name)) {
+                   labLink.attr('id', 'selected-link');
+               } 
+            });
             $($window).resize(checkWindowSize);
             /* check if it's needed to hide menu. and active corresponding link*/
             scope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParms) {
diff --git a/app/main/components/directives/tableColumnFilter.directive.spec.js b/app/main/components/directives/tableColumnFilter.directive.spec.js
@@ -1,4 +1,4 @@
-describe('table column filter directive:', function () {
+ddescribe('table column filter directive:', function () {
     var element, scope, document;
 
     // Load the ilab module, which contains the directive
diff --git a/app/main/ilab.controller.js b/app/main/ilab.controller.js
@@ -0,0 +1,20 @@
+(function() {
+
+	angular.module('ilab')
+		.controller('IlabCtrl', IlabCtrl);
+
+	IlabCtrl.$inject = ['$rootScope', 'alert'];
+	function IlabCtrl($rootScope, alert) {
+		var self = this;
+
+		self.close = closeAlert;
+		activate();
+
+		function activate() {
+			alert.open({type: 'success', message: 'hello'});
+		}
+		function closeAlert(id) {
+			alert.close(id);
+		}
+	}
+})();
diff --git a/app/main/welcome/welcome.html b/app/main/welcome/welcome.html
@@ -159,7 +159,3 @@ <h3 class="page-header">alert</h3>
 <button class="btn btn-suspend" ng-click="Welcome.show('warning')">warning</button>
 <button class="btn btn-danger" ng-click="Welcome.show('danger')">danger</button>
 
-<div class="alert-box col-xs-10 col-sm-8 col-md-6">
-    <alert ng-repeat="alert in $root.alerts" type="{{alert.type}}" close="Welcome.close(alert.index)" ng-click="Welcome.close(alert.index)">{{alert.message}}</alert>
-</div>
-
diff --git a/grunt/options/watch.js b/grunt/options/watch.js
@@ -20,7 +20,7 @@ module.exports = {
             tasks: ['jshint', 'beep:error:3', 'concat']
         },
         html: {
-            files: ['<%= meta.srcPath %>/main/**/*.html', '<%= meta.srcPath %>/main/*.html'],
+            files: ['<%= meta.srcPath %>/main/**/*.html', '<%= meta.srcPath %>/*.html'],
             tasks: ['concat']
         },
         scss: {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-describe('table column filter directive:', function () {`
	`1`	`+ddescribe('table column filter directive:', function () {`
`2`	`2`	`var element, scope, document;`
`3`	`3`
`4`	`4`	`// Load the ilab module, which contains the directive`