Ika's changes in modules
This commit is contained in:
Christophe Vilayphiou
Christophe Vilayphiou
parent
7d57b50e46
commit
cf038183b9
1
Gemfile
1
Gemfile
|
|
@ -19,6 +19,7 @@ gem 'ruby-debug19'
|
|||
gem 'rubyzip'
|
||||
gem 'sinatra'
|
||||
gem 'sprockets'
|
||||
gem 'therubyracer' # For linux
|
||||
gem 'tinymce-rails'
|
||||
|
||||
# Gems used only for assets and not required
|
||||
|
|
|
|||
|
|
@ -79,6 +79,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)
|
||||
|
|
@ -174,6 +175,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)
|
||||
tinymce-rails (3.4.8)
|
||||
|
|
@ -229,6 +232,7 @@ DEPENDENCIES
|
|||
sinatra
|
||||
spork
|
||||
sprockets
|
||||
therubyracer
|
||||
tinymce-rails
|
||||
uglifier
|
||||
watchr
|
||||
|
|
|
|||
|
|
@ -24,14 +24,17 @@
|
|||
text-shadow: 0 -1px 0 #000000;
|
||||
}
|
||||
#back_sidebar .list {
|
||||
background:url(<%= asset_path "line.png" %>) repeat-x left bottom;
|
||||
color:#fff;
|
||||
font-size:12px;
|
||||
background:url(<%= asset_path "line.png" %>) repeat-x left bottom;
|
||||
margin:0;
|
||||
padding:0;
|
||||
}
|
||||
#back_sidebar .list li {
|
||||
background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top;
|
||||
border-top:1px solid #424344;
|
||||
border-bottom:1px solid #000000;
|
||||
list-style:none;
|
||||
}
|
||||
#back_sidebar .list li:hover {
|
||||
background-position:left bottom;
|
||||
|
|
@ -53,6 +56,12 @@
|
|||
background-position:left bottom;
|
||||
color:#eeeeee;
|
||||
}
|
||||
#back_sidebar .list li ul{
|
||||
padding:0 0 0 15px;
|
||||
}
|
||||
#back_sidebar .list li ul ul{
|
||||
padding:0;
|
||||
}
|
||||
#back_sidebar .users .list .set_1 {
|
||||
background-position:left bottom;
|
||||
border-top:1px solid #406cc3;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class Design
|
|||
validates_presence_of :title
|
||||
validates_presence_of :author
|
||||
|
||||
# after_save :parse_css_for_images
|
||||
after_save :parse_css_for_images
|
||||
|
||||
def new_files=(*attrs)
|
||||
attrs[0].map do |key,items_ary| #Loop by JSs,Themes,Imgs
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
<%= paginate @bulletins %>
|
||||
|
||||
<h1><%= t('bulletin.list_announcement') %></h1>
|
||||
<h1 class="h1"><%= t('bulletin.list_announcement') %></h1>
|
||||
|
||||
|
||||
<table>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th><%= t('bulletin.postdate') %></th>
|
||||
<th><%= t('bulletin.category') %></th>
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
<% if @bulletins and !@bulletins.nil? %>
|
||||
|
||||
<h2 class="topic_title"><%= t('焦點新聞')%></h2>
|
||||
<%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
|
||||
<div class="topic_prev">previous page</div>
|
||||
<div class="topic_next">next page</div>
|
||||
<ul>
|
||||
<h2 class="topic_title"><%= t('焦點新聞')%></h2>
|
||||
<%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
|
||||
<div class="topic_prev">previous page</div>
|
||||
<div class="topic_next">next page</div>
|
||||
<ul id="topic_list">
|
||||
<% @bulletins.each do |post| %>
|
||||
<li>
|
||||
<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<p class="news_wrap"><%= post.subtitle[I18n.locale] %></p>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</ul>
|
||||
|
||||
<% end %>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
<ul class="post_list">
|
||||
<ul class="post_list1">
|
||||
<li>
|
||||
<h2 class="h2 in_heading"><%= post_frontend.title %></h2>
|
||||
<div class="post_content">
|
||||
<%= truncate(post_frontend.body,:length=>25) %>
|
||||
<div class="post_title">
|
||||
<h4 class="h4"><%=link_to post_frontend.title,panel_new_blog_front_end_post_path(post_frontend) %></h2>
|
||||
</div>
|
||||
<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %>
|
||||
<div class="post_content" style="margin:0 0 10px;">
|
||||
<%= truncate(post_frontend.body,:length=>100) %>
|
||||
</div>
|
||||
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<div class="clear" style="height:20px;"></div>
|
||||
|
||||
<table class="table table-bordered">
|
||||
|
|
@ -20,9 +21,9 @@
|
|||
</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>
|
||||
<td width="30%"><%= post_frontend.title %></td>
|
||||
<td width="55%"><%= truncate(post_frontend.body,:length=>100) %></td>
|
||||
<td width="15%"><%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -6,8 +6,9 @@
|
|||
|
||||
<%= flash_messages %>
|
||||
|
||||
<h1 class="h1 ini_heading"><%= t('blog.front_end_index') %></h1>
|
||||
|
||||
<%= render :partial => "post_frontend", :collection => @posts %>
|
||||
<h1 class="h1"><%= t('blog.front_end_index') %></h1>
|
||||
|
||||
<div class="style1">
|
||||
<%= render :partial => "post_frontend", :collection => @posts %>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue