Gemfile and bugs in js for orbit-bar
This commit is contained in:
		
							parent
							
								
									55ae7de01c
								
							
						
					
					
						commit
						1f7dae9bee
					
				| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,28 @@
 | 
			
		|||
<div>
 | 
			
		||||
<%= post_frontend.title %><br />
 | 
			
		||||
<p>
 | 
			
		||||
<ul class="post_list">
 | 
			
		||||
	<li>
 | 
			
		||||
		<h2 class="h2 in_heading"><%= post_frontend.title %></h2>
 | 
			
		||||
		<div class="post_content">
 | 
			
		||||
			<%= truncate(post_frontend.body,:length=>25) %>
 | 
			
		||||
	<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend) %>
 | 
			
		||||
</p>
 | 
			
		||||
</div>
 | 
			
		||||
		</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>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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 %>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue