diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html b/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html index f7c5881336..a852da5255 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html @@ -10,7 +10,7 @@ - + diff --git a/openstack_dashboard/static/js/.eslintrc b/openstack_dashboard/static/js/.eslintrc new file mode 100644 index 0000000000..2e608255c1 --- /dev/null +++ b/openstack_dashboard/static/js/.eslintrc @@ -0,0 +1,34 @@ +# ESLint styles for Horizon's Legacy javascript code. These rule overrides exist to enforce an +# older linting style, to ensure backward compatibility. + +rules: + + # Various rules applicable to our new Code Style guidelines were only intermittently enforced + # in the legacy code, and were not addressed during the JSCS move. This disables the applicable + # rules. + camelcase: 0 + max-len: 0 + space-before-blocks: 0 + one-var: 0 + space-infix-ops: 0 + space-after-keywords: 0 + no-console: 0 + no-multiple-empty-lines: 0 + no-sync: 0 + no-process-exit: 0 + space-unary-ops: 0 + curly: 0 + indent: 0 + valid-jsdoc: 0 + no-undefined: 0 + brace-style: 0 + strict: 0 + no-extra-parens: 0 + eqeqeq: 0 + consistent-return: 0 + callback-return: 0 + guard-for-in: 0 + block-scoped-var: 0 + semi-spacing: 0 + no-redeclare: 0 + no-new: 0 \ No newline at end of file diff --git a/horizon/static/horizon/js/angular/directives/serialConsole.js b/openstack_dashboard/static/js/angular/directives/serialConsole.js similarity index 100% rename from horizon/static/horizon/js/angular/directives/serialConsole.js rename to openstack_dashboard/static/js/angular/directives/serialConsole.js diff --git a/horizon/static/horizon/js/horizon.firewalls.js b/openstack_dashboard/static/js/horizon.firewalls.js similarity index 100% rename from horizon/static/horizon/js/horizon.firewalls.js rename to openstack_dashboard/static/js/horizon.firewalls.js diff --git a/horizon/static/horizon/js/horizon.flatnetworktopology.js b/openstack_dashboard/static/js/horizon.flatnetworktopology.js similarity index 100% rename from horizon/static/horizon/js/horizon.flatnetworktopology.js rename to openstack_dashboard/static/js/horizon.flatnetworktopology.js diff --git a/horizon/static/horizon/js/horizon.instances.js b/openstack_dashboard/static/js/horizon.instances.js similarity index 100% rename from horizon/static/horizon/js/horizon.instances.js rename to openstack_dashboard/static/js/horizon.instances.js diff --git a/horizon/static/horizon/js/horizon.metering.js b/openstack_dashboard/static/js/horizon.metering.js similarity index 100% rename from horizon/static/horizon/js/horizon.metering.js rename to openstack_dashboard/static/js/horizon.metering.js diff --git a/horizon/static/horizon/js/horizon.networktopology.js b/openstack_dashboard/static/js/horizon.networktopology.js similarity index 100% rename from horizon/static/horizon/js/horizon.networktopology.js rename to openstack_dashboard/static/js/horizon.networktopology.js diff --git a/horizon/static/horizon/js/horizon.networktopologycommon.js b/openstack_dashboard/static/js/horizon.networktopologycommon.js similarity index 100% rename from horizon/static/horizon/js/horizon.networktopologycommon.js rename to openstack_dashboard/static/js/horizon.networktopologycommon.js diff --git a/horizon/static/horizon/js/horizon.quota.js b/openstack_dashboard/static/js/horizon.quota.js similarity index 100% rename from horizon/static/horizon/js/horizon.quota.js rename to openstack_dashboard/static/js/horizon.quota.js diff --git a/horizon/static/horizon/js/horizon.volumes.js b/openstack_dashboard/static/js/horizon.volumes.js similarity index 100% rename from horizon/static/horizon/js/horizon.volumes.js rename to openstack_dashboard/static/js/horizon.volumes.js diff --git a/openstack_dashboard/templates/horizon/_scripts.html b/openstack_dashboard/templates/horizon/_scripts.html index 56dc0981e2..6aa0a6e635 100644 --- a/openstack_dashboard/templates/horizon/_scripts.html +++ b/openstack_dashboard/templates/horizon/_scripts.html @@ -24,7 +24,6 @@ - {% endif %} - - - - - - - + + + + + + + + {% for file in HORIZON_CONFIG.js_files %}