summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur Sufiev <tsufiev@mirantis.com>2015-07-22 12:51:41 +0300
committerTimur Sufiev <tsufiev@mirantis.com>2015-07-22 12:51:52 +0300
commite17565a7086f8bb8900f034b260ee98d9b2e917b (patch)
treeb09a100e0d6d9cf95aed8a6ea9dd620f165064ea
parentd82d48453f0b31e565ad4f8a9e074ff327e15d45 (diff)
Change location of symlink to bower_components
Do so in order to use both js and css assets fetched with bower. Change-Id: Id4a8fa8dc3cd0915b33ead24421c14155897939e
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Timur Sufiev <tsufiev@mirantis.com> Workflow+1: Timur Sufiev <tsufiev@mirantis.com> Submitted-by: Jenkins Submitted-at: Thu, 23 Jul 2015 07:56:27 +0000 Reviewed-on: https://review.openstack.org/204528 Project: stackforge/merlin Branch: refs/heads/master
-rw-r--r--.eslintignore2
-rw-r--r--extensions/mistral/templates/mistral/create.html4
-rw-r--r--karma-unit.conf.js4
l---------merlin/static/merlin/js/libs1
l---------merlin/static/merlin/libs1
5 files changed, 6 insertions, 6 deletions
diff --git a/.eslintignore b/.eslintignore
index fe813c6..b36fc47 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,2 @@
1merlin/static/merlin/js/libs 1merlin/static/merlin/libs
2merlin/static/merlin/js/custom-libs \ No newline at end of file 2merlin/static/merlin/js/custom-libs \ No newline at end of file
diff --git a/extensions/mistral/templates/mistral/create.html b/extensions/mistral/templates/mistral/create.html
index 27be743..7033859 100644
--- a/extensions/mistral/templates/mistral/create.html
+++ b/extensions/mistral/templates/mistral/create.html
@@ -12,8 +12,8 @@
12{% block js %} 12{% block js %}
13{% include "horizon/_scripts.html" %} 13{% include "horizon/_scripts.html" %}
14<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/custom-libs/barricade.js"></script> 14<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/custom-libs/barricade.js"></script>
15<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/js-yaml/dist/js-yaml.min.js"></script> 15<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/js-yaml/dist/js-yaml.min.js"></script>
16<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/underscore/underscore-min.js"></script> 16<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/underscore/underscore-min.js"></script>
17<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script> 17<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script>
18<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.templates.js"></script> 18<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.templates.js"></script>
19<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.filters.js"></script> 19<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.filters.js"></script>
diff --git a/karma-unit.conf.js b/karma-unit.conf.js
index ae9e6ba..7afe2f0 100644
--- a/karma-unit.conf.js
+++ b/karma-unit.conf.js
@@ -40,8 +40,8 @@ module.exports = function (config) {
40 'bower_components/jquery/dist/jquery.min.js', 40 'bower_components/jquery/dist/jquery.min.js',
41 'bower_components/angular/angular.js', 41 'bower_components/angular/angular.js',
42 'bower_components/angular-mocks/angular-mocks.js', 42 'bower_components/angular-mocks/angular-mocks.js',
43 'merlin/static/merlin/js/libs/underscore/underscore-min.js', 43 'merlin/static/merlin/libs/underscore/underscore-min.js',
44 'merlin/static/merlin/js/libs/js-yaml/dist/js-yaml.min.js', 44 'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js',
45 'merlin/static/merlin/js/custom-libs/barricade.js', 45 'merlin/static/merlin/js/custom-libs/barricade.js',
46 'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js', 46 'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js',
47 // explicitly require first module definition file to avoid errors 47 // explicitly require first module definition file to avoid errors
diff --git a/merlin/static/merlin/js/libs b/merlin/static/merlin/js/libs
deleted file mode 120000
index ad5885d..0000000
--- a/merlin/static/merlin/js/libs
+++ /dev/null
@@ -1 +0,0 @@
1../../../../bower_components/ \ No newline at end of file
diff --git a/merlin/static/merlin/libs b/merlin/static/merlin/libs
new file mode 120000
index 0000000..403e0bd
--- /dev/null
+++ b/merlin/static/merlin/libs
@@ -0,0 +1 @@
../../../bower_components/ \ No newline at end of file