FIX fail to sleep so did some optimizations

app/app.js

@@ -22,7 +22,7 @@
  */
 angular.module(
     'ulakbus', [
-        'ui.bootstrap',
+        //'ui.bootstrap',
         'angular-loading-bar',
         'ngRoute',
         'ngSanitize',
@@ -35,9 +35,7 @@ angular.module(
         'ulakbus.debug',
         'ulakbus.devSettings',
         'ulakbus.version',
-        //'schemaForm',
         'gettext',
-        'ulakbus.uitemplates'
     ])
     /**
      * @memberof ulakbus

app/app_routes.js

@@ -5,46 +5,46 @@ angular.module('ulakbus')
         $routeProvider
             .when('/login', {
                 templateUrl: 'components/auth/login.html',
-                controller: 'LoginCtrl'
+                controller: 'LoginController'
             })
             .when('/dashboard', {
                 templateUrl: 'components/dashboard/dashboard.html',
-                controller: 'DashCtrl'
+                controller: 'DashController'
             })
             .when('/dev/settings', {
                 templateUrl: 'components/devSettings/devSettings.html',
-                controller: 'DevSettingsCtrl'
+                controller: 'DevSettingsController'
             })
             .when('/debug/list', {
                 templateUrl: 'components/debug/debug.html',
-                controller: 'DebugCtrl'
+                controller: 'DebugController'
             })
 
             // use crud without selected user
             // important: regex urls must be defined later than static ones
             .when('/:wf/', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDCtrl'
+                controller: 'CRUDController'
             })
             .when('/:wf/do/:cmd', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDListFormCtrl'
+                controller: 'CRUDListFormController'
             })
             .when('/:wf/do/:cmd/:key', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDListFormCtrl'
+                controller: 'CRUDListFormController'
             })
             .when('/:wf/:model', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDCtrl'
+                controller: 'CRUDController'
             })
             .when('/:wf/:model/do/:cmd', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDListFormCtrl'
+                controller: 'CRUDListFormController'
             })
             .when('/:wf/:model/do/:cmd/:key', {
                 templateUrl: 'components/crud/templates/crud.html',
-                controller: 'CRUDListFormCtrl'
+                controller: 'CRUDListFormController'
             })
 
             .otherwise({redirectTo: '/dashboard'});

app/components/auth/auth_controller.js

@@ -25,7 +25,7 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies'])
      * @description LoginCtrl responsible to handle login process.<br>
      * Using 'ulakbus.formService.get_form' function generates the login form and post it to the API with input datas.
      */
-    .controller('LoginCtrl', function ($scope, $q, $timeout, $routeParams, $rootScope, $log, Generator, AuthService) {
+    .controller('LoginController', function ($scope, $q, $timeout, $routeParams, $rootScope, $log, Generator, AuthService) {
         $scope.url = 'login';
         $scope.form_params = {};
         $scope.form_params['clear_wf'] = 1;
@@ -35,6 +35,9 @@ angular.module('ulakbus.auth', ['ngRoute', 'ngCookies'])
                 {key: "password", type: "password", title: "Şifre"},
                 {type: 'submit', title: 'Giriş Yap'}
             ];
+            // to show page items showApp must be set to true
+            // it prevents to show empty nonsense page items when http401/403
+            $rootScope.showApp = true;
         });
         $scope.loggingIn = false;
         $scope.onSubmit = function (form) {

app/components/auth/auth_test.js

@@ -33,7 +33,7 @@ describe('ulakbus.auth module', function () {
     describe('login controller and service', function () {
 
         it('should have a login controller', inject(function () {
-            expect('ulakbus.auth.LoginCtrl').toBeDefined();
+            expect('ulakbus.auth.LoginController').toBeDefined();
         }));
 
         it('should get login form', inject(
@@ -44,7 +44,7 @@ describe('ulakbus.auth module', function () {
                 var $scope = $rootScope.$new();
                 $scope['url'] = 'login';
                 $scope['form_params'] = {clear_wf: 1};
-                var controller = $controller('LoginCtrl', {$scope: $scope});
+                var controller = $controller('LoginController', {$scope: $scope});
 
                 expect($scope.onSubmit).toBeDefined();
             })

app/components/crud/crud_controller.js

@@ -20,7 +20,7 @@
  * @requires ulakbus.formService
  * @type {ng.$compileProvider|*}
  */
-angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'ulakbus.formService'])
+angular.module('ulakbus.crud', ['schemaForm', 'ulakbus.formService'])
     .config(function (sfErrorMessageProvider) {
         sfErrorMessageProvider.setDefaultMessage(302, 'Bu alan zorunludur.');
         sfErrorMessageProvider.setDefaultMessage(200, 'En az {{schema.minLength}} değer giriniz.');
@@ -128,7 +128,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'ulakbus.formServi
      *
      * @returns {object}
      */
-    .controller('CRUDCtrl', function ($scope, $routeParams, Generator, CrudUtility) {
+    .controller('CRUDController', function ($scope, $routeParams, Generator, CrudUtility) {
         // get required params by calling CrudUtility.generateParam function
         CrudUtility.generateParam($scope, $routeParams);
         Generator.get_wf($scope);
@@ -137,8 +137,8 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'ulakbus.formServi
     /**
      * @memberof ulakbus.crud
      * @ngdoc controller
-     * @name CRUDListFormCtrl
-     * @description CRUDListFormCtrl is the main controller for crud module
+     * @name CRUDListFormController
+     * @description CRUDListFormController is the main controller for crud module
      * Based on the client_cmd parameter it generates its scope items.
      * client_cmd can be in ['show', 'list', 'form', 'reload', 'refresh']
      * There are 3 directives to manipulate controllers scope objects in crud.html
@@ -152,7 +152,7 @@ angular.module('ulakbus.crud', ['ui.bootstrap', 'schemaForm', 'ulakbus.formServi
      *
      * @returns {object}
      */
-    .controller('CRUDListFormCtrl', function ($scope, $rootScope, $location, $http, $log, $uibModal, $timeout, Generator, $routeParams, CrudUtility) {
+    .controller('CRUDListFormController', function ($scope, $rootScope, $location, $http, $log, $uibModal, $timeout, Generator, $routeParams, CrudUtility) {
         // reloadData must be a json object
         $scope.reload = function (reloadData) {
             $scope.form_params.cmd = $scope.reload_cmd;

app/components/crud/crud_controller_test.js

@@ -29,8 +29,8 @@ describe('crud controller module', function () {
 
     describe('crud controller', function () {
 
-        it('should have CRUDListFormCtrl', inject(function () {
-            expect('ulakbus.crud.CRUDListFormCtrl').toBeDefined();
+        it('should have CRUDListFormController', inject(function () {
+            expect('ulakbus.crud.CRUDListFormController').toBeDefined();
         }));
 
         it('should have CRUDCtrl', inject(function () {
@@ -52,24 +52,24 @@ describe('crud controller module', function () {
             expect($controller).toBeDefined();
         }]));
 
-        it('should execute CRUDListFormCtrl with form cms', inject(function ($rootScope, RESTURL) {
+        it('should execute CRUDListFormController with form cms', inject(function ($rootScope, RESTURL) {
             $httpBackend.expectGET(RESTURL.url + 'ara/personel/123')
                 .respond(200, {});
 
             var $scope = $rootScope.$new();
             var $routeParams = {cmd: 'form'};
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
 
         }));
 
-        it('should execute CRUDListFormCtrl with list cmd', inject(function ($rootScope, RESTURL) {
+        it('should execute CRUDListFormController with list cmd', inject(function ($rootScope, RESTURL) {
             $httpBackend.expectGET(RESTURL.url + 'ara/personel/123')
                 .respond(200, {});
 
             var $scope = $rootScope.$new();
             $scope.meta = {'allow_filters': true};
             var $routeParams = {cmd: 'list'};
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
             $scope.$broadcast('reload_cmd', 'list');
 
             $scope.$broadcast('updateObjects', ['test', 'headers']);
@@ -83,23 +83,23 @@ describe('crud controller module', function () {
             $scope.resetCmd();
         }));
 
-        it('should execute CRUDListFormCtrl with show cmd', inject(function ($rootScope, Generator) {
+        it('should execute CRUDListFormController with show cmd', inject(function ($rootScope, Generator) {
             var $scope = $rootScope.$new();
             var $routeParams = {cmd: 'show'};
             $scope.object = [];
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
 
             $scope.object = {test: {}};
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
 
             $scope.pageData = true;
             Generator.setPageData($scope);
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
 
 
         }));
 
-        it('should execute CRUDListFormCtrl with relad cmd', inject(function ($rootScope, RESTURL) {
+        it('should execute CRUDListFormController with relad cmd', inject(function ($rootScope, RESTURL) {
             $httpBackend.expectGET(RESTURL.url + 'ara/personel/123')
                 .respond(200, {});
 
@@ -107,7 +107,7 @@ describe('crud controller module', function () {
             $scope.form_params = {};
             $scope.reload_cmd = 'list';
             var $routeParams = {cmd: 'reload'};
-            var controller = $controller('CRUDListFormCtrl', {$scope: $scope, $routeParams: $routeParams});
+            var controller = $controller('CRUDListFormController', {$scope: $scope, $routeParams: $routeParams});
 
         }));
 

app/components/dashboard/dashboard_controller.js

@@ -21,7 +21,7 @@ angular.module('ulakbus.dashboard', [])
         $uibTooltipProvider.setTriggers({'click': 'mouseleave'});
     })
 
-    .controller('DashCtrl', function ($scope, $rootScope, $timeout, $http, $cookies, RESTURL, Generator) {
+    .controller('DashController', function ($scope, $rootScope, $timeout, $http, $cookies, RESTURL, Generator) {
         $scope.section = function (section_index) {
             $rootScope.section = section_index;
         };

app/components/dashboard/dashboard_test.js

@@ -26,17 +26,17 @@ describe('dashboard controller module', function () {
     }));
 
     describe('dashboard controller', function () {
-        it('should define DashCtrl', inject(function () {
-            expect('ulakbus.dashboard.DashCtrl').toBeDefined();
+        it('should define DashController', inject(function () {
+            expect('ulakbus.dashboard.DashController').toBeDefined();
         }));
 
         // todo: complete dashboard tests
-        it('should execute DashCtrl functions', inject(function ($rootScope, RESTURL) {
+        it('should execute DashController functions', inject(function ($rootScope, RESTURL) {
             $httpBackend.expectGET(RESTURL.url + 'ara/personel/123')
                 .respond(200, {});
 
             var $scope = $rootScope.$new();
-            var controller = $controller('DashCtrl', {$scope: $scope});
+            var controller = $controller('DashController', {$scope: $scope});
 
             $scope.student_kw = "123";
             $scope.staff_kw = "123";

app/components/debug/debug_controller.js

@@ -9,7 +9,7 @@
 'use strict';
 
 angular.module('ulakbus.debug', ['ngRoute'])
-    .controller('DebugCtrl', function ($scope, $rootScope, $location) {
+    .controller('DebugController', function ($scope, $rootScope, $location) {
 
         $scope.debug_queries = $rootScope.debug_queries;
 

app/components/devSettings/devSettings_controller.js

@@ -10,7 +10,7 @@
 
 angular.module('ulakbus.devSettings', ['ngRoute'])
 
-    .controller('DevSettingsCtrl', function ($scope, $cookies, $rootScope, RESTURL) {
+    .controller('DevSettingsController', function ($scope, $cookies, $rootScope, RESTURL) {
         $scope.backendurl = $cookies.get("backendurl");
         $scope.notificate = $cookies.get("notificate") || "on";
         //$scope.querydebug = $cookies.get("querydebug") || "on";

app/components/error_pages/error_controller.js

@@ -12,18 +12,18 @@ angular.module('ulakbus').config(['$routeProvider', function ($routeProvider) {
     $routeProvider
         .when('/error/500', {
             templateUrl: 'components/error_pages/500.html',
-            controller: '500Ctrl'
+            controller: '500Controller'
         })
         .when('/error/404', {
             templateUrl: 'components/error_pages/404.html',
-            controller: '404Ctrl'
+            controller: '404Controller'
         });
 }]);
 
 angular.module('ulakbus.error_pages', ['ngRoute'])
 
-    .controller('500Ctrl', function ($scope, $rootScope, $location) {
+    .controller('500Controller', function ($scope, $rootScope, $location) {
     })
 
-    .controller('404Ctrl', function ($scope, $rootScope, $location) {
+    .controller('404Controller', function ($scope, $rootScope, $location) {
     });
\ No newline at end of file

app/index.html

@@ -27,7 +27,7 @@
     <link rel="stylesheet" href="bower_components/intro.js/themes/introjs-nassim.css" type="text/css">
 
 </head>
-<body ng-controller="keyListen" ng-keydown="down($event)">
+<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp">
 
 <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
     <collapse-menu></collapse-menu>
@@ -39,7 +39,7 @@
     <!--</ul>-->
     <div class="navbar-header">
         <div class="brand">
-            <a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
+            <a href="#/dashboard" class="logo"><img src="/img/brand-logo.png" /></a>
         </div>
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -78,8 +78,8 @@
 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="bower_components/angular-route/angular-route.min.js"></script>
 <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
-<script src="bower_components/angular-resource/angular-resource.min.js"></script>
-<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
+<!--<script src="bower_components/angular-resource/angular-resource.min.js"></script>-->
+<!--<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>-->
 <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
 <script src="bower_components/tv4/tv4.js"></script>
@@ -97,7 +97,6 @@
 <script src="bower_components/intro.js/intro.js"></script>
 <!--<script src="bower_components/Chart.js/Chart.js"></script>-->
 <script src="shared/translations.js"></script>
-<script src="tmp/templates.js"></script>
 <script src="app.js"></script>
 <script src="app_routes.js"></script>
 <script src="shared/scripts/highlight.pack.js"></script>
@@ -114,7 +113,6 @@
 <script src="components/crud/crud_controller.js"></script>
 <script src="components/debug/debug_controller.js"></script>
 <script src="components/devSettings/devSettings_controller.js"></script>
-<script src="components/uitemplates/uitemplates.js"></script>
 <script src="components/error_pages/error_controller.js"></script>
 <script src="components/version/interpolate-filter.js"></script>
 <script src="components/version/version-directive.js"></script>

app/main.html

@@ -34,7 +34,7 @@
     <link rel="stylesheet" href="css/jquery-ui.min.css">
     <!-- @endif -->
 </head>
-<body ng-controller="keyListen" ng-keydown="down($event)">
+<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp">
 
 <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
     <collapse-menu></collapse-menu>
@@ -46,7 +46,7 @@
     <!--</ul>-->
     <div class="navbar-header">
         <div class="brand">
-            <a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
+            <a href="#/dashboard" class="logo"><img src="/img/brand-logo.png" /></a>
         </div>
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>
@@ -86,8 +86,8 @@
 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
 <script src="bower_components/angular-route/angular-route.min.js"></script>
 <script src="bower_components/angular-cookies/angular-cookies.min.js"></script>
-<script src="bower_components/angular-resource/angular-resource.min.js"></script>
-<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
+<!--<script src="bower_components/angular-resource/angular-resource.min.js"></script>-->
+<!--<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>-->
 <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 <script src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
 <script src="bower_components/tv4/tv4.js"></script>
@@ -105,7 +105,6 @@
 <script src="bower_components/intro.js/intro.js"></script>
 <!--<script src="bower_components/Chart.js/Chart.js"></script>-->
 <script src="shared/translations.js"></script>
-<script src="tmp/templates.js"></script>
 <script src="app.js"></script>
 <script src="app_routes.js"></script>
 <script src="shared/scripts/highlight.pack.js"></script>
@@ -122,7 +121,6 @@
 <script src="components/crud/crud_controller.js"></script>
 <script src="components/debug/debug_controller.js"></script>
 <script src="components/devSettings/devSettings_controller.js"></script>
-<script src="components/uitemplates/uitemplates.js"></script>
 <script src="components/error_pages/error_controller.js"></script>
 <script src="components/version/interpolate-filter.js"></script>
 <script src="components/version/version-directive.js"></script>

app/main.js

@@ -22,7 +22,7 @@
  */
 angular.module(
     'ulakbus', [
-        'ui.bootstrap',
+        //'ui.bootstrap',
         'angular-loading-bar',
         'ngRoute',
         'ngSanitize',
@@ -35,13 +35,11 @@ angular.module(
         'ulakbus.debug',
         'ulakbus.devSettings',
         'ulakbus.version',
-        //'schemaForm',
         'gettext',
         // @if NODE_ENV='PRODUCTION'
         'templates-prod',
         // @endif
         // @if NODE_ENV='DEVELOPMENT'
-        'ulakbus.uitemplates'
         // @endif
     ])
     /**

app/shared/directives.js

@@ -4,7 +4,6 @@
  *
  * This file is licensed under the GNU General Public License v3
  * (GPLv3).  See LICENSE.txt for details.
- * @type {ng.$compileProvider|*}
  */
 
 angular.module('ulakbus')
@@ -221,7 +220,7 @@ angular.module('ulakbus')
             scope: {},
             controller: function ($scope, $rootScope) {
                 $rootScope.collapsed = false;
-                $rootScope.sidebarPinned = $cookies.get('sidebarPinned') || 0;
+                $rootScope.sidebarPinned = $cookies.get('sidebarPinned') || 1;
 
                 $scope.collapseToggle = function () {
                     if ($window.innerWidth > '768') {
@@ -287,41 +286,6 @@ angular.module('ulakbus')
             }
         };
     })
-    /**
-     * @memberof ulakbus
-     * @ngdoc directive
-     * @name selectedUser
-     * @description Selected user on which the current job done is hold in this directive.
-     * @deprecated
-     */
-    .directive('selectedUser', function ($http, RESTURL) {
-        return {
-            templateUrl: 'shared/templates/directives/selected-user.html',
-            restrict: 'E',
-            replace: true,
-            link: function ($scope, $rootScope) {
-                $scope.$on('selectedUser', function ($event, data) {
-                    $scope.selectedUser = data;
-                    $scope.dynamicPopover = {
-                        content: '',
-                        name: data.name,
-                        tcno: data.tcno,
-                        key: data.key,
-                        templateUrl: 'shared/templates/directives/selectedUserPopover.html',
-                        title: 'İşlem Yapılan Kişi'
-                    };
-                });
-                $scope.$on('selectedUserTrigger', function ($event, data) {
-                    var postToApi = {model: 'Personel', cmd: 'show', id: data[1]};
-                    //postToApi[data[0]]=data[1];
-                    $http.get(RESTURL.url + 'ara/personel/' + data[1]).success(
-                        function (data) {
-                        }
-                    );
-                })
-            }
-        };
-    })
     /**
      * @memberof ulakbus
      * @ngdoc directive
@@ -347,7 +311,6 @@ angular.module('ulakbus')
                 };
 
                 var sidebarmenu = $('#side-menu');
-                //var sidebarUserMenu = $('#side-user-menu');
                 sidebarmenu.metisMenu();
                 $http.get(RESTURL.url + 'menu/')
                     .success(function (data) {
@@ -390,15 +353,11 @@ angular.module('ulakbus')
 
                         $scope.menuItems = $scope.prepareMenu({other: $scope.allMenuItems.other});
 
-                        // if selecteduser on cookie then add related part to the menu
-
-                        //if ($cookies.get("selectedUserType")) {
-                        //    $scope.menuItems[$cookies.get("selectedUserType")] = $scope.allMenuItems[$cookies.get("selectedUserType")];
-                        //}
-
                         $timeout(function () {
                             sidebarmenu.metisMenu();
-                            //sidebarUserMenu.metisMenu();
+                            // to show page items showApp must be set to true
+                            // it prevents to show empty nonsense page items when http401/403
+                            $rootScope.showApp = true;
                         });
                     });
 
@@ -408,10 +367,6 @@ angular.module('ulakbus')
                     var menu = {};
                     menu[data] = $scope.allMenuItems[data];
                     $rootScope.$broadcast("usermenuitems", $scope.prepareMenu(menu));
-                    //$timeout(function () {
-                    //    sidebarmenu.metisMenu();
-                    //    sidebarUserMenu.metisMenu();
-                    //});
                 });
 
                 $scope.$on('selectedUser', function ($event, data) {

app/zetalib/action_service.js

@@ -8,7 +8,7 @@
  */
 
 angular.module('ulakbus')
-    .controller('keyListen', function ($scope, action_service) {
+    .controller('KeyListenController', function ($scope, action_service) {
         $scope.keylog = [0,1];
         $scope.down = function(e) {
             angular.forEach(action_service.combinations, function (value, key) {
@@ -32,7 +32,7 @@ angular.module('ulakbus')
                 var modalInstance = $uibModal.open({
                     animation: true,
                     templateUrl: 'shared/templates/actionsModalContent.html',
-                    controller: 'ActionsModalCtrl',
+                    controller: 'ActionsModalController',
                     resolve: {
                         items: function () {
                             return document.querySelectorAll('.navbar-collapse a, #side-user-menu a, .dropdown-menu li a');
@@ -48,7 +48,7 @@ angular.module('ulakbus')
         };
         return actions;
     })
-    .controller('ActionsModalCtrl', function ($scope, $uibModalInstance, items) {
+    .controller('ActionsModalController', function ($scope, $uibModalInstance, items) {
         $scope.actions = [];
         angular.forEach(items, function (value, key) {
             if (!value.children[1]) {

app/zetalib/form_service.js

@@ -1092,7 +1092,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
     /**
      * @memberof ulakbus.formService
      * @ngdoc controller
-     * @name ModalCtrl
+     * @name ModalController
      * @description controller for listnode, node and linkedmodel modal and save data of it
      * @param {Object} items
      * @param {Object} $scope
@@ -1100,7 +1100,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
      * @param {Object} $route
      * @returns {Object} returns value for modal
      */
-    .controller('ModalCtrl', function ($scope, $uibModalInstance, Generator, items) {
+    .controller('ModalController', function ($scope, $uibModalInstance, Generator, items) {
         angular.forEach(items, function (value, key) {
             $scope[key] = items[key];
         });
@@ -1160,7 +1160,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                         backdrop: 'static',
                         keyboard: false,
                         templateUrl: 'shared/templates/listnodeModalContent.html',
-                        controller: 'ModalCtrl',
+                        controller: 'ModalController',
                         size: 'lg',
                         resolve: {
                             items: function () {
@@ -1282,7 +1282,7 @@ angular.module('ulakbus.formService', ['ui.bootstrap'])
                         backdrop: 'static',
                         keyboard: false,
                         templateUrl: 'shared/templates/linkedModelModalContent.html',
-                        controller: 'ModalCtrl',
+                        controller: 'ModalController',
                         size: 'lg',
                         resolve: {
                             items: function () {

dist/index.html

@@ -19,7 +19,7 @@
     <link rel="stylesheet" href="css/roboto/roboto.css">
     <link rel="stylesheet" href="css/jquery-ui.min.css">
 </head>
-<body ng-controller="keyListen" ng-keydown="down($event)">
+<body ng-controller="KeyListenController" ng-keydown="down($event)" ng-show="$root.showApp">
 
 <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0" ng-if="$root.loggedInUser">
     <collapse-menu></collapse-menu>
@@ -31,7 +31,7 @@
     <!--</ul>-->
     <div class="navbar-header">
         <div class="brand">
-            <a href="#/dashboard" ng-click="$root.breadcrumbLinks = ['Panel']" class="logo"><img src="/img/brand-logo.png" /></a>
+            <a href="#/dashboard" class="logo"><img src="/img/brand-logo.png" /></a>
         </div>
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
             <span class="sr-only">Toggle navigation</span>

karma.conf.js

@@ -37,7 +37,8 @@ module.exports = function (config) {
 
         frameworks: ['jasmine'],
 
-        browsers: ['PhantomJS', 'Chrome', 'Firefox', 'Safari'],
+        //browsers: ['PhantomJS', 'Chrome', 'Firefox', 'Safari'],
+        browsers: ['PhantomJS'],
 
         customLaunchers: {
             'PhantomJS_custom': {