From 1944cb5bcfaeeae38836e0afe3745c3198a1b440 Mon Sep 17 00:00:00 2001 From: baiyu Date: Fri, 22 Nov 2013 10:37:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E4=B8=BB=E9=A1=B5=E9=87=8C=E5=85=B3=E6=B3=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=202=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=AB=9E=E8=B5=9B=E9=87=8C=E9=87=8C?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=8F=82=E4=B8=8E=E8=80=85=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 4 ++ app/views/bids/show_participator.html.erb | 2 +- app/views/layouts/base_contest.html.erb | 46 +++++++++-------------- app/views/users/user_fanslist.html.erb | 2 +- app/views/users/user_watchlist.html.erb | 2 +- 5 files changed, 25 insertions(+), 31 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 730a10606..36a28e1b6 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -152,6 +152,10 @@ class Project < ActiveRecord::Base end } + def new_course + self.where('project_type = ?', 1) + end + # 项目留言 added by fq def self.add_jour(user, notes) diff --git a/app/views/bids/show_participator.html.erb b/app/views/bids/show_participator.html.erb index da62436b9..4a2bcab45 100644 --- a/app/views/bids/show_participator.html.erb +++ b/app/views/bids/show_participator.html.erb @@ -26,7 +26,7 @@ <% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> <% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_contribute_to, :count => memberships.count) %> - <% for member in user.memberships %> + <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> <% end %> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index c082013b9..4e96e56f4 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -55,7 +55,7 @@
- - - + - -
+ <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> @@ -63,50 +63,40 @@
<%= 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} %> <% end %> <% end %> -
- -
- + +
- - - - - - - - + + + - - - - - + +
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", :action => "show_participator" %><%=link_to "#{@bid.projects.count}", :controller => 'bids', :action => 'show_project' %>
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", + :action => "show_participator" %><%=link_to "#{@bid.projects.count}", :controller => 'bids', + :action => 'show_project' %>
<%= l(:label_participator) %> <%= l(:label_bidding_project) %> <%= l(:label_participator) %> <%= l(:label_bidding_project) %>
- +
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index fb3a3f310..bfdf29075 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -21,7 +21,7 @@ <% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> <% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_contribute_to, :count => memberships.count) %> - <% for member in user.memberships %> + <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> <% end %> diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb index e93cd2c01..31047e92b 100644 --- a/app/views/users/user_watchlist.html.erb +++ b/app/views/users/user_watchlist.html.erb @@ -16,7 +16,7 @@ <% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %> <% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_contribute_to, :count => memberships.count) %> - <% for member in user.memberships %> + <% for member in memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> <% end %>