Commit 70b5c503 authored by Evren Kutar's avatar Evren Kutar

grunt config

parent df693179
...@@ -119,13 +119,14 @@ module.exports = function (grunt) { ...@@ -119,13 +119,14 @@ module.exports = function (grunt) {
grunt.registerTask('dev', ['bower', 'connect:server', 'watch:dev']); grunt.registerTask('dev', ['bower', 'connect:server', 'watch:dev']);
grunt.registerTask('test', ['bower', 'jshint', 'karma:continuous']); grunt.registerTask('test', ['bower', 'jshint', 'karma:continuous']);
grunt.registerTask('minified', ['bower', 'connect:server', 'watch:min']); grunt.registerTask('minified', ['bower', 'connect:server', 'watch:min']);
grunt.registerTask('extract_i18n', ['nggettext_extract']);
grunt.registerTask('compile_i18n', ['nggettext_compile']);
grunt.registerTask('default', [ grunt.registerTask('default', [
'bower', 'bower',
'html2js:dist', 'html2js:dist',
'concat:dist', 'concat:dist',
'concat:components', 'concat:components',
'uglify:dist', 'uglify:dist',
'nggettext_extract',
'nggettext_compile' 'nggettext_compile'
]); ]);
......
...@@ -26,6 +26,7 @@ staff.controller('StaffAddEditCtrl', function ($scope, $rootScope, $location, $h ...@@ -26,6 +26,7 @@ staff.controller('StaffAddEditCtrl', function ($scope, $rootScope, $location, $h
else { else {
form_params['cmd'] = 'add_object'; form_params['cmd'] = 'add_object';
} }
// to start in certain part of the workflow use clear_wf=1
form_params['clear_wf'] = 1; form_params['clear_wf'] = 1;
Generator.get_form($scope.url, form_params).then(function (object) { Generator.get_form($scope.url, form_params).then(function (object) {
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet"
href="bower_components/angular-bootstrap/ui-bootstrap-csp.css">
<link rel="stylesheet" <link rel="stylesheet"
href="bower_components/bootstrap/dist/css/bootstrap.css"> href="bower_components/bootstrap/dist/css/bootstrap.css">
<!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css">--> <!--<link rel="stylesheet" href="bower_components/quantumui/dist/css/addon/effect-light.min.css">-->
...@@ -82,6 +84,8 @@ ...@@ -82,6 +84,8 @@
<script src="bower_components/angular-route/angular-route.js"></script> <script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script> <script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script> <script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script type="text/javascript" <script type="text/javascript"
src="bower_components/angular-sanitize/angular-sanitize.js"></script> src="bower_components/angular-sanitize/angular-sanitize.js"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment