From e17565a7086f8bb8900f034b260ee98d9b2e917b Mon Sep 17 00:00:00 2001
From: Timur Sufiev <tsufiev@mirantis.com>
Date: Wed, 22 Jul 2015 12:51:41 +0300
Subject: [PATCH] Change location of symlink to bower_components

Do so in order to use both js and css assets fetched with bower.

Change-Id: Id4a8fa8dc3cd0915b33ead24421c14155897939e
---
 .eslintignore                                    | 2 +-
 extensions/mistral/templates/mistral/create.html | 4 ++--
 karma-unit.conf.js                               | 4 ++--
 merlin/static/merlin/js/libs                     | 1 -
 merlin/static/merlin/libs                        | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 120000 merlin/static/merlin/js/libs
 create mode 120000 merlin/static/merlin/libs

diff --git a/.eslintignore b/.eslintignore
index fe813c6..b36fc47 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1,2 @@
-merlin/static/merlin/js/libs
+merlin/static/merlin/libs
 merlin/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 @@
 {% block js %}
 {% include "horizon/_scripts.html" %}
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/custom-libs/barricade.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/js-yaml/dist/js-yaml.min.js"></script>
-<script type="text/javascript" src="{{ STATIC_URL }}merlin/js/libs/underscore/underscore-min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/js-yaml/dist/js-yaml.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}merlin/libs/underscore/underscore-min.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.init.js"></script>
 <script type="text/javascript" src="{{ STATIC_URL }}merlin/js/merlin.templates.js"></script>
 <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) {
       'bower_components/jquery/dist/jquery.min.js',
       'bower_components/angular/angular.js',
       'bower_components/angular-mocks/angular-mocks.js',
-      'merlin/static/merlin/js/libs/underscore/underscore-min.js',
-      'merlin/static/merlin/js/libs/js-yaml/dist/js-yaml.min.js',
+      'merlin/static/merlin/libs/underscore/underscore-min.js',
+      'merlin/static/merlin/libs/js-yaml/dist/js-yaml.min.js',
       'merlin/static/merlin/js/custom-libs/barricade.js',
       'merlin/static/merlin/js/custom-libs/ui-bootstrap-tpls-0.12.1.js',
       // 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 @@
-../../../../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