Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/bids/show.html.erb

@@ -2,7 +2,7 @@
 <div style="margin-left: 20px;">
 	<span class="portrait"><%=  image_tag(url_to_avatar(@bid.author), :class => "avatar")%></span>
 	<span class="body">
-		<h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= @bid.name %></h3>
+		<h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%>：<%= link_to(@bid.name,respond_path(@bid)) %></h3>
 		<% if @bid.reward_type.nil? or @bid.reward_type == 1%>
 		<p>  
 			<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= l(:label_call_bonus) %>&nbsp; <%= l(:label_RMB_sign) %><%= @bid.budget %></span></strong>

app/views/contests/_list_projects.html.erb

@@ -76,7 +76,8 @@
 													<strong>
 														<%= l(:label_contest_user) %>											
 														<% unless c_project.user.nil? %>
-														<%= c_project.user.lastname %><%= c_project.user.firstname %>
+                                                         <!-- modified by zjc 添加超链接 -->
+														<%= link_to c_project.user.lastname + c_project.user.firstname,user_path(c_project.user) %>
 														<% end %>
 													</strong>
 											

app/views/contests/show_attendingcontest.html.erb

@@ -259,7 +259,10 @@
                 <span><strong><%= l(:label_attendingcontest_time) %>
                   ：</strong><%= format_time c_project.created_at %></span>
                 <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  ：</strong><%= c_project.user.name %></span>
+                  <!-- modified by zjc 添加超链接 -->
+                  <% unless c_project.nil? || c_project.user.nil? %>
+                  ：</strong><%= link_to c_project.user.name,user_path(c_project.user) %></span>
+                  <% end %>
               </div>
 
               <div style="padding-left: 68px">
@@ -293,7 +296,10 @@
                 <span><strong><%= l(:label_attendingcontest_time) %>
                   ：</strong><%= format_time c_softapplication.created_at %></span>
                 <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  ：</strong><%= c_softapplication.softapplication.user.name %></span>
+                  <!-- modified by zjc 添加超链接 -->
+                  <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil?  %>
+                  ：</strong><%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %></span>
+                  <% end %>
               </div>
 
               <!--获奖及教师评奖-->

app/views/layouts/base_bids.html.erb

@@ -68,7 +68,7 @@
 												<td>
 												<table>
 													<tr>
-														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
+														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= link_to  @bid.name,bid_path %></td>
 													</tr>	
 													<% if User.current.login? %>											
 													<tr>
@@ -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 %>
 														<p class="font_lighter"><%= l(:label_project_no_follow) %></p>														
@@ -164,8 +164,8 @@
 												<tr>
 													<td style="padding-top: 5px">
 														<% if @bid.projects.size>0 %>
-														<% for project in @bid.projects%>														
+														<% for project in @bid.projects%>
-															<%= image_tag(url_to_avatar(project), :class => "avatar", :title => project.name) %>
+															<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name),project_path(project) %>
 														<% end%>
 														<% else %>														
 														<p class="font_lighter"><%= l(:label_no_bid_project) %></p>

app/views/layouts/base_courses.html.erb

@@ -178,7 +178,7 @@
         </tr>
         <!-- end -->
 
-        <% unless @course.teacher.user_extensions.nil? %>
+        <% unless @course.teacher.user_extensions.nil? || @course.teacher.user_extensions.school.nil? %>
             <tr>
               <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td>
               <!-- modified by zjc 教师单位添加超链接 -->

app/views/layouts/base_homework.html.erb

@@ -70,7 +70,8 @@
                                               <tr>
                                                 <td style=" word-wrap: break-word; word-break: break-all;font-size: 16px;text-align: center">
                                                   <span style=" color:#ed8924">
-                                                    <strong><%= h @bid.name %></strong>
+                                                    <!-- modified by zjc 添加超链接 -->
+                                                    <strong><%=link_to(@bid.name, respond_path(@bid)) %></strong>
                                                   </span>
                                                 </td>
                                               </tr>
@@ -114,7 +115,10 @@
 
                                           <tr>
                                             <td valign="top" style="padding-left: 8px;"><%= l(:label_teacher_work_unit) %> :</td>
-                                            <td class="font_lighter_sidebar"><%= @user.user_extensions.occupation %></td>
+                                            <!-- modified by zjc 有@user.user_extensions.occupation改为 @user.user_extensions.school 并添加超链接 -->
+                                            <% unless  @user.user_extensions.nil? ||  @user.user_extensions.school.nil? %>
+                                            <td class="font_lighter_sidebar"><%= link_to @user.user_extensions.school,options={:controller => 'welcome',:action => 'course',:school_id => @user.user_extensions.school.id}, html_options={:method => 'get'} %></td>
+                                            <% end %>
                                           </tr>
                                         </table>
                                       </div>

app/views/memos/show.html.erb

@@ -57,7 +57,8 @@
 			</p>
 			<div class="clearfix"></div>
 		</div>
-		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author.name %></div>
+      <!-- modified by zjc 修正名字无链接问题 -->
+		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
 
 	</div>
 	<br />
@@ -122,7 +123,8 @@
 				</td>
 			</tr>
 			<tr>
-				<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author.name %></td>
+              <!-- modified by zjc 修正名字无链接问题 -->
+				<td class="font_lighter" style="float:right"><%= authoring reply.created_at, reply.author %></td>
 			</tr>
 		</table>    
 	</div>

app/views/welcome/course.html.erb

@@ -98,7 +98,7 @@
                       <% if(course.school == nil) %>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <% 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 %>
                     </span>
                     <span class='font_bolder'>
@@ -151,7 +151,7 @@
                 <div class='desc_item' >
                 <span class=''>
                 <% 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'} %>
                 </span>
                 <span class='font_bolder'>
                 <%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>