---
aeolus-conductor.spec.in | 4 +++-
src/app/views/layouts/application.html.haml | 2 ++
src/public/javascripts/lib/converge-ui | 1 +
3 files changed, 6 insertions(+), 1 deletions(-)
create mode 120000 src/public/javascripts/lib/converge-ui
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index affb48c..79511a1 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -214,7 +214,8 @@ js="public/javascripts \
public/javascripts/jquery.ui-1.8.1 \
public/javascripts/jquery.ui-1.8.1/ui/minified \
public/javascripts/lib \
- public/javascripts/backbone"
+ public/javascripts/backbone \
+ vendor/converge-ui/javascripts/lib"
json="spec/fixtures"
key="features/upload_files"
opts="spec"
@@ -333,6 +334,7 @@ popd 2>&1 > /dev/null
%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/layouts
%{app_root}/app/views/layouts/converge-ui
%{__ln_s} -f %{app_root}/vendor/converge-ui/fonts %{app_root}/public/fonts/converge-ui
%{__ln_s} -f %{app_root}/vendor/converge-ui/rails/helpers/layout_helper.rb
%{app_root}/app/helpers/layout_helper.rb
+%{__ln_s} -f %{app_root}/vendor/converge-ui/javascripts/lib
%{app_root}/public/javascripts/lib/converge-ui
%postun
# kind of a weird construct. There are two cases where postun gets called;
diff --git a/src/app/views/layouts/application.html.haml
b/src/app/views/layouts/application.html.haml
index 2e66958..b445503 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -32,6 +32,8 @@
= javascript_include_tag "backbone/routers.js"
= javascript_include_tag "rails.js"
= javascript_include_tag "lib/modernizr-custom.js"
+ = javascript_include_tag
"lib/converge-ui/jquery/plugins/flot-0.7/jquery.flot.js"
+ = javascript_include_tag
"lib/converge-ui/jquery/plugins/flot-0.7/excanvas.js"
= content_for :logo do
= link_to(image_tag('upstream-logo.png'), root_path)
diff --git a/src/public/javascripts/lib/converge-ui
b/src/public/javascripts/lib/converge-ui
new file mode 120000
index 0000000..3575a79
--- /dev/null
+++ b/src/public/javascripts/lib/converge-ui
@@ -0,0 +1 @@
+../../../vendor/converge-ui/javascripts/lib
\ No newline at end of file
--
1.7.6.5