From 1f7dae9bee24d897169fb93a7d32423b5ee43689 Mon Sep 17 00:00:00 2001 From: Christophe Vilayphiou Date: Mon, 13 Feb 2012 13:28:42 +0800 Subject: [PATCH] Gemfile and bugs in js for orbit-bar --- Gemfile.lock | 4 +++ app/views/layouts/_orbit_bar.html.erb | 8 +++-- .../front_end/posts/_post_frontend.html.erb | 35 +++++++++++++++---- .../new_blog/front_end/posts/index.html.erb | 4 ++- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ce0d8d6d..d67f72e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -82,6 +82,7 @@ GEM actionpack (>= 3.0.0) activesupport (>= 3.0.0) railties (>= 3.0.0) + libv8 (3.3.10.4) linecache19 (0.5.12) ruby_core_source (>= 0.1.4) mail (2.3.0) @@ -177,6 +178,8 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) subexec (0.2.1) + therubyracer (0.9.9) + libv8 (~> 3.3.10) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) @@ -231,5 +234,6 @@ DEPENDENCIES sinatra spork sprockets + therubyracer uglifier watchr diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index d42ab819..d6e5217e 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -1,6 +1,8 @@ - - - +<% if controller.controller_name.eql?('pages') %> + + + +<% end %>