fix
This commit is contained in:
parent
19ebd48a95
commit
673850bd03
|
@ -23,7 +23,7 @@ class UsersController < ApplicationController
|
||||||
menu_item :requirement_focus, :only => :watch_bids
|
menu_item :requirement_focus, :only => :watch_bids
|
||||||
menu_item :user_newfeedback, :only => :user_newfeedback
|
menu_item :user_newfeedback, :only => :user_newfeedback
|
||||||
menu_item :user_course, :only => :user_courses
|
menu_item :user_course, :only => :user_courses
|
||||||
menu_item :user_homework, :onlu => :user_courses
|
menu_item :user_homework, :only => :user_courses
|
||||||
|
|
||||||
#Ended by young
|
#Ended by young
|
||||||
|
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
<!-- < added by huang > -->
|
|
||||||
<div class="content_frame">
|
|
||||||
<% unless @memberships.empty? %>
|
|
||||||
<ul class="user_project_sort">
|
|
||||||
<% for membership in @memberships %>
|
|
||||||
<li>
|
|
||||||
<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %></td>
|
|
||||||
<td>
|
|
||||||
<table width="580" border="0">
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" valign="top"><span><%= link_to_project(membership.project) %></span>
|
|
||||||
<span style="float: right"><%= l(:label_homework) %> (<span style="color: #ed8924">8</span>)
|
|
||||||
<%= l(:label_course_news)%> (<span style="color: #ed8924">8</span>)
|
|
||||||
<%= l(:label_member)%>(<span style="color: #ed8924"><%=link_to (membership.project.members.count)%></span>)
|
|
||||||
</span>
|
|
||||||
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan="2" width="580" >
|
|
||||||
<p class="font_description">
|
|
||||||
<%= membership.project.description%>
|
|
||||||
</p></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
|
|
||||||
<td align="right" ><%= h membership.roles.sort.collect(&:to_s).join(', ') %> </td>
|
|
||||||
</tr>
|
|
||||||
</table></td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</li>
|
|
||||||
<% end %>
|
|
||||||
</ul>
|
|
||||||
<% else %>
|
|
||||||
<% if @user != User.current %>
|
|
||||||
<p class="font_description"><%= l(:label_project_un) %></p>
|
|
||||||
<% else %>
|
|
||||||
<p class="font_description"><%= l(:label_project_unadd) %><%= link_to"#{l(:label_new)}",:controller=>'projects',:action=>'new'%></p>
|
|
||||||
<% end %>
|
|
||||||
|
|
||||||
<% end %>
|
|
||||||
<%= call_hook :view_account_left_bottom, :user => @user %>
|
|
||||||
</div>
|
|
Loading…
Reference in New Issue