diff --git a/app/views/bids/_contest_show.html.erb b/app/views/bids/_contest_show.html.erb index 9cc701781..790279ea1 100644 --- a/app/views/bids/_contest_show.html.erb +++ b/app/views/bids/_contest_show.html.erb @@ -1,47 +1,47 @@ - -<% bids.each do |bid|%> - - - - - -
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> - - - - - - - - - - - -
<%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>:  <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
- - - - - - - - - -
<% if bid.reward_type.nil? or bid.reward_type == 1%> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> <% elsif bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> <% end %>
<%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>) - <%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) - <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) -
<%= format_time bid.created_on %>
-
- - - - -
<%= bid.description%>
-
-<% end %> - - + +<% bids.each do |bid|%> + + + + + +
<%= link_to(image_tag(url_to_avatar(bid.author), :class => 'avatar'), user_path(bid.author), :class => "avatar") %> + + + + + + + + + + + +
<%= link_to(bid.author, user_path(bid.author), :class => 'bid_user') %>:  <%= link_to(bid.name, respond_path(bid), :class => 'bid_path') %>
+ + + + + + + + + +
<% if bid.reward_type.nil? or bid.reward_type == 1%> <%= l(:label_bids_reward_method) %><%= l(:label_call_bonus) %> <%= l(:label_RMB_sign) %><%= bid.budget%> <% elsif bid.reward_type == 2%> <%= l(:label_bids_reward_method) %><%= bid.budget%> <% else %> <% end %>
<%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<%= link_to bid.biding_projects.count, project_for_bid_path(bid) %>) + <%= l(:label_x_bids_responses, :count => bid.commit) %>(<%= link_to bid.commit, respond_path(bid) %>) + <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<%= link_to bid.watcher_users.count, respond_path(bid) %>) +
<%= l :label_create_time %>: <%= format_time bid.created_on %>
+
+ + + + +
<%= bid.description%>
+
+<% end %> + + diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index a2b2183e5..3b6d201c0 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -74,7 +74,7 @@ <%= textilizable(news, :description) %> - <%= format_time(news.created_on) %> + <%= l :label_update_time %>: <%= format_time(news.created_on) %> <%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %> diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 92ae37dde..ed6a961b6 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -35,7 +35,7 @@

- <%= format_time journal.created_on %> + <%= l :label_update_time %>: <%= format_time journal.created_on %> <% ids = 'project_respond_form_'+journal.id.to_s%> <%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index baf4c58aa..ef42f2eda 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -32,7 +32,7 @@

- <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> + <%= l :label_activity_time %>: <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> <% if e.event_type == "issue" %> <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count)%> <% end %> @@ -62,7 +62,7 @@ <%= link_to (h @user.lastname+@user.firstname), user_path(@user) %> <%= l(:label_user_create_project) %> <%= link_to @project.name %> ! - <%= format_time(@project.created_on) %> + <%= l :label_update_time %>: <%= format_time(@project.created_on) %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 88b55a459..931c6d7b4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -155,7 +155,7 @@
<% if e.act_type == 'Changeset' %> <%= format_time(e.act.committed_on) %> <% else %> - <%= format_time(e.act.created_on) %> + <%= l :label_update_time %>: <%= format_time(e.act.created_on) %> <% end %>
@@ -173,13 +173,13 @@