openstack/horizon
Code Issues Proposed changes

Move js files into openstack_dashboard folder.

Browse Source 
hozoin doc says that the horizon directory holds the generic
libraries and components that can be used in any Django project.

So, this patch move js files related with Openstack components into
openstack_dashboard folder.

Change-Id: Ib4ed05e1136ee3f70a201139e456d4c3b93519f3
Closes-bug: #1635519
This commit is contained in:
Kenji Ishii 2016-10-21 14:38:03 +09:00
parent 9524bb14eb
commit 295175826b
12 changed files with 43 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
View File

@ -10,7 +10,7 @@
<script src='{{ STATIC_URL }}horizon/lib/termjs/term.js'></script> <script src='{{ STATIC_URL }}horizon/lib/termjs/term.js'></script>
<script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.js"></script> <script src="{{ STATIC_URL }}horizon/lib/jquery/jquery.js"></script>
<script src="{{ STATIC_URL }}horizon/lib/angular/angular.js"></script> <script src="{{ STATIC_URL }}horizon/lib/angular/angular.js"></script>
<script src="{{ STATIC_URL }}horizon/js/angular/directives/serialConsole.js"></script> <script src="{{ STATIC_URL }}js/angular/directives/serialConsole.js"></script>
</head> </head>
<body ng-app='serialConsoleApp'> <body ng-app='serialConsoleApp'>

34
openstack_dashboard/static/js/.eslintrc Normal file
View File

@ -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

0
horizon/static/horizon/js/angular/directives/serialConsole.js → openstack_dashboard/static/js/angular/directives/serialConsole.js vendored
View File

0
horizon/static/horizon/js/horizon.firewalls.js → openstack_dashboard/static/js/horizon.firewalls.js
View File

0
horizon/static/horizon/js/horizon.flatnetworktopology.js → openstack_dashboard/static/js/horizon.flatnetworktopology.js
View File

0
horizon/static/horizon/js/horizon.instances.js → openstack_dashboard/static/js/horizon.instances.js
View File

0
horizon/static/horizon/js/horizon.metering.js → openstack_dashboard/static/js/horizon.metering.js
View File

0
horizon/static/horizon/js/horizon.networktopology.js → openstack_dashboard/static/js/horizon.networktopology.js
View File

0
horizon/static/horizon/js/horizon.networktopologycommon.js → openstack_dashboard/static/js/horizon.networktopologycommon.js
View File

0
horizon/static/horizon/js/horizon.quota.js → openstack_dashboard/static/js/horizon.quota.js
View File

0
horizon/static/horizon/js/horizon.volumes.js → openstack_dashboard/static/js/horizon.volumes.js
View File

16
openstack_dashboard/templates/horizon/_scripts.html
View File

@ -24,7 +24,6 @@
<script src='{{ STATIC_URL }}horizon/js/horizon.datepickers.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.datepickers.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.forms.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.forms.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.formset_table.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.formset_table.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.instances.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.messages.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.messages.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.modals.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.modals.js'></script>
<script type="text/javascript"> <script type="text/javascript">
@ -33,24 +32,25 @@
{% if HORIZON_CONFIG.integration_tests_support %} {% if HORIZON_CONFIG.integration_tests_support %}
<script src='{{ STATIC_URL }}horizon/js/horizon.selenium.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.selenium.js'></script>
{% endif %} {% endif %}
<script src='{{ STATIC_URL }}horizon/js/horizon.quota.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.tables.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.tables.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.tables_inline_edit.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.tables_inline_edit.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.tabs.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.tabs.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.templates.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.templates.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.users.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.users.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.membership.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.membership.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.metering.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.networktopologycommon.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.flatnetworktopology.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.networktopology.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.d3piechart.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.d3piechart.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.heattop.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.heattop.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.d3linechart.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.d3linechart.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.d3barchart.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.d3barchart.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.firewalls.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.volumes.js'></script>
<script src='{{ STATIC_URL }}horizon/js/horizon.sidebar.js'></script> <script src='{{ STATIC_URL }}horizon/js/horizon.sidebar.js'></script>
<script src='{{ STATIC_URL }}js/horizon.instances.js'></script>
<script src='{{ STATIC_URL }}js/horizon.quota.js'></script>
<script src='{{ STATIC_URL }}js/horizon.metering.js'></script>
<script src='{{ STATIC_URL }}js/horizon.networktopologycommon.js'></script>
<script src='{{ STATIC_URL }}js/horizon.flatnetworktopology.js'></script>
<script src='{{ STATIC_URL }}js/horizon.networktopology.js'></script>
<script src='{{ STATIC_URL }}js/horizon.firewalls.js'></script>
<script src='{{ STATIC_URL }}js/horizon.volumes.js'></script>
{% for file in HORIZON_CONFIG.js_files %} {% for file in HORIZON_CONFIG.js_files %}
<script src='{{ STATIC_URL }}{{ file }}'></script> <script src='{{ STATIC_URL }}{{ file }}'></script>