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

Final modifications for the presentation

This commit is contained in:
chris2tof 2011-11-22 18:54:10 +08:00
parent 1fcacbb4af
commit b68f5e11e5
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/admin.css.erb
View File

@ -324,7 +324,7 @@ p{
float:left; float:left;
margin: 0 10px 0 0; margin: 0 10px 0 0;
} }
.buy_btn a{ .main table td .buy_btn a{
background: url("/assets/buy_btn.png") no-repeat scroll 0 0 transparent; background: url("/assets/buy_btn.png") no-repeat scroll 0 0 transparent;
color: #000000; color: #000000;
display: block; display: block;
@ -335,6 +335,7 @@ p{
text-decoration: none; text-decoration: none;
text-shadow: 0 1px 0 #FFFFFF; text-shadow: 0 1px 0 #FFFFFF;
width: 170px; width: 170px;
padding: 0px;
} }
.buy_btn a:hover{ .buy_btn a:hover{
background-position:0 bottom; background-position:0 bottom;

2
app/views/admin/users/_form.html.erb
View File

@ -7,7 +7,7 @@
<%#= file_field_tag 'file' %> <%#= file_field_tag 'file' %>
<%#= hidden_field_tag :avatar_cache %> <%#= hidden_field_tag :avatar_cache %>
<a id="upload" href="#"><%= t('admin.choose_file') %></a> <a id="upload" href="#"><%= t('admin.choose_file') %></a>
<%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => t('admin.email'), :class => 'user_mail' %> <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
<label> <label>
<%= f.check_box :admin %><span><%= t('admin.admin') %></span> <%= f.check_box :admin %><span><%= t('admin.admin') %></span>
</label> </label>

3
lib/parser.rb
View File

@ -192,7 +192,8 @@ module Parser
page.design.javascripts.each do |js| page.design.javascripts.each do |js|
res << "<script type='text/javascript' src='#{js.file.url}'></script>" res << "<script type='text/javascript' src='#{js.file.url}'></script>"
end end
res << "<script type='text/javascript' src='/static/jquery.js'></script>"
res << "<script type='text/javascript' src='/static/kernel.js'></script>"
res res
end end
c.define_tag 'layout_part' do |tag| c.define_tag 'layout_part' do |tag|

3
lib/tasks/site.rake
View File

@ -5,8 +5,9 @@ namespace :site do
task :build => :environment do task :build => :environment do
Site.delete_all Site.delete_all
Purchase.delete_all
Site.create( :school => 'The Best School', :department => 'Awesome', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) Site.create( :school => 'RulingDigital University', :department => 'Computer Science', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ])
end end