diff --git a/app/controllers/zipdown_controller.rb b/app/controllers/zipdown_controller.rb index 8896da38c..e57a2c59a 100644 --- a/app/controllers/zipdown_controller.rb +++ b/app/controllers/zipdown_controller.rb @@ -82,11 +82,11 @@ class ZipdownController < ApplicationController user_zip_paths = homeattaches.map do |homeattach| if homeattach.attachments.count > 0 zip_homework_by_user homeattach - has_file = true if has_file == false + has_file = true unless has_file end end - if has_file == false - render file: 'public/no_file_fond.html.erb' , :layout => 'course_base' + unless has_file + render file: 'public/no_file_fond.html' , :layout => 'course_base' end zipping "#{Time.now.to_i}_#{bid.name}.zip", user_zip_paths, OUTPUT_FOLDER diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 0f2f4cf96..913e5b426 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -22,7 +22,7 @@
-
+
<%=render :partial => 'layouts/base_header'%>
@@ -34,9 +34,9 @@
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= text_field_tag 'name', params[:name], :size => 20 %> <%= hidden_field_tag 'reward_type', @bid.reward_type %> - <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= hidden_field_tag 'project_type', params[:project_type] %> <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %>
@@ -44,7 +44,7 @@ <%=link_to request.host()+"/contest", :controller => 'bids', :action => 'contest' %> - <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > + <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_contest_innovate), :controller => 'bids', :action => 'contest' %> > <%= link_to @bid.name, bid_path %> @@ -58,13 +58,13 @@ <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> - + - - <% if User.current.login? %> + + <% if User.current.login? %> <% end %> -
<%= h @bid.name %>
<%= join_in_contest(@bid, User.current)%> @@ -72,27 +72,27 @@
+ <% if User.current.logged? %> <% if @bid.author.id == User.current.id %> <%= link_to l(:label_contest_modify_settings), {:controller => 'bids', :action => 'settings', :id => @bid} %> - <% end %> + <% end %> <% end %>
-
+
- - - + + + - - + +
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", - :action => "show_participator" %><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids', - :action => 'show_project' %>
<%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", + :action => "show_participator" %><%=link_to "#{@bid.projects.where('is_public=1').count}", :controller => 'bids', + :action => 'show_project' %>
<%= l(:label_participator) %> <%= l(:label_bidding_project) %> <%= l(:label_participator) %> <%= l(:label_bidding_project) %>
@@ -104,8 +104,8 @@ <%= l(:lable_contest_user) %><%= link_to(@user.name, user_path(@user))%> - - <%= l(:label_bids_reward_method) %><%= @bid.budget%> + + <%= l(:label_bids_reward_method) %><%= @bid.budget%> <%= l(:label_limit_time) %> : <%= @bid.deadline%> @@ -138,9 +138,9 @@
- +
- @@ -160,7 +160,7 @@ - +
+ <%= render :partial => 'tags/tag', :locals => {:obj => @bid, :object_flag => "4"}%>
<%= show_bid_fans_picture(@bid)%>
@@ -179,14 +179,14 @@ <%= show_bid_project(@bid) %> - +
- +
@@ -207,14 +207,14 @@
- +
<% if display_main_menu?(@bid) %>
<%= render_menu :bid_menu %>
<% end %> - + <%= yield %> <%= call_hook :view_layouts_base_content %>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb index 9dfb4a5dd..22f88f1b2 100644 --- a/app/views/layouts/base_newcontest.html.erb +++ b/app/views/layouts/base_newcontest.html.erb @@ -17,39 +17,39 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - + <%= yield :header_tags -%>
-
- <%=render :partial => 'layouts/base_header'%> +
+ <%=render :partial => 'layouts/base_header'%>
- +
- - - - - - - - - - -
<%=l(:label_contest_innovate_community)%><%= l(:label_user_location) %> : -
- <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> - <%= text_field_tag 'name', params[:name], :size => 20 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <% end %> -
-
<%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > - <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > - <%= link_to @contest.name, show_contest_contest_path(@contest) %> -
+ + + + + + + + + + +
<%=l(:label_contest_innovate_community)%><%= l(:label_user_location) %> : +
+ <%= form_tag({controller: 'contests', action: 'index'}, method: :get) do %> + <%= text_field_tag 'name', params[:name], :size => 20 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <% end %> +
+
<%=link_to request.host()+"/contests", :controller=>'contests', :action=>'index' %><%=link_to l(:field_homepage), home_path %> > + <%=link_to l(:label_contest_innovate), :controller=>'contests', :action=>'index' %> > + <%= link_to h(truncate(@contest.name, length: 20, omission: '...')), show_contest_contest_path(@contest) %> +
-
+
- - + + - - - - + + + - - - - + + + +
- <%=link_to "#{@contest.watcher_users.count}",show_project_contest_path(@contest) %> + + <%=link_to "#{@contest.watcher_users.count}",show_project_contest_path(@contest) %> + + + <% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %> <%=link_to "#{@contest.projects.where('is_public=1').count}" %> <% else %> <%=link_to "#{@contest.contesting_softapplications.count}",show_attendingcontest_contest_path(@contest) %> <% end %> -
<%= l(:label_contest_watchers) %> <%= l(:label_contest_work) %> <%= l(:label_contest_watchers) %> <%= l(:label_contest_work) %>
@@ -127,9 +129,9 @@ - - - + + + @@ -137,7 +139,7 @@
<%= l(:lable_contest_user) %>: <%= link_to(@user.name, user_path(@user))%>
<%= l(:label_bids_reward_method) %><%= @contest.budget%>
<%= l(:label_bids_reward_method) %><%= @contest.budget%>
<%= l(:label_limit_time) %> : <%= @contest.deadline%>
- +
<%= l(:label_project_overview) %> @@ -156,29 +158,22 @@
<%= l(:label_create_time) %>：<%= format_time(@contest.created_on) %>
-
- +
- +
-
+ <%= render :partial => 'tags/tag', :locals => {:obj => @contest, :object_flag => "7"}%>
- +
@@ -194,29 +189,29 @@ <%= show_contest_fans_picture(@contest)%> - +
- + - + - +
- +
- -
+ +
- - + +
<% if display_main_menu?(@contest) %> -
+
  • <%= link_to l(:label_contest_notification), contest_contestnotifications_path(@contest), :class => link_class(:contestnotifications) %>
  • <%= link_to l(:label_contest_joincontest), show_attendingcontest_contest_path(@contest), :class => link_class(:attendingcontests) %>
    • @@ -224,7 +219,7 @@
<% end %> - + <%= yield %> <%= call_hook :view_layouts_base_content %>
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb index 6c1eafd6d..02b934581 100644 --- a/app/views/school/index.html.erb +++ b/app/views/school/index.html.erb @@ -3,10 +3,6 @@ @@ -55,7 +51,7 @@ //alert(value); if(value == "") { - alert("搜索条件不能为空"); + alert("<%= l(:label_search_conditions_not_null) %>"); return; } //alert(province); @@ -82,17 +78,17 @@

- <%= link_to "全部学校",school_index_path %>      + <%= link_to l(:label_all_schol),school_index_path %>      <% if User.current.logged? %> - 我的学校 + <%= l(:label_my_school) %> <% end %>

    -
  • 请选择省份: +
  • <%= l(:label_select_province) %>:
  • -
    • +
diff --git a/app/views/tags/_show_contests.html.erb b/app/views/tags/_show_contests.html.erb index bc2682fb8..891f65901 100644 --- a/app/views/tags/_show_contests.html.erb +++ b/app/views/tags/_show_contests.html.erb @@ -4,7 +4,7 @@ <% contests_results.each do |contest| %>

<%= l(:label_tags_contest) %>:<%= link_to "#{contest.name}", - :controller => "contests",:action => "show",:id => contest.id %> + :controller => "contests",:action => "show_contest",:id => contest.id %>
<%= l(:label_tags_contest_description) %>:<%= contest.description %> <%= contest.updated_on %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 068390192..9bac6f886 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,424 +1,336 @@ -<% if User.current.id == @user.id %> -

-
- <%= "#{@user.name}的动态" %> -
    <%#链接绑定在页面最下方的jQuery%> -
  • "><%= l :label_user_all_activity %>
    • -
  • "><%= l :label_user_activity_myself %>
    • -
  • "><%= l :label_user_all_respond %>
    • -
-
- -
- <%#= show_activity @state%> -
- - - - - - <%= form_tag(:controller => 'users', :action => "show") do %> - +
+ <%= form_tag(:controller => 'users', :action => "show") do %> + + <% end %> <% end %> -<% end %> -<% unless @state == 2 %> - <% unless @activity.empty? %> -
- <% @activity.each do |e| %> - <%# 以下一行代码解决有未知的活动无法转换成Model报错%> - <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> - <% act = e.act %> - <% unless act.nil? %> - <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> - - - - - -
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> - - <% case e.act_type %> - <% when 'JournalsForMessage' %> - <% if User.current.login == e.user.try(:login) %> - <%# if e.user_id == act.jour.id %> + <% unless @state == 2 %> + <% unless @activity.empty? %> +
+ <% @activity.each do |e| %> + <%# 以下一行代码解决有未知的活动无法转换成Model报错%> + <% (Rails.logger.error "[Error] =========================================================> NameError: uninitialized constant " + e.act_type.to_s; next;) if e.act_type.safe_constantize.nil? %> + <% act = e.act %> + <% unless act.nil? %> + <% if e.act_type == 'JournalsForMessage' || e.act_type == 'Bid' || e.act_type == 'Journal'|| e.act_type == 'Changeset' || e.act_type == 'Message' || e.act_type == 'Principal' || e.act_type == 'News' || e.act_type == 'Issue' || e.act_type == 'Contest'%> +
+ + + - <% else %> - <%# f=1 %> - <% end %> -
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> + + <% case e.act_type %> + <% when 'JournalsForMessage' %> - <%# else %> - - <%# end %> - <% else %> - - <% end %> - - - - - - - - <% when 'Bid' %> - - <% if act.reward_type == 3 && @show_course == 1%> - <% if e.user == User.current %> + + + + <% when 'Bid' %> + + <% if act.reward_type == 3 && @show_course == 1%> <% else %> - - <% end %> - <% else %> - <% if e.user == User.current %> - <% else %> - <% end %> - <% end %> - - - - - - - - <% when 'Journal' %> - - <% if e.user == User.current %> + + + + + + + + <% when 'Journal' %> + - <% else %> - + + <% if act.notes.nil? %> + <% desStr = '' %> + <% else %> + <% desStr= textAreailizable(act, :notes) %> + <% end %> + - <% end %> - - - <% if act.notes.nil? %> - <% desStr = '' %> - <% else %> - <% desStr= textAreailizable(act, :notes) %> - <% end %> - - - - - - <% when 'Changeset' %> - - <% if e.user == User.current %> + + + + + <% when 'Changeset' %> + - <% else %> - + + + + + - <% end %> - - - - - - - - <% when 'Message' %> - - <% if e.user == User.current %> + + <% when 'Message' %> + - <% else %> - + + - <% end %> - - - - - - - - <% when 'Principal' %> - - <% if e.user == User.current %> + + + + + <% when 'Principal' %> + - <% else %> - + + + + + - <% end %> - - - - - - - - <% when 'News' %> - - <% if e.user == User.current %> + + <% when 'News' %> + - <% else %> - + + + + + - <% end %> - - - - - - - - <% when 'Issue' %> - - <% if e.user == User.current %> + + <% when 'Issue' %> + - <% else %> - + + - <% end %> - - - - - - - - <% when 'Contest' %> - - <% if e.user == User.current && @show_contest == 1%> + + + + + <% when 'Contest' %> + - <% else %> - + + - <% end %> - - - - - - + + + <% else %> + <%# f=1 %> + <% end %> +
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %>
- <%= link_to("#{e.user.name}", user_path(e.user_id)) %> <%= l(:label_have_feedback) %><%= - link_to("#{e.act.user.name}", user_path(e.act.user.id)) %><%= l(:label_of_feedback) + l(:label_layouts_feedback) %> + +

<%= textAreailizable act.notes %>

+
+ <%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> +
-

<%= textAreailizable act.notes %>

- -
<%= link_to(l(:label_goto), user_newfeedback_user_path(e.user_id)) %> -
-
-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
-
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %>  <%= link_to format_activity_title("#{l(:label_active_homework)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %>  <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> -
-

<%=textAreailizable act, :description %>

-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
- <%= link_to l(:label_find_all_comments), respond_path(e.act_id) %><%= l(:label_comments_count, :count => e.act.commit) %> -
-
+

<%=textAreailizable act, :description %>

+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+ <%= link_to l(:label_find_all_comments), respond_path(e.act_id) %><%= l(:label_comments_count, :count => e.act.commit) %> +
+
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.identifier)) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> +

<%= desStr %>

<%= desStr %>

-
-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
-
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> +
+

<%= textAreailizable act,:long_comments %>

+
+ <%= format_time(e.act.committed_on) %> +
+
+ <%= link_to l(:label_find_all_comments), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %><%= l(:label_comments_count, :count => e.act.count) %> +
-

<%= textAreailizable act,:long_comments %>

-
- <%= format_time(e.act.committed_on) %> -
-
- <%= link_to l(:label_find_all_comments), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %><%= l(:label_comments_count, :count => e.act.count) %> -
-
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> +
+

<%= textAreailizable(act,:content) %>

-

<%= textAreailizable(act,:content) %>

-
-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
-
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_new_user) %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_user) %> +

+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+

-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
-
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> +
+

<%= textAreailizable act,:description %>

+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+ <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.comments_count) %> +
-

<%= textAreailizable act,:description %>

-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
- <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.comments_count) %> -
-
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>   - - <%= l(:label_i_new_activity) %> -   + + <%= l(:label_i_new_activity) %> +   <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> - - <%= link_to(h(e.user), user_path(e.user_id)) %> -   - - <%= l(:label_new_activity) %> -   - <%= link_to format_activity_title("#{act.source_from} (#{act.status}): #{act.tracker.name} #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> +
+ <%= textAreailizable act, :description %>
- - <%= textAreailizable act, :description %> - -
-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
-
- <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.journals.count) %> -
-
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+ <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %><%= l(:label_comments_count, :count => e.act.journals.count) %> +
+
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> - <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_contest)}: #{act.name}"), {:controller => 'contests', :action => 'show_contest', :id => act.id} %> +

<%= textAreailizable act, :description %>

<%= textAreailizable act, :description %>

-
-
- <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> -
+
+
+ <%= (l(:label_update_time).to_s << ':' << format_time(e.act.created_on)).to_s %> +
+
+
-
- <% end %> - <% end %> + + <% end %> + <% end %> - <% end %> -
- - <% else %> - <% if @user == User.current %> - <%= l(:label_user_activities) %> - <% else %> -

- <%= l(:label_user_activities_other) %> -

- <% end %> - <% end %> + <% end %> +
+ + <% else %> + <% if @user == User.current %> + <%= l(:label_user_activities) %> + <% else %> +

+ <%= l(:label_user_activities_other) %> +

+ <% end %> + <% end %> -<% else %> - <% unless @message.empty? %> -
- <% @message.each do |e| -%> - - - - + +
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> - - - + + + + + + + + +
- <%= link_to(h(e.user), user_path(e.user)) %> - <% if e.instance_of?(JournalsForMessage) %> - <% if e.reply_id == User.current.id %> - <% if e.jour_type == 'Bid' %> - <%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %> <%= l(:label_quote_my_words) %> - <% elsif e.jour_type == 'User' %> - <%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %> <%= l(:label_quote_my_words) %> - <% elsif e.jour_type == 'Project' %> - <%= '在'<<%= link_to(e.jour.name, feedback_path(e.jour)) %> <%= l(:label_reply_plural) %> - <% end %> - <% else %> - <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %> <%= l(:label_have_respond) %> - <% end %> - <% else %> - <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> - <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %> + <% else %> + <% unless @message.empty? %> +
+ <% @message.each do |e| -%> + + + + - -
<%= image_tag(url_to_avatar(e.user), :class => "avatar") %> + + + - - - - - - - - -
+ <%= link_to(h(e.user), user_path(e.user)) %> + <% if e.instance_of?(JournalsForMessage) %> + <% if e.reply_id == User.current.id %> + <% if e.jour_type == 'Bid' %> + <%= l(:label_in_bids) %><%= link_to(e.jour.name, respond_path(e.jour)) %> <%= l(:label_quote_my_words) %> + <% elsif e.jour_type == 'User' %> + <%= l(:label_in_users) %><%= link_to(e.jour.firstname, feedback_path(e.jour)) %> <%= l(:label_quote_my_words) %> + <% elsif e.jour_type == 'Project' %> + <%= '在'<<%= link_to(e.jour.name, feedback_path(e.jour)) %> <%= l(:label_reply_plural) %> + <% end %> + <% else %> + <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id)) %> <%= l(:label_have_respond) %> + <% end %> + <% else %> + <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> + <%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id)) %><%= l(:label_have_respond) %> - <% else %> - <%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %> - <% end %> - <% end %> -

<%= textAreailizable e.notes %>

- <%= format_time e.created_on %>
-
- <% end %> -
+ <% else %> + <%= l(:label_in_issues) %><%= link_to(e.issue.subject, issue_path(e.issue)) %><%= l(:label_quote_my_words) %> + <% end %> + <% end %> +

<%= textAreailizable e.notes %>

+ <%= format_time e.created_on %>
+
+ <% end %> +
- + - <% else %> -

<%= l(:label_no_user_respond_you) %>

- <% end %> + <% else %> +

<%= l(:label_no_user_respond_you) %>

+ <% end %> -<% end %> - + diff --git a/config/locales/en.yml b/config/locales/en.yml index 987acabc4..c28dd8555 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1816,5 +1816,9 @@ en: label_forums_max_length: Post Bar describing the maximum length of 65535 characters label_unknow_type: Unknow type label_score_less_than_zero: Score less than 0, revised to 0 - review_assignments: review assignments - label_private: private \ No newline at end of file + review_assignments: Review assignments + label_private: private + label_my_school: My school + label_all_schol: All school + label_select_province: Please select the provinces + label_search_conditions_not_null: The search conditions can not be empty \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index c24787d26..8c3741deb 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2119,3 +2119,7 @@ zh: label_score_less_than_zero: 得分小于0，修正为0 review_assignments: 评审任务 label_private: 私有 + label_my_school: 我的学校 + label_all_schol: 全部学校 + label_select_province: 请选择省份 + label_search_conditions_not_null: 搜索条件不能为空 \ No newline at end of file