From 3f9a041d442b3e8d0757d05de690f83c9d6ebd66 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris@rulingcom.com>
Date: Mon, 13 Feb 2012 13:28:42 +0800
Subject: [PATCH] Gemfile and bugs in js for orbit-bar

---
 Gemfile                                       |  3 +-
 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 ++-
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index 408151ead..003d7da9f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,8 +20,7 @@ gem 'ruby-debug19'
 gem 'rubyzip'
 gem 'sinatra'
 gem 'sprockets'
-#gem 'therubyracer' # For linux
-#gem 'libv8', '3.3.10.4'
+gem 'therubyracer' # For linux
 
 # Gems used only for assets and not required
 # in production environments by default.
diff --git a/Gemfile.lock b/Gemfile.lock
index ce0d8d6df..d67f72e51 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 d42ab8195..d6e5217ef 100644
--- a/app/views/layouts/_orbit_bar.html.erb
+++ b/app/views/layouts/_orbit_bar.html.erb
@@ -1,6 +1,8 @@
-<link href='assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>
-<link href='assets/style.css.erb' rel='stylesheet' type='text/css'/>
-<script type='text/javascript' src='assets/bootstrap.js'></script>
+<% if controller.controller_name.eql?('pages') %>
+	<link href='/assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>
+	<link href='/assets/style.css.erb' rel='stylesheet' type='text/css'/>
+	<script type='text/javascript' src='/assets/bootstrap.js'></script>
+<% end %>
 
 <header id="orbit-bar" class="navbar">
 	<div class="navbar-inner">
diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb
index 34e5a7d76..0ad677bfd 100644
--- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb
+++ b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb
@@ -1,7 +1,28 @@
-<div>
-<%= post_frontend.title %><br />
-<p>
-	<%= truncate(post_frontend.body,:length=>25) %>
-	<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend) %>
-</p>
-</div>
+<ul class="post_list">
+	<li>
+		<h2 class="h2 in_heading"><%= post_frontend.title %></h2>
+		<div class="post_content">
+			<%= truncate(post_frontend.body,:length=>25) %>
+		</div>
+		<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %>
+	</li>
+</ul>
+
+<div class="clear" style="height:20px;"></div>
+
+<table class="table table-bordered">
+<thead>
+	<tr>
+		<th>Title</th>
+		<th>Content</th>
+		<th>Link</th>
+	</tr>
+</thead>
+<tbody>
+	<tr>
+		<th><%= post_frontend.title %></td>
+		<td><%= truncate(post_frontend.body,:length=>25) %></td>
+		<td><%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %></td>
+	</tr>
+</tbody>
+</ul>
diff --git a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb
index 27f494c04..27cc5ca46 100644
--- a/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb
+++ b/vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb
@@ -6,6 +6,8 @@
 
 <%= flash_messages %>
 
-<h1><%= t('blog.front_end_index') %></h1>
+<h1 class="h1 ini_heading"><%= t('blog.front_end_index') %></h1>
 
 <%= render :partial => "post_frontend", :collection => @posts %>
+
+