added progressbar

This commit is contained in:
Mario Colque 2014-02-10 15:51:26 -03:00
parent 78d1fb8eda
commit c3cf0145ce
6 changed files with 14 additions and 5 deletions

View File

@ -72,7 +72,7 @@ module.exports = function(grunt) {
dest: 'public/js/vendors.js'
},
angular: {
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.min.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js', 'public/lib/angular-ui-utils/ui-utils.min.js'],
src: ['public/lib/angular/angular.min.js', 'public/lib/angular-resource/angular-resource.min.js', 'public/lib/angular-route/angular-route.min.js', 'public/lib/angular-qrcode/qrcode.js', 'public/lib/angular-animate/angular-animate.min.js', 'public/lib/angular-bootstrap/ui-bootstrap.min.js', 'public/lib/angular-bootstrap/ui-bootstrap-tpls.min.js', 'public/lib/angular-ui-utils/ui-utils.min.js', 'public/lib/ngprogress/build/ngProgress.min.js'],
dest: 'public/js/angularjs-all.js'
},
main: {
@ -80,7 +80,7 @@ module.exports = function(grunt) {
dest: 'public/js/main.js'
},
css: {
src: ['public/src/css/**/*.css'],
src: ['public/lib/ngprogress/ngProgress.css', 'public/src/css/**/*.css'],
dest: 'public/css/main.css'
}
},

View File

@ -4,7 +4,6 @@
"dependencies": {
"angular": "latest",
"angular-resource": "latest",
"angular-cookies": "latest",
"angular-mocks": "latest",
"angular-route": "latest",
"bootstrap": "3.0.3",
@ -13,6 +12,7 @@
"angular-qrcode": "latest",
"angular-animate": "latest",
"momentjs": "~2.5.0",
"zeroclipboard": "~1.3.0-beta.1"
"zeroclipboard": "~1.3.0-beta.1",
"ngprogress": "~1.0.4"
}
}

View File

@ -4,6 +4,7 @@ angular.module('insight',[
'ngAnimate',
'ngResource',
'ngRoute',
'ngProgress',
'ui.bootstrap',
'ui.route',
'monospaced.qrcode',

View File

@ -47,8 +47,16 @@ angular.module('insight')
$locationProvider.html5Mode(true);
$locationProvider.hashPrefix('!');
})
.run(function($rootScope, $route) {
.run(function($rootScope, $route, ngProgress) {
$rootScope.$on('$routeChangeStart', function() {
ngProgress.height('4px');
ngProgress.color('#373D42');
ngProgress.start();
});
$rootScope.$on('$routeChangeSuccess', function() {
ngProgress.complete();
//Change page title, based on Route information
$rootScope.titleDetail = '';
$rootScope.title = $route.current.title;

0
public/src/js/controllers/header.js Executable file → Normal file
View File

0
public/src/js/controllers/index.js Executable file → Normal file
View File