del the link of .head portrait

This commit is contained in:
xianbo 2013-11-01 15:48:23 +08:00
parent c7d96dd183
commit ca0f63a817
36 changed files with 48 additions and 52 deletions

View File

@ -1354,7 +1354,7 @@ module ApplicationHelper
html << (content_tag "span", l(:label_no_current_watchers))
end
for user in User.watched_by(obj.id)
html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}")
html << (image_tag(url_to_avatar(user), :class => "avatar"))
count = count + 1
if count >= 12
break
@ -1379,7 +1379,7 @@ module ApplicationHelper
html << (content_tag "span", l(:label_no_current_fans))
end
for user in obj.watcher_users
html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}")
html << (image_tag(url_to_avatar(user), :class => "avatar"))
count = count + 1
if count >= 12
break
@ -1393,7 +1393,7 @@ module ApplicationHelper
html = ''
count = 0
for user in User.watched_by(user.id)
html << (link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar", :title => "#{user.name}")
html << (image_tag(url_to_avatar(user), :class => "avatar"))
count = count + 1
if count >= 12
break

View File

@ -28,7 +28,7 @@
<% for journal in journals%>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
<td><table width="580px" border="0">
<tr>
<% if @bid.reward_type == 3 %>

View File

@ -3,14 +3,10 @@
<% @homework_list.each do |homework|%>
<% if homework.attachments.any?%>
<table width="660px" border="0" align="center">
<tr>
<% if User.current.member_of?(@bid.courses.first) %>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td>
<% else %>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td>
<% end %>
<!-- <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td> -->
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
<td>
<table width="580px" border="0">
<tr>

View File

@ -8,7 +8,7 @@
<tr>
<td width="50px" valign="top" colspan="2" align="middle">
<div style="width: 50px; height: 50px;">
<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
<%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
</div></td>
<td width="65%" valign="top">

View File

@ -18,7 +18,7 @@
<tr>
<td width="50px" valign="top" colspan="2" align="middle">
<div style="width: 50px; height: 50px;">
<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
<%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
</div></td>
<td width="60%" valign="top">
<table width="100%" valign="top">

View File

@ -1,7 +1,7 @@
<!-- fq -->
<table width="660px" border="0" align="center">
<tr>
<td width="50" valign="top"><%= link_to image_tag(url_to_avatar(@bid.author), :class => "avatar"), user_path(@bid.author), :class => "avatar" %></td>
<td width="50" valign="top"><%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%></td>
<td><table width="100%" border="0">
<tr>
<td><h3><%= link_to(@bid.author.lastname+@bid.author.firstname, user_path(@bid.author))%><%= @bid.name %></h3></td>

View File

@ -6,7 +6,7 @@
<tr>
<td width="50px" valign="top" colspan="2" align="middle">
<div style="width: 50px; height: 50px;">
<%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %>
<%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
</div></td>
<td width="60%" valign="top">
<table width="100%" valign="top">

View File

@ -3,7 +3,7 @@
<ul class="list_watch"><li>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(user), :class => "avatar") %></td>
<td><table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>

View File

@ -4,7 +4,7 @@
<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(course), :class => 'avatar'), project_path(course) %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(course), :class => 'avatar') %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -6,7 +6,7 @@
<!-- end -->
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
<td>
<table width="580px" border="0">
<tr>

View File

@ -36,7 +36,7 @@
<table>
<tr>
<td align="left" valign="middle">
<%= link_to image_tag(url_to_avatar(@user), :class => "avatar2"), user_path(@user), :class => "avatar" %>
<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
</td>
<td>
<table>
@ -114,7 +114,7 @@
<% if @bid.watcher_users.size>0 %>
<% for user in @bid.watcher_users%>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
<%= image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ) %>
<% end %>
<% else %>
<p class="font_lighter"><%= l(:label_project_no_follow) %></p>
@ -136,7 +136,7 @@
<td style="padding-top: 5px">
<% if @bid.projects.size>0 %>
<% for project in @bid.projects%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
<%= image_tag(url_to_avatar(project), :class => "avatar", :title => project.name) %>
<% end%>
<% else %>
<p class="font_lighter"><%= l(:label_no_bid_project) %></p>

View File

@ -36,7 +36,7 @@
<table>
<tr>
<td align="left" valign="middle">
<%= link_to image_tag(url_to_avatar(@user), :class => "avatar2"), user_path(@user), :class => "avatar" %>
<%= image_tag(url_to_avatar(@user), :class => "avatar2") %>
</td>
<td>
<table>
@ -93,7 +93,7 @@
<% if @bid.watcher_users.size>0 %>
<% for user in @bid.watcher_users%>
<%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %>
<%= image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ) %>
<% end %>
<% else %>
<p class="font_lighter"><%= l(:label_project_no_follow) %></p>
@ -115,7 +115,7 @@
<td style="padding-top: 5px">
<% if @bid.projects.size>0 %>
<% for project in @bid.projects%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
<%= image_tag(url_to_avatar(project), :class => "avatar", :title => project.name) %>
<% end%>
<% else %>
<p class="font_lighter"><%= l(:label_no_bid_project) %></p>

View File

@ -40,12 +40,12 @@
<tr>
<td><% if(@project.project_type==1) %>
<% if get_avatar?(@project) %>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2"), project_path(@project) %>
<%= image_tag(url_to_avatar(@project), :class => "avatar2") %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(@project)%>
<% end %>
<% else %>
<%= link_to image_tag(url_to_avatar(@project), :class => "avatar2") %>
<%= image_tag(url_to_avatar(@project), :class => "avatar2") %>
<% end %> </td>
<td align="center">
<div class="info_font" style=" word-wrap: break-word; word-break: break-all">

View File

@ -104,7 +104,7 @@
<td style="padding-top: 5px"> <% if @bid.homework_type == 1%>
<% if @bid.homeworks.size>0 %>
<% for homework in @bid.homeworks %>
<%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar", :title => homework.user.name), user_path(homework.user), :class => "avatar" %>
<%= image_tag(url_to_avatar(homework.user), :class => "avatar", :title => homework.user.name) %>
<% end %>
<% else %>
<p class="font_lighter">
@ -113,7 +113,7 @@
<% else %>
<% if @bid.projects.size>0 %>
<% for project in @bid.projects%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %>
<%= image_tag(url_to_avatar(project), :class => "avatar", :title => project.name) %>
<% end %>
<% else %>
<p class="font_lighter">

View File

@ -37,7 +37,7 @@
<% @project = Project.find_by_id(@project.id)%>
<table>
<tr>
<td><%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
<td><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %></td>
<td align="center">
<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
<%= @project.name %>

View File

@ -35,7 +35,7 @@
<div class="inf_user_image">
<table>
<tr>
<td align="left" valign="middle" ><%= link_to image_tag(url_to_avatar(@user), :class => 'avatar2'), :class => "avatar" %></td>
<td align="left" valign="middle" ><%= image_tag(url_to_avatar(@user), :class => 'avatar2') %></td>
<td>
<table>
<tr>

View File

@ -53,7 +53,7 @@
<% @newss.each do |news| %>
<table width="660px" 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(news.author), :class => "avatar"), user_path(news.author) %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(news.author), :class => "avatar") %></td>
<td><table width="580px" border="0">
<% if @project.project_type == 1 %>
<tr>

View File

@ -5,7 +5,7 @@
<% unless member.created_on.nil? %>
<%= content_tag "p", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
<% end %>
<%= member.user.nil? ? '' : (link_to image_tag(url_to_avatar(member.user), :class => 'avatar'), :class => "avatar") %>
<%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar')) %>
<%= content_tag "div", link_to_user(member.principal), :class => "nomargin avatar_name" %>
<% if @project.project_type == 1 %>

View File

@ -3,12 +3,12 @@
<div class="img-tag">
<% if(@project.project_type==1)%>
<% if get_avatar?(project)%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
<%= image_tag(url_to_avatar(project), :class => "avatar2") %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%>
<%= image_tag('../images/avatars/Project/course.jpg', :class => "avatar2") %>
<% end %>
<% else %>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
<%= image_tag(url_to_avatar(project), :class => "avatar2") %>
</div>
<div class="wiki-description">
<p>

View File

@ -6,7 +6,7 @@
<% for journal in @jour%>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
<td>
<table width="580px" border="0">
<tr>

View File

@ -56,7 +56,7 @@
<p class="font_description">
<table width="660">
<tr>
<td><%= link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%></td>
<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
<td colspan="2">
<table width="580">
<tr>

View File

@ -6,7 +6,7 @@
<li>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(user), :class => "avatar") %></td>
<td><table width="580px" border="0">
<tr>
<td colspan="2" width="580px" ><p><%= content_tag "div", link_to_user(user), :class =>"project_avatar_name" %></p>

View File

@ -4,7 +4,7 @@
<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 colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -115,7 +115,7 @@
<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
<div>
<%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user) %>
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
<div style="position:relative;float:left;margin-top:-2px;margin-left: 160px">
<%= l(:label_user_grade) %>: <span style="color:red"><%= user.user_status.grade %></span>

View File

@ -5,7 +5,7 @@
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr>
<!-- fq -->
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -59,7 +59,7 @@
<% for user in @users -%>
<div class="well">
<%= content_tag "p", "Trustie2 member since #{format_time(user.created_on)}", :class => "float_right member_since" %>
<%= link_to image_tag(avatar_image(user), :class => 'avatar'), :class => "avatar" %>
<%= image_tag(avatar_image(user), :class => 'avatar')%>
<%= content_tag "div", link_to_user(user), :class => "nomargin avatar_name" %>
<%= content_tag "div", content_tag("p", user.firstname), :class => "clear avatar_name" %>
<p>

View File

@ -110,7 +110,7 @@
<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user), :class => "avatar") : (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
<div>
<%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user) %>
<%= image_tag(url_to_avatar(user), :class => 'avatar') %>
<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
</div>
<div style="margin-top: 20px;margin-left:66px">

View File

@ -10,7 +10,7 @@
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;font-size:14px;">
<tr>
<!-- fq -->
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user_id), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
<td>
<table width="580" border="0">
<% case e.act_type %>
@ -184,7 +184,7 @@
<table width="660" border="0" align="left" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
<tr>
<!-- fq -->
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.user), :class => "avatar") %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -5,7 +5,7 @@
<ul class="list_watch"><li>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(user), :class => "avatar") %></td>
<td><table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>

View File

@ -12,7 +12,7 @@
<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 colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -4,7 +4,7 @@
<ul class="list_watch"><li>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(user), :class => "avatar") %></td>
<td><table width="580px" border="0">
<tr>
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %>

View File

@ -5,7 +5,7 @@
<% for bid in @bid %>
<table width="90%" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px; margin-top: 30px;font-size:14px;">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'),user_path(bid.author), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(bid.author), :class => 'avatar') %></td>
<td>
<table width="100%" border="0">
<tr>

View File

@ -6,7 +6,7 @@
<% for watch_project in @watch_projects %>
<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(watch_project.project), :class => 'avatar'), project_path(watch_project.project) %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(watch_project.project), :class => 'avatar') %></td>
<td>
<table width="580" border="0">
<tr>

View File

@ -56,7 +56,7 @@
</tr>
<tr>
<td rowspan="2" style="padding-left: 20px"><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %></td>
<td rowspan="2" style="padding-left: 20px"><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %></td>
<td><strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %></strong>&nbsp
<strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %></strong></td>
</tr>

View File

@ -5,7 +5,7 @@
<% for journal in jour%>
<table width="660px" border="0" align="center">
<tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %></td>
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></td>
<td>
<table width="580px" border="0">
<tr>

View File

@ -477,7 +477,7 @@ zh:
label_role_new: 新建角色
label_role_and_permissions: 角色和权限
label_member: 成员
label_member_new: 新建成员
label_member_new: 添加成员
label_member_plural: 成员
label_tracker: 跟踪标签
label_tracker_plural: 跟踪标签