Merge pull request #63 from lalop/fix-html2js

Fix html2js

gruntfile.js

@@ -227,7 +227,7 @@ module.exports = function(grunt) {
         },
         html2js: {
 		  options: {
-		    base: 'NodeForm',
+		    base: 'public',
 		    watch: true,
 			module: 'NodeForm.templates',
 		    singleModule: true,
@@ -294,7 +294,7 @@ module.exports = function(grunt) {
 	grunt.registerTask('lint:tests', ['jshint:allTests']);
 
 	// Build task(s).
-	grunt.registerTask('build', ['lint', 'loadConfig', 'cssmin', 'ngAnnotate', 'uglify', 'html2js:main']);
+	grunt.registerTask('build', ['lint', 'loadConfig', 'cssmin', 'html2js:main', 'ngAnnotate', 'uglify']);
 
 	// Test task(s).
 	grunt.registerTask('test', ['lint:tests', 'test:server', 'test:client']);

public/modules/forms/config/forms.client.routes.js

@@ -1,7 +1,8 @@
 'use strict';
 
 // Setting up route
-angular.module('forms').config(['$stateProvider',
+angular.module('forms').config([
+	'$stateProvider',
 
 	function($stateProvider) {
 		// Forms state routing
@@ -45,7 +46,7 @@ angular.module('forms').config(['$stateProvider',
 			templateUrl: 'modules/forms/views/adminTabs/design.html'
 	    }).state('viewForm.analyze', {
 			url: '/analyze',
-			templateUrl: 'modules/forms/views/adminTabs/analyze.html',
+			templateUrl: 'modules/forms/views/adminTabs/analyze.html'
 	    }).state('viewForm.create', {
 			url: '/create',
 			templateUrl: 'modules/forms/views/adminTabs/create.html'

public/modules/forms/controllers/admin-form.client.controller.js

@@ -1,8 +1,12 @@
 'use strict';
 
 // Forms controller
-angular.module('forms').controller('AdminFormController', ['$rootScope', '$scope', '$stateParams', '$state', 'Forms', 'CurrentForm', '$http', '$uibModal', 'myForm',
-	function($rootScope, $scope, $stateParams, $state, Forms, CurrentForm, $http, $uibModal, myForm) {
+angular.module('forms').controller('AdminFormController', [
+	'$rootScope', '$scope', '$stateParams', '$state', 'Forms',
+	'CurrentForm', '$http', '$uibModal', 'myForm',
+
+	function($rootScope, $scope, $stateParams, $state, Forms,
+			CurrentForm, $http, $uibModal, myForm) {
 
         $scope = $rootScope;
         $scope.animationsEnabled = true;

public/modules/forms/directives/configure-form.client.directive.js

@@ -1,6 +1,7 @@
 'use strict';
 
-angular.module('forms').directive('configureFormDirective', ['$rootScope', '$http', 'Upload', 'CurrentForm',
+angular.module('forms').directive('configureFormDirective', [
+	'$rootScope', '$http', 'Upload', 'CurrentForm',
     function ($rootScope, $http, Upload, CurrentForm) {
         return {
             templateUrl: 'modules/forms/views/directiveViews/form/configure-form.client.view.html',

public/modules/forms/directives/edit-form.client.directive.js

@@ -1,6 +1,7 @@
 'use strict';
 
-angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormFields',
+angular.module('forms').directive('editFormDirective', [
+    '$rootScope', 'FormFields', 
     function ($rootScope, FormFields) {
         return {
             templateUrl: 'modules/forms/views/directiveViews/form/edit-form.client.view.html',

public/modules/forms/directives/edit-submissions-form.client.directive.js

@@ -1,6 +1,7 @@
 'use strict';
 
-angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', '$http',
+angular.module('forms').directive('editSubmissionsFormDirective', [
+	'$rootScope', '$http',
     function ($rootScope, $http) {
         return {
             templateUrl: 'modules/forms/views/directiveViews/form/edit-submissions-form.client.view.html',

public/modules/forms/directives/field.client.directive.js

@@ -33,7 +33,7 @@ angular.module('forms').directive('fieldDirective', ['$http', '$compile', '$root
             templateUrl = templateUrl+type+'.html';
         }
 
-   		return $templateCache.get('../public/'+templateUrl);
+   		return $templateCache.get(templateUrl);
     };
 
     return {

public/modules/users/config/users.client.routes.js

@@ -1,7 +1,8 @@
 'use strict';
 
 // Setting up route
-angular.module('users').config(['$stateProvider',
+angular.module('users').config([
+	'$stateProvider',
 	function($stateProvider) {
 
 	var checkLoggedin = function($q, $timeout, $state, User, Auth) {