Merge "Dashboard ReOrg - Move tech-debt into app/"

openstack_dashboard/enabled/_10_project.py

@@ -49,9 +49,6 @@ ADD_JS_FILES = [
     LAUNCH_INST + 'configuration/configuration.controller.js',
     LAUNCH_INST + 'configuration/configuration-help.controller.js',
     LAUNCH_INST + 'configuration/load-edit.directive.js',
-
-    'dashboard/tech-debt/tech-debt.module.js',
-    'dashboard/tech-debt/image-form-ctrl.js',
 ]
 
 ADD_JS_SPEC_FILES = [

openstack_dashboard/enabled/_20_admin.py

@@ -21,7 +21,4 @@ ADD_INSTALLED_APPS = [
 ]
 
 ADD_JS_FILES = [
-    'dashboard/tech-debt/tech-debt.module.js',
-    'dashboard/tech-debt/namespace-ctrl.js',
-    'dashboard/tech-debt/image-form-ctrl.js',
 ]

openstack_dashboard/static/app/app.module.js

@@ -31,8 +31,9 @@
    * and modules from `openstack_dashboard` application core components.
    */
   var horizonBuiltInModules = [
-    'horizon.auth',
     'horizon.app.core',
+    'horizon.app.tech-debt',
+    'horizon.auth',
     'hz.dashboard',
     'horizon.framework',
     'horizon.openstack-service-api'

openstack_dashboard/static/app/tech-debt/image-form-ctrl.js

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
   angular
-    .module('hz.dashboard.tech-debt')
+    .module('horizon.app.tech-debt')
     .controller('ImageFormCtrl', ['$scope', function ($scope) {
       $scope.selectImageFormat = function (path) {
         if (!path) { return; }

openstack_dashboard/static/app/tech-debt/namespace-ctrl.js

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
   angular
-    .module('hz.dashboard.tech-debt')
+    .module('horizon.app.tech-debt')
     .controller('hzNamespaceResourceTypeFormController', function($scope, $window) {
       $scope.resource_types = $window.resource_types;
 

openstack_dashboard/static/app/tech-debt/tech-debt.module.js

@@ -0,0 +1,35 @@
+/**
+ *    (c) Copyright 2015 Hewlett-Packard Development Company, L.P.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+(function () {
+  'use strict';
+
+  /**
+   * @ngdoc overview
+   * @name horizon.app.tech-debt
+   * @description
+   *
+   * # horizon.app.tech-debt
+   *
+   * A collection of Angular controllers that existed before Angular work was
+   * started on a large scale. These will go away over time as files are
+   * refactored to meet style guidelines and are moved into the appropriate
+   * dashboard code area.
+   */
+  angular
+    .module('horizon.app.tech-debt',[]);
+
+})();

openstack_dashboard/static/dashboard/dashboard.module.js

@@ -3,8 +3,7 @@
 
   angular
     .module('hz.dashboard', [
-      'hz.dashboard.launch-instance',
-      'hz.dashboard.tech-debt'
+      'hz.dashboard.launch-instance'
     ])
     .config(config);
 

openstack_dashboard/static/dashboard/tech-debt/tech-debt.module.js

@@ -1,6 +0,0 @@
-(function () {
-  'use strict';
-
-  angular.module('hz.dashboard.tech-debt', []);
-
-})();