Moved templates & controllers into state folders. Keeps related files…

… together and improves overall development. Closes 4

admin/lib/bootstrap/style.css

@@ -630,6 +630,9 @@ max-height: 0;
 .console {
     margin: 10px 0 0 0;
 }
+.console .button {
+    margin: 0 5px 0 0;
+}
 .content-view form input[type="submit"]{
     margin: 20px 0 20px 10px;
 }

admin/lib/config.ts

@@ -58,7 +58,7 @@
                 .state("default", <CustomState>{
                     views: {
                         "main-view": {
-                            templateUrl: "templates/dashboard.html",
+                            templateUrl: "states/default/dashboard.html",
                             "controller": ["$scope", function ($scope)
                             {
                                 var dashLinks = [];
@@ -73,25 +73,25 @@
                     authenticate: true
                 })
                 .state('default.seo', <CustomState>{
-                    templateUrl: 'templates/dash-seo.html',
+                    templateUrl: 'states/seo/dash-seo.html',
                     authenticate: true,
                     controller: "seoCtrl",
                     controllerAs: "controller"
                 })
                 .state('default.media', <CustomState>{
-                    templateUrl: 'templates/dash-media.html',
+                    templateUrl: 'states/media/dash-media.html',
                     authenticate: true,
                     controller: "mediaCtrl",
                     controllerAs: "mediaController"
                 })
                 .state('default.users', <CustomState>{
-                    templateUrl: 'templates/dash-users.html',
+                    templateUrl: 'states/users/dash-users.html',
                     authenticate: true,
                     controller: "usersCtrl",
                     controllerAs: "controller"
                 })
                 .state('default.posts', <CustomState>{
-                    templateUrl: 'templates/dash-posts.html',
+                    templateUrl: 'states/posts/dash-posts.html',
                     authenticate: true,
                     controller: "postsCtrl",
                     controllerAs: "controller",
@@ -112,7 +112,7 @@
                 .state("login", <CustomState>{
 					views: {
 						"main-view": {
-                            templateUrl: "templates/log-in.html",
+                            templateUrl: "states/login/log-in.html",
 							controller: "loginCtrl",
 							controllerAs: "controller"
 						}
@@ -123,7 +123,7 @@
 				.state("register", <CustomState>{
 					views: {
 						"main-view": {
-                            templateUrl: "templates/register.html",
+                            templateUrl: "states/register/register.html",
                             controller: "registerCtrl",
 							controllerAs: "controller"
 						}
@@ -138,7 +138,7 @@
 				.state("message", <CustomState> {
 					views: {
 						"main-view": {
-                            templateUrl: "templates/message.html",
+                            templateUrl: "states/message/message.html",
                             controller: ["$scope", "$stateParams", function ($scope, $stateParams )
 							{
 								// Decodes the html
@@ -158,7 +158,7 @@
                 .state("password-rest", <CustomState> {
                         views: {
                             "main-view": {
-                                templateUrl: "templates/password-reset.html",
+                                templateUrl: "states/password-reset/password-reset.html",
                                 controllerAs: "controller",
                                 controller: "passwordCtrl"
                                 //controller: ["$scope", "$stateParams", function ($scope, $stateParams)

admin/lib/directives/pager.ts → admin/lib/directives/pager/pager.ts

@@ -17,7 +17,7 @@ module clientAdmin
 	{
         restrict = 'A';
         transclude = true;
-        templateUrl = 'templates/directives/pager.html';
+        templateUrl = 'directives/pager/pager.html';
         scope = {
             interface: '=', // must be IPagerRemote
             index: '=?',

admin/lib/templates/dash-posts.html → admin/lib/states/posts/dash-posts.html

@@ -6,7 +6,7 @@
 </div>
 <div class="dialog-modal" ng-if="controller.showMediaBrowser">
 	<div class="big-dialog-box">
-		<ng-include ng-controller="mediaCtrl as mediaController" src="'/templates/dash-media.html'" ng-init="mediaController.multiSelect= false"></ng-include>
+		<ng-include ng-controller="mediaCtrl as mediaController" src="'states/media/dash-media.html'" ng-init="mediaController.multiSelect= false"></ng-include>
 	</div>
 </div>
 

admin/tsconfig.json

@@ -21,15 +21,15 @@
         "lib/definitions/required/webinate-users.d.ts",
         "lib/definitions/custom/tinymce.d.ts",
         "lib/definitions/custom/modepress-client.d.ts",
-        "lib/controllers/paged-content-ctrl.ts",
-        "lib/controllers/seo-ctrl.ts",
-        "lib/controllers/login-ctrl.ts",
-        "lib/controllers/register-ctrl.ts",
-        "lib/controllers/password-ctrl.ts",
-        "lib/controllers/media-ctrl.ts",
-        "lib/controllers/users-ctrl.ts",
-        "lib/controllers/posts-ctrl.ts",
-        "lib/directives/pager.ts",
+        "lib/states/paged-content-ctrl.ts",
+        "lib/states/seo/seo-ctrl.ts",
+        "lib/states/login/login-ctrl.ts",
+        "lib/states/register/register-ctrl.ts",
+        "lib/states/password-reset/password-ctrl.ts",
+        "lib/states/media/media-ctrl.ts",
+        "lib/states/users/users-ctrl.ts",
+        "lib/states/posts/posts-ctrl.ts",
+        "lib/directives/pager/pager.ts",
         "lib/authenticator.ts",
         "lib/config.ts",
         "lib/application.ts"