From 08ba10c32d34ac3fd67b3cf31dbcd6548980c06c Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 18 Jun 2014 11:42:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=20=E5=B7=B2=E6=B7=BB=E5=8A=A0=E7=9A=84=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=EF=BC=9A=20=E5=AD=A6=E6=A0=A1=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E8=AF=BE=E7=A8=8B=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=90=8D=E7=A7=B0=20=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E4=B8=AD=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=EF=BC=9A=20?= =?UTF-8?q?=E5=8F=82=E8=B5=9B=E4=BA=BA=20=E7=AB=9E=E8=B5=9B=E4=B8=AD?= =?UTF-8?q?=E5=8F=82=E5=85=A5=E7=AB=9E=E8=B5=9Btab=E9=A1=B5=EF=BC=9A?= =?UTF-8?q?=E5=8F=82=E8=B5=9B=E4=BB=A3=E8=A1=A8=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E6=95=99=E5=B8=88=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=B6=85=E9=93=BE=E6=8E=A5=20?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E4=BD=9C=E4=B8=9A=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=B7=BB=E5=8A=A0=E8=B6=85=E9=93=BE=E6=8E=A5=20?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E4=BC=97=E5=8C=85=E9=A1=B5=E9=9D=A2=EF=BC=9A?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E4=BC=97=E5=8C=85=E5=90=8D=E7=A7=B0=20?= =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E4=BC=97=E5=8C=85=E9=A1=B5=E9=9D=A2=EF=BC=9A?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E6=A0=8F=E4=B8=8B=E5=A4=B4=E5=83=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=93=BE=E6=8E=A5=EF=BC=8C=E5=8F=82=E4=B8=8E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=8F=EF=BC=9A=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=20=E8=B4=B4=E5=90=A7=E5=B8=96=E5=AD=90?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=E5=8F=91=E5=B8=96=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E4=B8=8B=E6=96=B9=20=E2=80=9C=E7=94=B1xxx=E5=9C=A8XXX?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E6=B7=BB=E5=8A=A0=E2=80=9D=E4=B8=AD=E5=90=8D?= =?UTF-8?q?=E5=AD=90=E6=9C=AA=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/show.html.erb | 2 +- app/views/contests/_list_projects.html.erb | 3 ++- app/views/contests/show_attendingcontest.html.erb | 6 ++++-- app/views/layouts/base_bids.html.erb | 8 ++++---- app/views/layouts/base_homework.html.erb | 6 ++++-- app/views/memos/show.html.erb | 6 ++++-- app/views/welcome/course.html.erb | 4 ++-- 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 8b7e0d8ea..96ed4ea75 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -2,7 +2,7 @@
<%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%> -

<%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %>

+

<%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= link_to(@bid.name,respond_path(@bid)) %>

<% if @bid.reward_type.nil? or @bid.reward_type == 1%>

<%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %>  <%= l(:label_RMB_sign) %><%= @bid.budget %> diff --git a/app/views/contests/_list_projects.html.erb b/app/views/contests/_list_projects.html.erb index 48a5ed328..10086e5a3 100644 --- a/app/views/contests/_list_projects.html.erb +++ b/app/views/contests/_list_projects.html.erb @@ -76,7 +76,8 @@ <%= l(:label_contest_user) %> <% unless c_project.user.nil? %> - <%= c_project.user.lastname %><%= c_project.user.firstname %> + + <%= link_to c_project.user.lastname + c_project.user.firstname,user_path(c_project.user) %> <% end %> diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index 8a567bd53..d6f614db1 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -259,7 +259,8 @@ <%= l(:label_attendingcontest_time) %> ：<%= format_time c_project.created_at %> <%= l(:label_attendingcontest_spoksman) %> - ：<%= c_project.user.name %> + + ：<%= link_to c_project.user.name,user_path(c_project.user) %>

@@ -293,7 +294,8 @@ <%= l(:label_attendingcontest_time) %> ：<%= format_time c_softapplication.created_at %> <%= l(:label_attendingcontest_spoksman) %> - ：<%= c_softapplication.softapplication.user.name %> + + ：<%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %>
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index f82a5bd2d..075ee847f 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -68,7 +68,7 @@ - + <% if User.current.login? %> @@ -143,7 +143,7 @@ <% if @bid.watcher_users.size>0 %> <% for user in @bid.watcher_users%> - <%= image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ) %> + <%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ),user_path(user) %> <% end %> <% else %>

<%= l(:label_project_no_follow) %>

@@ -164,8 +164,8 @@ @@ -114,7 +115,8 @@ - + +
<%= h @bid.name %><%= link_to @bid.name,bid_path %>
<% if @bid.projects.size>0 %> - <% for project in @bid.projects%> - <%= image_tag(url_to_avatar(project), :class => "avatar", :title => project.name) %> + <% for project in @bid.projects%> + <%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name),project_path(project) %> <% end%> <% else %>

<%= l(:label_no_bid_project) %>

diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 34d3b7b5a..88190d536 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -70,7 +70,8 @@
- <%= h @bid.name %> + + <%=link_to(@bid.name, respond_path(@bid)) %>
<%= l(:label_teacher_work_unit) %> :<%= @user.user_extensions.occupation %><%= link_to @user.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 1252483d2..830f18d85 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -57,7 +57,8 @@

-
<%= authoring @memo.created_at, @memo.author.name %>
+ +
<%= authoring @memo.created_at, @memo.author %>

@@ -122,7 +123,8 @@ - <%= authoring reply.created_at, reply.author.name %> + + <%= authoring reply.created_at, reply.author %> diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb index 884962629..0730e9125 100644 --- a/app/views/welcome/course.html.erb +++ b/app/views/welcome/course.html.erb @@ -98,7 +98,7 @@ <% if(course.school == nil) %>               <% else %> - <%= course.school.name.try(:gsub, /(.+)$/, '\1:') %> + <%= link_to course.school.name.try(:gsub, /(.+)$/, '\1:'), options={:action => 'course',:school_id => course.school.id}, html_options={:method => 'get'}%> <% end %> @@ -151,7 +151,7 @@
<% course = Course.find_by_extra(project.identifier) %> - <%= course.school.name.try(:gsub, /(.+)$/, '\1:') %> + <%=link_to course.school.name.try(:gsub, /(.+)$/, '\1:'),options={:action => 'course',:school_id => course.school.id}, html_options={:method => 'get'} %> <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>