diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d916b8595..d666945cf 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 3d9ed4212..082286e27 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -28,7 +28,7 @@ <% for journal in journals%> - +
<%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> <% if @bid.reward_type == 3 %> diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 0c9fc7b9c..a5e42fe4d 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -3,14 +3,10 @@ <% @homework_list.each do |homework|%> <% if homework.attachments.any?%> -
- <% if User.current.member_of?(@bid.courses.first) %> - - <% else %> - - <% end %> + +
<%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%> diff --git a/app/views/bids/_list_projects.html.erb b/app/views/bids/_list_projects.html.erb index 790ee53d2..677cec60a 100644 --- a/app/views/bids/_list_projects.html.erb +++ b/app/views/bids/_list_projects.html.erb @@ -8,7 +8,7 @@
- <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> + <%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
diff --git a/app/views/bids/_project_homework.html.erb b/app/views/bids/_project_homework.html.erb index bfe86c75c..5013e2a8d 100644 --- a/app/views/bids/_project_homework.html.erb +++ b/app/views/bids/_project_homework.html.erb @@ -18,7 +18,7 @@
- <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> + <%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
diff --git a/app/views/bids/show.html.erb b/app/views/bids/show.html.erb index 2565b72bc..88d21d3a0 100644 --- a/app/views/bids/show.html.erb +++ b/app/views/bids/show.html.erb @@ -1,7 +1,7 @@
- +
<%= link_to image_tag(url_to_avatar(@bid.author), :class => "avatar"), user_path(@bid.author), :class => "avatar" %><%= image_tag(url_to_avatar(@bid.author), :class => "avatar")%> diff --git a/app/views/bids/show_bid_project.html.erb b/app/views/bids/show_bid_project.html.erb index 616ab7bd9..5040d3b3d 100644 --- a/app/views/bids/show_bid_project.html.erb +++ b/app/views/bids/show_bid_project.html.erb @@ -6,7 +6,7 @@

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

- <%= link_to image_tag(url_to_avatar(b_project.project), :class => 'avatar3'), :class => "avatar" %> + <%= image_tag(url_to_avatar(b_project.project), :class => 'avatar3') %>
diff --git a/app/views/bids/show_bid_user.html.erb b/app/views/bids/show_bid_user.html.erb index 5ac14ee69..2fd6205d0 100644 --- a/app/views/bids/show_bid_user.html.erb +++ b/app/views/bids/show_bid_user.html.erb @@ -3,7 +3,7 @@
- +
<%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %><%= image_tag(url_to_avatar(user), :class => "avatar") %>
<%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %> diff --git a/app/views/bids/show_course.html.erb b/app/views/bids/show_course.html.erb index c5f81feaf..0d1bdee57 100644 --- a/app/views/bids/show_course.html.erb +++ b/app/views/bids/show_course.html.erb @@ -4,7 +4,7 @@
  • - +
    <%= link_to image_tag(url_to_avatar(course), :class => 'avatar'), project_path(course) %><%= image_tag(url_to_avatar(course), :class => 'avatar') %> diff --git a/app/views/issues/_history.html.erb b/app/views/issues/_history.html.erb index 0c584e287..fdc35f496 100644 --- a/app/views/issues/_history.html.erb +++ b/app/views/issues/_history.html.erb @@ -6,7 +6,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 72530b8ff..d262a6c81 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -36,7 +36,7 @@
    - <%= link_to image_tag(url_to_avatar(@user), :class => "avatar2"), user_path(@user), :class => "avatar" %> + <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> @@ -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 %>

    <%= l(:label_project_no_follow) %>

    @@ -136,7 +136,7 @@
    <% 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 %>

    <%= l(:label_no_bid_project) %>

    diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 719ac7d75..4801f3075 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -36,7 +36,7 @@
    - <%= link_to image_tag(url_to_avatar(@user), :class => "avatar2"), user_path(@user), :class => "avatar" %> + <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> @@ -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 %>

    <%= l(:label_project_no_follow) %>

    @@ -115,7 +115,7 @@
    <% 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 %>

    <%= l(:label_no_bid_project) %>

    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 711d47e96..50c794012 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -40,12 +40,12 @@
    <% 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 %>
    diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 0f447d831..c39459d56 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -104,7 +104,7 @@
    		<% 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 %>

    @@ -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 %>

    diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 7493de1ab..7973201ad 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -37,7 +37,7 @@ <% @project = Project.find_by_id(@project.id)%> - +
    <%= link_to image_tag(url_to_avatar(@project), :class => 'avatar2') %><%= image_tag(url_to_avatar(@project), :class => 'avatar2') %>
    <%= @project.name %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 5b031bda1..b92f68ac8 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -35,7 +35,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(@user), :class => 'avatar2'), :class => "avatar" %><%= image_tag(url_to_avatar(@user), :class => 'avatar2') %> diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index cded25576..e12c9d4ae 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -53,7 +53,7 @@ <% @newss.each do |news| %>
    - +
    <%=link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %><%= image_tag(url_to_avatar(news.author), :class => "avatar") %> <% if @project.project_type == 1 %> diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb index 95ca1d029..9700de1b7 100644 --- a/app/views/projects/_member_list.html.erb +++ b/app/views/projects/_member_list.html.erb @@ -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 %> diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index d7c454bc3..c5b0d7d2f 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -3,12 +3,12 @@
    <% 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") %>

    diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index e89eb9c39..4a261b14e 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -6,7 +6,7 @@ <% for journal in @jour%>

    - +
    <%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 23061be39..8ea9bf975 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -56,7 +56,7 @@

    - +
    <%= link_to image_tag(url_to_avatar(@user), :class => "avatar"), user_path(@user)%><%= image_tag(url_to_avatar(@user), :class => "avatar") %> diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb index 491dd7205..790eae70c 100644 --- a/app/views/projects/watcherlist.html.erb +++ b/app/views/projects/watcherlist.html.erb @@ -6,7 +6,7 @@
    • - +
    <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %><%= image_tag(url_to_avatar(user), :class => "avatar") %>

    <%= content_tag "div", link_to_user(user), :class =>"project_avatar_name" %>

    diff --git a/app/views/users/_course_form.html.erb b/app/views/users/_course_form.html.erb index 579f5dbef..e3e2f40f8 100644 --- a/app/views/users/_course_form.html.erb +++ b/app/views/users/_course_form.html.erb @@ -4,7 +4,7 @@ - +
    <%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 8f010d7de..0e8b94008 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -115,7 +115,7 @@ <%= image_tag "/images/time_member.png", :class => "img_member_time"%>
    - <%= 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" %>
    <%= l(:label_user_grade) %>: <%= user.user_status.grade %> diff --git a/app/views/users/info.html.erb b/app/views/users/info.html.erb index e63b71817..ab25a9d73 100644 --- a/app/views/users/info.html.erb +++ b/app/views/users/info.html.erb @@ -5,7 +5,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %><%= image_tag(url_to_avatar(e.user), :class => "avatar") %> diff --git a/app/views/users/list.html.erb b/app/views/users/list.html.erb index 4cceaee35..53948fdc2 100644 --- a/app/views/users/list.html.erb +++ b/app/views/users/list.html.erb @@ -59,7 +59,7 @@ <% for user in @users -%>
    <%= 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" %>

    diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 8ea035e5d..0349ebcab 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -110,7 +110,7 @@ <%= image_tag "/images/time_member.png", :class => "img_member_time"%>

    - <%= 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" %>
    diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3daeeb116..9338903aa 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -10,7 +10,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user_id), :class => "avatar" %><%= image_tag(url_to_avatar(e.user), :class => "avatar") %> <% case e.act_type %> @@ -184,7 +184,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(e.user), :class => "avatar"), user_path(e.user), :class => "avatar" %><%= image_tag(url_to_avatar(e.user), :class => "avatar") %> diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index 749fd80d9..4390240ff 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -5,7 +5,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %><%= image_tag(url_to_avatar(user), :class => "avatar") %>
    <%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %> diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 3df4bc5dd..b29cc16a5 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -12,7 +12,7 @@
  • - +
    <%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %><%= image_tag(url_to_avatar(membership.project), :class => 'avatar') %> diff --git a/app/views/users/user_watchlist.html.erb b/app/views/users/user_watchlist.html.erb index 23d210697..ade6a9a21 100644 --- a/app/views/users/user_watchlist.html.erb +++ b/app/views/users/user_watchlist.html.erb @@ -4,7 +4,7 @@
    - +
    <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %><%= image_tag(url_to_avatar(user), :class => "avatar") %>
    <%= content_tag "div", link_to_user(user), :class => "project_avatar_name" %> diff --git a/app/views/users/watch_bids.html.erb b/app/views/users/watch_bids.html.erb index 3832fb54e..3b7a01bef 100644 --- a/app/views/users/watch_bids.html.erb +++ b/app/views/users/watch_bids.html.erb @@ -5,7 +5,7 @@ <% for bid in @bid %> - +
    <%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'),user_path(bid.author), :class => "avatar" %><%= image_tag(url_to_avatar(bid.author), :class => 'avatar') %> diff --git a/app/views/users/watch_projects.html.erb b/app/views/users/watch_projects.html.erb index 8d94b7e5e..00cf1e30a 100644 --- a/app/views/users/watch_projects.html.erb +++ b/app/views/users/watch_projects.html.erb @@ -6,7 +6,7 @@ <% for watch_project in @watch_projects %>
    - +
    <%= link_to image_tag(url_to_avatar(watch_project.project), :class => 'avatar'), project_path(watch_project.project) %><%= image_tag(url_to_avatar(watch_project.project), :class => 'avatar') %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 118c3b06b..9f498080d 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -56,7 +56,7 @@ - + diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 20458834e..295c4e3a6 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -5,7 +5,7 @@ <% for journal in jour%>
    <%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %><%= image_tag(url_to_avatar(User.current), :class => 'avatar') %> <%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %>  <%=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) %>
    - +
    <%= link_to image_tag(url_to_avatar(journal.user), :class => "avatar"), user_path(journal.user), :class => "avatar" %><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8996b794d..ef12545e1 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -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: 跟踪标签