developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ika's changes in modules

This commit is contained in:
Christophe Vilayphiou 2012-02-19 17:43:47 +08:00
parent 9cd3cbc478
commit 434e464f17
11 changed files with 3482 additions and 3469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -19,6 +19,7 @@ gem 'ruby-debug19'
gem 'rubyzip' gem 'rubyzip'
gem 'sinatra' gem 'sinatra'
gem 'sprockets' gem 'sprockets'
gem 'therubyracer' # For linux
gem 'tinymce-rails' gem 'tinymce-rails'
# Gems used only for assets and not required # Gems used only for assets and not required

4
Gemfile.lock
View File

@ -79,6 +79,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)
@ -174,6 +175,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)
tinymce-rails (3.4.8) tinymce-rails (3.4.8)
@ -229,6 +232,7 @@ DEPENDENCIES
sinatra sinatra
spork spork
sprockets sprockets
therubyracer
tinymce-rails tinymce-rails
uglifier uglifier
watchr watchr

12
app/assets/stylesheets/bootstrap.css.erb
View File

@ -96,7 +96,7 @@ textarea {
} }
body { body {
margin: 0; margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
@ -275,7 +275,7 @@ a:hover {
} }
p { p {
margin: 0 0 9px; margin: 0 0 9px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
} }
@ -357,7 +357,7 @@ h6 {
} }
ul, ol { ul, ol {
padding: 0; padding: 0;
margin: 0 0 9px 25px; margin: 0;
} }
ul ul, ul ul,
ul ol, ul ol,
@ -366,13 +366,11 @@ ol ul {
margin-bottom: 0; margin-bottom: 0;
} }
ul { ul {
list-style: disc;
} }
ol { ol {
list-style: decimal; list-style: decimal;
} }
li { li {
line-height: 18px;
} }
ul.unstyled { ul.unstyled {
margin-left: 0; margin-left: 0;
@ -520,7 +518,7 @@ input,
button, button,
select, select,
textarea { textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
@ -2459,7 +2457,7 @@ button.btn.small, input[type="submit"].btn.small {
} }
.navbar-search .search-query { .navbar-search .search-query {
padding: 4px 9px; padding: 4px 9px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;

11
app/assets/stylesheets/sidebar.css.erb
View File

@ -24,14 +24,17 @@
text-shadow: 0 -1px 0 #000000; text-shadow: 0 -1px 0 #000000;
} }
#back_sidebar .list { #back_sidebar .list {
background:url(<%= asset_path "line.png" %>) repeat-x left bottom;
color:#fff; color:#fff;
font-size:12px; font-size:12px;
background:url(<%= asset_path "line.png" %>) repeat-x left bottom; margin:0;
padding:0;
} }
#back_sidebar .list li { #back_sidebar .list li {
background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top; background:url(<%= asset_path "sidebar_li.jpg" %>) repeat-x left top;
border-top:1px solid #424344; border-top:1px solid #424344;
border-bottom:1px solid #000000; border-bottom:1px solid #000000;
list-style:none;
} }
#back_sidebar .list li:hover { #back_sidebar .list li:hover {
background-position:left bottom; background-position:left bottom;
@ -53,6 +56,12 @@
background-position:left bottom; background-position:left bottom;
color:#eeeeee; 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 { #back_sidebar .users .list .set_1 {
background-position:left bottom; background-position:left bottom;
border-top:1px solid #406cc3; border-top:1px solid #406cc3;

1
app/controllers/admin/pages_controller.rb
View File

@ -32,6 +32,7 @@ class Admin::PagesController < ApplicationController
@i18n_variable = @item.i18n_variable @i18n_variable = @item.i18n_variable
@designs = Design.all.entries @designs = Design.all.entries
@design = @item.design @design = @item.design
@default_design = Design.first
@app_frontend_urls = @item.module_app.app_pages if @item.module_app @app_frontend_urls = @item.module_app.app_pages if @item.module_app
end end

2
app/models/design/design.rb
View File

@ -20,7 +20,7 @@ class Design
validates_presence_of :title validates_presence_of :title
validates_presence_of :author validates_presence_of :author
# after_save :parse_css_for_images after_save :parse_css_for_images
def new_files=(*attrs) def new_files=(*attrs)
attrs[0].map do |key,items_ary| #Loop by JSs,Themes,Imgs attrs[0].map do |key,items_ary| #Loop by JSs,Themes,Imgs

4
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb vendored
View File

@ -4,10 +4,10 @@
<%= paginate @bulletins %> <%= paginate @bulletins %>
<h1><%= t('bulletin.list_announcement') %></h1> <h1 class="h1"><%= t('bulletin.list_announcement') %></h1>
<table> <table class="table table-bordered">
<tr> <tr>
<th><%= t('bulletin.postdate') %></th> <th><%= t('bulletin.postdate') %></th>
<th><%= t('bulletin.category') %></th> <th><%= t('bulletin.category') %></th>

8
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/index.html.erb vendored
View File

@ -2,11 +2,11 @@
<% if @bulletins and !@bulletins.nil? %> <% if @bulletins and !@bulletins.nil? %>
<div class="topic_news">
<div class="topic_news2">
<h2 class="topic_title"><%= t('焦點新聞')%></h2> <h2 class="topic_title"><%= t('焦點新聞')%></h2>
<%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %> <%= link_to "more+",panel_announcement_front_end_bulletins_path(), :class => "topic_note" %>
<ul> <div class="topic_prev">previous page</div>
<div class="topic_next">next page</div>
<ul id="topic_list">
<% @bulletins.each do |post| %> <% @bulletins.each do |post| %>
<li> <li>
<div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div> <div class="news_img"><%= image_tag(post.image.url, :size => "290x130") if post.image.file %></div>
@ -15,8 +15,6 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
</div>
</div>
<% end %> <% end %>

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

@ -1,13 +1,14 @@
<ul class="post_list"> <ul class="post_list1">
<li> <li>
<h2 class="h2 in_heading"><%= post_frontend.title %></h2> <div class="post_title">
<div class="post_content"> <h4 class="h4"><%=link_to post_frontend.title,panel_new_blog_front_end_post_path(post_frontend) %></h2>
<%= truncate(post_frontend.body,:length=>25) %>
</div> </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> </li>
</ul> </ul>
<div class="clear" style="height:20px;"></div> <div class="clear" style="height:20px;"></div>
<table class="table table-bordered"> <table class="table table-bordered">
@ -20,9 +21,9 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<th><%= post_frontend.title %></td> <td width="30%"><%= post_frontend.title %></td>
<td><%= truncate(post_frontend.body,:length=>25) %></td> <td width="55%"><%= truncate(post_frontend.body,:length=>100) %></td>
<td><%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %></td> <td width="15%"><%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend), :class => 'btn' %></td>
</tr> </tr>
</tbody> </tbody>
</ul> </ul>

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

@ -6,8 +6,9 @@
<%= flash_messages %> <%= flash_messages %>
<h1 class="h1 ini_heading"><%= t('blog.front_end_index') %></h1> <h1 class="h1"><%= t('blog.front_end_index') %></h1>
<div class="style1">
<%= render :partial => "post_frontend", :collection => @posts %> <%= render :partial => "post_frontend", :collection => @posts %>
</div>