Merge branch 'crudview_works'

Gruntfile.js

@@ -80,7 +80,8 @@ module.exports = function (grunt) {
                     {expand: true, cwd: 'app/bower_components/bootstrap/dist/fonts/', src: '*', dest: 'dist/fonts/', flatten: true, filter: 'isFile'},
                     {expand: true, cwd: 'app/bower_components/jquery/dist/', src: 'jquery.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
                     {expand: true, cwd: 'app/bower_components/angular/', src: 'angular.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
-                    {expand: true, cwd: 'app/shared/scripts/', src: 'theme.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
+                    //{expand: true, cwd: 'app/shared/scripts/', src: 'theme.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'},
+                    {expand: true, cwd: 'app/shared/scripts/', src: 'jquery-ui.min.js', dest: 'dist/bower_components/', flatten: true, filter: 'isFile'}
                 ]
 
             }
@@ -101,6 +102,8 @@ module.exports = function (grunt) {
                     "app/components/auth/auth_service.js",
                     "app/components/dashboard/dashboard_controller.js",
                     "app/components/crud/crud_controller.js",
+                    "app/components/error_pages/error_controller.js",
+                    "app/components/wf/wf_controller.js",
                     "app/components/version/version.js",
                     "app/components/version/interpolate-filter.js",
                     "app/components/version/version-directive.js"
@@ -109,24 +112,25 @@ module.exports = function (grunt) {
             },
             components: {
                 src: [
-                    "app/bower_components/jquery/dist/jquery.min.js",
-                    "app/bower_components/bootstrap/dist/js/bootstrap.min.js",
-                    "app/bower_components/angular-route/angular-route.min.js",
-                    "app/bower_components/angular-cookies/angular-cookies.min.js",
-                    "app/bower_components/angular-resource/angular-resource.min.js",
-                    "app/bower_components/angular-bootstrap/ui-bootstrap.min.js",
+                    //"app/bower_components/angular/angular.js",
+                    //"app/bower_components/jquery/dist/jquery.js",
+                    "app/bower_components/bootstrap/dist/js/bootstrap.js",
+                    "app/bower_components/angular-route/angular-route.js",
+                    "app/bower_components/angular-cookies/angular-cookies.js",
+                    "app/bower_components/angular-resource/angular-resource.js",
+                    "app/bower_components/angular-bootstrap/ui-bootstrap.js",
                     "app/bower_components/angular-bootstrap/ui-bootstrap-tpls.js",
-                    "app/bower_components/angular-sanitize/angular-sanitize.min.js",
+                    "app/bower_components/angular-sanitize/angular-sanitize.js",
                     "app/bower_components/tv4/tv4.js",
                     "app/bower_components/objectpath/lib/ObjectPath.js",
-                    "app/bower_components/angular-schema-form/dist/schema-form.min.js",
-                    "app/bower_components/angular-schema-form/dist/bootstrap-decorator.min.js",
-                    "app/bower_components/angular-gettext/dist/angular-gettext.min.js",
-                    "app/bower_components/json3/lib/json3.min.js",
-                    "app/bower_components/angular-loading-bar/build/loading-bar.min.js",
-                    "app/bower_components/metisMenu/dist/metisMenu.min.js",
-                    "app/bower_components/Chart.js/Chart.min.js",
-                    "app/shared/scripts/jquery-ui.min.js"
+                    "app/bower_components/angular-schema-form/dist/schema-form.js",
+                    "app/bower_components/angular-schema-form/dist/bootstrap-decorator.js",
+                    "app/bower_components/angular-gettext/dist/angular-gettext.js",
+                    "app/bower_components/json3/lib/json3.js",
+                    "app/bower_components/angular-loading-bar/build/loading-bar.js",
+                    "app/bower_components/metisMenu/dist/metisMenu.js",
+                    "app/bower_components/Chart.js/Chart.js",
+                    //"app/shared/scripts/jquery-ui.min.js"
                 ],
                 dest: 'dist/bower_components/components.js'
             },

app/main.html

@@ -119,7 +119,8 @@
 
 <!-- @if NODE_ENV == 'PRODUCTION' -->
 <script src="bower_components/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.20/angular.min.js"></script>
+<script src="bower_components/jquery-ui.min.js"></script>
+<script src="bower_components/angular.min.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>
 <script src="templates.js"></script>

dist/bower_components/theme.js

-/**
- * Copyright (C) 2015 ZetaOps Inc.
- *
- * This file is licensed under the GNU General Public License v3
- * (GPLv3).  See LICENSE.txt for details.
- */
-
-$(function() {
-
-    $('#side-menu').metisMenu();
-
-});
-
-//Loads the correct sidebar on window load,
-//collapses the sidebar on window resize.
-// Sets the min-height of #page-wrapper to window size
-$(function() {
-    $(window).bind("load resize", function() {
-        topOffset = 50;
-        width = (this.window.innerWidth > 0) ? this.window.innerWidth : this.screen.width;
-        if (width < 768) {
-            $('div.navbar-collapse').addClass('collapse');
-            topOffset = 100; // 2-row-menu
-        } else {
-            $('div.navbar-collapse').removeClass('collapse');
-        }
-
-        height = ((this.window.innerHeight > 0) ? this.window.innerHeight : this.screen.height) - 1;
-        height = height - topOffset;
-        if (height < 1) height = 1;
-        if (height > topOffset) {
-            $("#page-wrapper").css("min-height", (height) + "px");
-        }
-    });
-
-    var url = window.location;
-    var element = $('ul.nav a').filter(function() {
-        return this.href == url || url.href.indexOf(this.href) == 0;
-    }).addClass('active').parent().parent().addClass('in').parent();
-    if (element.is('li')) {
-        element.addClass('active');
-    }
-});

dist/index.html

@@ -61,7 +61,8 @@
 
 
 <script src="bower_components/jquery.min.js"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.20/angular.min.js"></script>
+<script src="bower_components/jquery-ui.min.js"></script>
+<script src="bower_components/angular.min.js"></script>
 <script src="bower_components/components.js"></script>
 <script src="shared/translations.js"></script>
 <script src="templates.js"></script>