diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..573280b1
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,27 @@
+repos:
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v5.0.0
+ hooks:
+ - id: trailing-whitespace
+ # Replaces or checks mixed line ending
+ - id: mixed-line-ending
+ args: ['--fix', 'lf']
+ exclude: '.*\.(svg)$'
+ # Forbid files which have a UTF-8 byte-order marker
+ - id: check-byte-order-marker
+ # Checks that non-binary executables have a proper shebang
+ - id: check-executables-have-shebangs
+ # Check for files that contain merge conflict strings.
+ - id: check-merge-conflict
+ # Check for debugger imports and py37+ breakpoint()
+ # calls in python source
+ - id: debug-statements
+ - id: check-yaml
+ files: .*\.(yaml|yml)$
+ - repo: https://opendev.org/openstack/hacking
+ rev: 7.0.0
+ hooks:
+ - id: hacking
+ additional_dependencies:
+ - flake8-import-order>0.18.0,<0.19.0
+ - horizon
diff --git a/doc/source/user/template_generator.rst b/doc/source/user/template_generator.rst
index 4fb83f20..dd9d9b4a 100644
--- a/doc/source/user/template_generator.rst
+++ b/doc/source/user/template_generator.rst
@@ -22,8 +22,8 @@ Generate a template
#. When in manipulate mode, click on CONNECT button to add an edge between
icons.
#. Click edges to show details of connections.
-#. Click the Generate Template button at the top-right of the page and
- generated template will be shown in a text box. You can also add
+#. Click the Generate Template button at the top-right of the page and
+ generated template will be shown in a text box. You can also add
modification to the template here.
#. Click CREATE STACK to jump to continue to :guilabel:`Launch Stack`.
#. Click DOWNLOAD STACK to download the generated template.
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/img/server-gray.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/img/server-gray.svg
index 9e17b0bd..e5f0af6d 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/img/server-gray.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/img/server-gray.svg
@@ -37,13 +37,13 @@
68.5,42.4 61.6,33 25.5,33 18.5,42.4 "/>
-
@@ -73,7 +73,7 @@
-
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/angular-notify.scss b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/angular-notify.scss
index ec993f90..ce816042 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/angular-notify.scss
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/angular-notify.scss
@@ -14,7 +14,7 @@
-webkit-transition: top 0.5s ease-out,opacity 0.2s ease-out;
-moz-transition: top 0.5s ease-out,opacity 0.2s ease-out;
-o-transition: top 0.5s ease-out,opacity 0.2s ease-out;
- transition: top 0.5s ease-out,opacity 0.2s ease-out;
+ transition: top 0.5s ease-out,opacity 0.2s ease-out;
visibility:hidden;
@@ -60,7 +60,7 @@
position: absolute;
top: 0px;
right: 3px;
- line-height: 15px;
+ line-height: 15px;
}
.cg-notify-close:hover, .cg-notify-close:focus {
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/vis.scss b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/vis.scss
index 273e7401..22802b57 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/vis.scss
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/css/vis.scss
@@ -264,7 +264,7 @@
}
.vis-item .vis-delete {
- background: none;
+ background: none;
position: absolute;
width: 24px;
height: 24px;
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/agent.controller.spec.js b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/agent.controller.spec.js
index a30320a5..bbb79583 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/agent.controller.spec.js
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/agent.controller.spec.js
@@ -92,7 +92,7 @@
$httpBackend.flush();
$scope.load_template_version();
-
+
expect($scope.template_version).toEqual('template_version-1');
});
});
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/droppable.directive.spec.js b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/droppable.directive.spec.js
index c26959ec..c5ec54b3 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/droppable.directive.spec.js
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/components/droppable.directive.spec.js
@@ -38,7 +38,7 @@
}
spyOn(mockEvent, 'preventDefault');
$scope.dragoverHandler(mockEvent);
-
+
expect(mockEvent.preventDefault).toHaveBeenCalled();
});
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/libs/angular-material.js b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/libs/angular-material.js
index 406c9aa7..3bccde6a 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/libs/angular-material.js
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/libs/angular-material.js
@@ -4921,95 +4921,95 @@ function InterimElementProvider() {
(function(){
"use strict";
-/**
- * @ngdoc module
- * @name material.core.liveannouncer
- * @description
- * AngularJS Material Live Announcer to provide accessibility for Voice Readers.
- */
-MdLiveAnnouncer.$inject = ["$timeout"];
-angular
- .module('material.core')
- .service('$mdLiveAnnouncer', MdLiveAnnouncer);
-
-/**
- * @ngdoc service
- * @name $mdLiveAnnouncer
- * @module material.core.liveannouncer
- *
- * @description
- *
- * Service to announce messages to supported screenreaders.
- *
- * > The `$mdLiveAnnouncer` service is internally used for components to provide proper accessibility.
- *
- *
- * module.controller('AppCtrl', function($mdLiveAnnouncer) {
- * // Basic announcement (Polite Mode)
- * $mdLiveAnnouncer.announce('Hey Google');
- *
- * // Custom announcement (Assertive Mode)
- * $mdLiveAnnouncer.announce('Hey Google', 'assertive');
- * });
- *
- *
- */
-function MdLiveAnnouncer($timeout) {
- /** @private @const @type {!angular.$timeout} */
- this._$timeout = $timeout;
-
- /** @private @const @type {!HTMLElement} */
- this._liveElement = this._createLiveElement();
-
- /** @private @const @type {!number} */
- this._announceTimeout = 100;
-}
-
-/**
- * @ngdoc method
- * @name $mdLiveAnnouncer#announce
- * @description Announces messages to supported screenreaders.
- * @param {string} message Message to be announced to the screenreader
- * @param {'off'|'polite'|'assertive'} politeness The politeness of the announcer element.
- */
-MdLiveAnnouncer.prototype.announce = function(message, politeness) {
- if (!politeness) {
- politeness = 'polite';
- }
-
- var self = this;
-
- self._liveElement.textContent = '';
- self._liveElement.setAttribute('aria-live', politeness);
-
- // This 100ms timeout is necessary for some browser + screen-reader combinations:
- // - Both JAWS and NVDA over IE11 will not announce anything without a non-zero timeout.
- // - With Chrome and IE11 with NVDA or JAWS, a repeated (identical) message won't be read a
- // second time without clearing and then using a non-zero delay.
- // (using JAWS 17 at time of this writing).
- self._$timeout(function() {
- self._liveElement.textContent = message;
- }, self._announceTimeout, false);
-};
-
-/**
- * Creates a live announcer element, which listens for DOM changes and announces them
- * to the screenreaders.
- * @returns {!HTMLElement}
- * @private
- */
-MdLiveAnnouncer.prototype._createLiveElement = function() {
- var liveEl = document.createElement('div');
-
- liveEl.classList.add('md-visually-hidden');
- liveEl.setAttribute('role', 'status');
- liveEl.setAttribute('aria-atomic', 'true');
- liveEl.setAttribute('aria-live', 'polite');
-
- document.body.appendChild(liveEl);
-
- return liveEl;
-};
+/**
+ * @ngdoc module
+ * @name material.core.liveannouncer
+ * @description
+ * AngularJS Material Live Announcer to provide accessibility for Voice Readers.
+ */
+MdLiveAnnouncer.$inject = ["$timeout"];
+angular
+ .module('material.core')
+ .service('$mdLiveAnnouncer', MdLiveAnnouncer);
+
+/**
+ * @ngdoc service
+ * @name $mdLiveAnnouncer
+ * @module material.core.liveannouncer
+ *
+ * @description
+ *
+ * Service to announce messages to supported screenreaders.
+ *
+ * > The `$mdLiveAnnouncer` service is internally used for components to provide proper accessibility.
+ *
+ *
+ * module.controller('AppCtrl', function($mdLiveAnnouncer) {
+ * // Basic announcement (Polite Mode)
+ * $mdLiveAnnouncer.announce('Hey Google');
+ *
+ * // Custom announcement (Assertive Mode)
+ * $mdLiveAnnouncer.announce('Hey Google', 'assertive');
+ * });
+ *
+ *
+ */
+function MdLiveAnnouncer($timeout) {
+ /** @private @const @type {!angular.$timeout} */
+ this._$timeout = $timeout;
+
+ /** @private @const @type {!HTMLElement} */
+ this._liveElement = this._createLiveElement();
+
+ /** @private @const @type {!number} */
+ this._announceTimeout = 100;
+}
+
+/**
+ * @ngdoc method
+ * @name $mdLiveAnnouncer#announce
+ * @description Announces messages to supported screenreaders.
+ * @param {string} message Message to be announced to the screenreader
+ * @param {'off'|'polite'|'assertive'} politeness The politeness of the announcer element.
+ */
+MdLiveAnnouncer.prototype.announce = function(message, politeness) {
+ if (!politeness) {
+ politeness = 'polite';
+ }
+
+ var self = this;
+
+ self._liveElement.textContent = '';
+ self._liveElement.setAttribute('aria-live', politeness);
+
+ // This 100ms timeout is necessary for some browser + screen-reader combinations:
+ // - Both JAWS and NVDA over IE11 will not announce anything without a non-zero timeout.
+ // - With Chrome and IE11 with NVDA or JAWS, a repeated (identical) message won't be read a
+ // second time without clearing and then using a non-zero delay.
+ // (using JAWS 17 at time of this writing).
+ self._$timeout(function() {
+ self._liveElement.textContent = message;
+ }, self._announceTimeout, false);
+};
+
+/**
+ * Creates a live announcer element, which listens for DOM changes and announces them
+ * to the screenreaders.
+ * @returns {!HTMLElement}
+ * @private
+ */
+MdLiveAnnouncer.prototype._createLiveElement = function() {
+ var liveEl = document.createElement('div');
+
+ liveEl.classList.add('md-visually-hidden');
+ liveEl.setAttribute('role', 'status');
+ liveEl.setAttribute('aria-atomic', 'true');
+ liveEl.setAttribute('aria-live', 'polite');
+
+ document.body.appendChild(liveEl);
+
+ return liveEl;
+};
})();
(function(){
@@ -8434,7 +8434,7 @@ function MdBottomSheetProvider($$interimElementProvider) {
// Prevent mouse focus on backdrop; ONLY programatic focus allowed.
// This allows clicks on backdrop to propogate to the $rootElement and
// ESC key events to be detected properly.
-
+
backdrop[0].tabIndex = -1;
if (options.clickOutsideToClose) {
@@ -11916,7 +11916,7 @@ function GridListDirective($interpolate, $mdConstant, $mdGridLayout, $mdMedia) {
function postLink(scope, element, attrs, ctrl) {
element.addClass('_md'); // private md component indicator for styling
-
+
// Apply semantics
element.attr('role', 'list');
@@ -15125,7 +15125,7 @@ angular
* - `locals` - `{Object=}`: An object containing key/value pairs. The keys
* will be used as names of values to inject into the controller. For
* example, `locals: {three: 3}` would inject `three` into the controller,
- * with the value 3. 'mdPanelRef' is a reserved key, and will always
+ * with the value 3. 'mdPanelRef' is a reserved key, and will always
* be set to the created MdPanelRef instance.
* - `resolve` - `{Object=}`: Similar to locals, except it takes promises as
* values. The panel will not open until all of the promises resolve.
@@ -21803,7 +21803,7 @@ function SliderDirective($$rAF, $window, $mdAria, $mdUtil, $mdConstant, $mdThemi
$mdUtil.bidiProperty(thumbContainer, 'left', 'right', thumbPosition);
}
-
+
activeTrack.css(vertical ? 'height' : 'width', activeTrackPercent);
element.toggleClass((invert ? 'md-max' : 'md-min'), percent === 0);
@@ -22104,7 +22104,7 @@ function MdSticky($mdConstant, $$rAF, $mdUtil, $compile) {
return a.top < b.top ? -1 : 1;
});
- // Find which item in the list should be active,
+ // Find which item in the list should be active,
// based upon the content's current scroll position
var item;
var currentScrollTop = contentEl.prop('scrollTop');
@@ -22124,7 +22124,7 @@ function MdSticky($mdConstant, $$rAF, $mdUtil, $compile) {
// Find the `top` of an item relative to the content element,
// and also the height.
function refreshPosition(item) {
- // Find the top of an item by adding to the offsetHeight until we reach the
+ // Find the top of an item by adding to the offsetHeight until we reach the
// content element.
var current = item.element[0];
item.top = 0;
@@ -22260,7 +22260,7 @@ function MdSticky($mdConstant, $$rAF, $mdUtil, $compile) {
// Android 4.4 don't accurately give scroll events.
// To fix this problem, we setup a fake scroll event. We say:
- // > If a scroll or touchmove event has happened in the last DELAY milliseconds,
+ // > If a scroll or touchmove event has happened in the last DELAY milliseconds,
// then send a `$scroll` event every animationFrame.
// Additionally, we add $scrollstart and $scrollend events.
function setupAugmentedScrollEvents(element) {
@@ -22875,7 +22875,7 @@ function MdToastDirective($mdToast) {
restrict: 'E',
link: function postLink(scope, element) {
element.addClass('_md'); // private md component indicator for styling
-
+
// When navigation force destroys an interimElement, then
// listen and $destroy() that interim instance...
scope.$on('$destroy', function() {
@@ -22976,7 +22976,7 @@ function MdToastDirective($mdToast) {
/**
* @ngdoc method
* @name $mdToast#showSimple
- *
+ *
* @param {string} message The message to display inside the toast
* @description
* Convenience method which builds and shows a simple toast.
@@ -27303,7 +27303,7 @@ MdChipRemove.$inject = ["$timeout"];angular
/**
* MdChipRemove Directive Definition.
- *
+ *
* @param $timeout
* @returns {{restrict: string, require: string[], link: Function, scope: boolean}}
* @constructor
@@ -28168,7 +28168,7 @@ MdChipsCtrl.prototype.contentIdFor = function(index) {
(function(){
"use strict";
-
+
MdChips.$inject = ["$mdTheming", "$mdUtil", "$compile", "$log", "$timeout", "$$mdSvgRegistry"];angular
.module('material.components.chips')
.directive('mdChips', MdChips);
@@ -28180,7 +28180,7 @@ MdChipsCtrl.prototype.contentIdFor = function(index) {
*
* @description
* `` is an input component for building lists of strings or objects. The list items are
- * displayed as 'chips'. This component can make use of an `` element.
*
* ### Custom templates
@@ -28277,7 +28277,7 @@ MdChipsCtrl.prototype.contentIdFor = function(index) {
* the input and delete buttons. If no `ng-model` is provided, the chips will automatically be
* marked as readonly.Volume Type
- {$ vtype.name $}
+ {$ vtype.name $}
@@ -33,7 +33,7 @@
Availability Zone
- {$ az.name $}
+ {$ az.name $}
@@ -70,7 +70,7 @@
Create from source
- {$ source.name $}
+ {$ source.name $}
@@ -79,7 +79,7 @@
Backup ID
- {$ backup.name $}
+ {$ backup.name $}
@@ -88,7 +88,7 @@
Image
- {$ image.name $}
+ {$ image.name $}
@@ -97,7 +97,7 @@
Snapshot
- {$ snapshot.name $}
+ {$ snapshot.name $}
@@ -106,7 +106,7 @@
Source Volume
- {$ volume.name $}
+ {$ volume.name $}
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-blue.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-blue.svg
index 0314af6f..bb799d11 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-blue.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-blue.svg
@@ -1,5 +1,5 @@
-
+
Layer 1
@@ -25,13 +25,13 @@
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-gray.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-gray.svg
index c0e3f02e..18a18c56 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-gray.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-gray.svg
@@ -1,5 +1,5 @@
-
+
Layer 1
@@ -25,13 +25,13 @@
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-green.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-green.svg
index ea1fd4a9..1f47218e 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-green.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-green.svg
@@ -1,5 +1,5 @@
-
+
Layer 1
@@ -25,13 +25,13 @@
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-red.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-red.svg
index 096e98fb..9d680c8d 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-red.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup-red.svg
@@ -1,5 +1,5 @@
-
+
Layer 1
@@ -25,13 +25,13 @@
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup.svg
index 1d1878ec..f1b7e2cc 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__resourcegroup/os__heat__resourcegroup.svg
@@ -1,5 +1,5 @@
-
+
Layer 1
@@ -25,13 +25,13 @@
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__scalingpolicy/os__heat__scalingpolicy-gray.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__scalingpolicy/os__heat__scalingpolicy-gray.svg
index 97738da3..0e73ea7e 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__scalingpolicy/os__heat__scalingpolicy-gray.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__heat__scalingpolicy/os__heat__scalingpolicy-gray.svg
@@ -1,6 +1,6 @@
Layer 1 Layer 2
P
+
\ No newline at end of file
diff --git a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__routerinterface/os__neutron__routerinterface.svg b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__routerinterface/os__neutron__routerinterface.svg
index 8212a917..c22f20a4 100644
--- a/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__routerinterface/os__neutron__routerinterface.svg
+++ b/heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__routerinterface/os__neutron__routerinterface.svg
@@ -1,4 +1,4 @@
-
+
Layer 1