saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gemfile and bugs in js for orbit-bar

This commit is contained in:
Christophe Vilayphiou 2012-02-13 13:28:42 +08:00
parent 23796396e9
commit 3f9a041d44
5 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -20,8 +20,7 @@ gem 'ruby-debug19'
gem 'rubyzip' gem 'rubyzip'
gem 'sinatra' gem 'sinatra'
gem 'sprockets' gem 'sprockets'
#gem 'therubyracer' # For linux gem 'therubyracer' # For linux
#gem 'libv8', '3.3.10.4'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.

4
Gemfile.lock
View File

@ -82,6 +82,7 @@ GEM
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
railties (>= 3.0.0) railties (>= 3.0.0)
libv8 (3.3.10.4)
linecache19 (0.5.12) linecache19 (0.5.12)
ruby_core_source (>= 0.1.4) ruby_core_source (>= 0.1.4)
mail (2.3.0) mail (2.3.0)
@ -177,6 +178,8 @@ GEM
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
subexec (0.2.1) subexec (0.2.1)
therubyracer (0.9.9)
libv8 (~> 3.3.10)
thor (0.14.6) thor (0.14.6)
tilt (1.3.3) tilt (1.3.3)
treetop (1.4.10) treetop (1.4.10)
@ -231,5 +234,6 @@ DEPENDENCIES
sinatra sinatra
spork spork
sprockets sprockets
therubyracer
uglifier uglifier
watchr watchr

8
app/views/layouts/_orbit_bar.html.erb
View File

@ -1,6 +1,8 @@
<link href='assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/> <% if controller.controller_name.eql?('pages') %>
<link href='assets/style.css.erb' rel='stylesheet' type='text/css'/> <link href='/assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>
<script type='text/javascript' src='assets/bootstrap.js'></script> <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"> <header id="orbit-bar" class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">

33
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb vendored
View File

@ -1,7 +1,28 @@
<div> <ul class="post_list">
<%= post_frontend.title %><br /> <li>
<p> <h2 class="h2 in_heading"><%= post_frontend.title %></h2>
<div class="post_content">
<%= truncate(post_frontend.body,:length=>25) %> <%= truncate(post_frontend.body,:length=>25) %>
<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend) %> </div>
</p> <%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %>
</div> </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>

4
vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb vendored
View File

@ -6,6 +6,8 @@
<%= flash_messages %> <%= 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 %> <%= render :partial => "post_frontend", :collection => @posts %>