From ff93a626857711ffd88863f45accfe35c7fdec5f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 26 Nov 2014 11:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E7=AB=9E=E8=B5=9Blayout=E4=B8=AD=E4=B8=BB=E9=A1=B5=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E3=80=82=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_contest.html.erb | 124 ++++++++++++++++-------- app/views/layouts/base_courses.html.erb | 18 ++-- 2 files changed, 95 insertions(+), 47 deletions(-) diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index cf8b7d475..6e980957b 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -29,8 +29,16 @@
- - + + - - +
<%=l(:label_contest_innovate_community)%><%= l(:label_user_location) %> : + + <%=l(:label_contest_innovate_community)%> + + + + <%= l(:label_user_location) %> : + +
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> @@ -43,9 +51,13 @@
<%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %><%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > - <%= link_to @bid.name, bid_path %> + <%=link_to l(:field_homepage), home_path %> > + <%= l(:label_contest_innovate)%> > + + <%= link_to @bid.name, bid_path %> + +
@@ -58,27 +70,29 @@ <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> - + - - - - - <% if User.current.login? %> - - + <% if User.current.login? %> + + + + <% end %> +
<%= h @bid.name %>
- - <%= join_in_contest(@bid, User.current)%> - - - - <%= watcher_link(@bid, User.current) %> - + + + - - <% end %> -
+ <%= h @bid.name %>
- +
+ + <%= join_in_contest(@bid, User.current)%> + + + + <%= watcher_link(@bid, User.current) %> + +
+ <% if User.current.logged? %> <% if @bid.author.id == User.current.id %> <%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %> @@ -100,8 +114,12 @@ :action => 'show_project' %> - <%= l(:label_participator) %> - <%= l(:label_bidding_project) %> + + <%= l(:label_participator) %> + + + <%= l(:label_bidding_project) %> +
@@ -110,14 +128,22 @@
- - - - - + - + + + +
<%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%>
<%= l(:label_bids_reward_method) %><%= @bid.budget%> + <%= l(:lable_contest_user) %> + <%= link_to(@user.name, user_path(@user))%> +
<%= l(:label_limit_time) %> : <%= @bid.deadline%> + <%= l(:label_bids_reward_method) %> + <%= @bid.budget%> +
+ <%= l(:label_limit_time) %> : + <%= @bid.deadline%> +
@@ -130,7 +156,6 @@
<% if @bid.description.size>0 %>
- <%= textilizable @bid.description %>
<% else %> @@ -139,7 +164,10 @@
<% end %>
- <%= l(:label_create_time) %>：<%= format_time(@bid.created_on) %> + + <%= l(:label_create_time) %>： + + <%= format_time(@bid.created_on) %>
@@ -158,9 +186,13 @@
- <%= l(:label_x_followers, :count => @bid.watcher_users.count) %> + + <%= l(:label_x_followers, :count => @bid.watcher_users.count) %> + <% if show_more_fans?(@bid) %> - <%= link_to l(:label_more), :controller => 'bids', :action => 'show_bid_user'%> + + <%= link_to l(:label_more), :controller => 'bids', :action => 'show_bid_user'%> + <% end %>
@@ -177,9 +209,13 @@
- <%= l(:label_bidding_project) %> + + <%= l(:label_bidding_project) %> + <% if show_more_bid_project?(@bid) %> - <%= link_to l(:label_more), :controller => 'bids', :action => 'show_project'%> + + <%= link_to l(:label_more), :controller => 'bids', :action => 'show_project'%> + <% end %>
@@ -200,7 +236,9 @@
- <%= l(:label_x_join_in_contest, :count => @bid.join_in_contests.count) %> + + <%= l(:label_x_join_in_contest, :count => @bid.join_in_contests.count) %> + <% if show_more_participate?(@bid) %> <%= link_to l(:label_more), :controller => "bids", :action => "show_participator"%> @@ -210,7 +248,9 @@
- +
<%= show_participate_picture(@bid) %> + <%= show_participate_picture(@bid) %> +
@@ -234,7 +274,9 @@
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 6de46d2fe..beb3291d0 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -34,7 +34,11 @@
- + - +
高校课程实践社区 + + 高校课程实践社区 + + <%= l(:label_user_location) %> : @@ -50,14 +54,16 @@
- <%= link_to request.host()+"/course", :controller => 'courses', :action => 'index' %> -

<%= link_to "主页", home_path %> - > <%=l(:label_courses_management_platform)%> - > <%= link_to @course.name, nil %> + > + + <%=l(:label_courses_management_platform)%> + + > + <%= link_to @course.name, nil %>