diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 39699ece0..3b2257450 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -17,7 +17,7 @@ <% when 'Bid' %> <% if e.user == User.current%> - <%= 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("#{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) %> <% else %> <%= 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) %> <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 6759a6eb3..e77f7fc3d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -661,6 +661,7 @@ en: label_in_more_than: in more than label_in_the_next_days: in the next label_in_the_past_days: in the past + label_in_users: 'in the user ' label_greater_or_equal: '>=' label_less_or_equal: '<=' label_between: between @@ -1201,8 +1202,9 @@ en: label_leave_me_message: left a message to me label_leave_others_message: leave message to him/her label_leave_a_message: Leave him/her a message: - label_new_activity: ' has new activity' - label_i_new_activity: have new activity + label_new_activities: ' has new activity in' # modified by bai + label_new_activity: ' has new activity in' + label_i_new_activity: ' have new activity in' label_create_project: had participated in label_praise: praise label_cancel_praise: cancel praise @@ -1229,7 +1231,7 @@ en: label_password: password: label_about_requirement: about requirement: label_about_issue: about issue: - label_quote_my_words: quoted my words + label_quote_my_words: ' quoted my words' label_have_respond: had a respond label_welcome: Welcome @@ -1329,10 +1331,10 @@ en: label_newfeedback_delete: Delete label_user_all_activity: All activities label_user_activity_myself: About me - label_user_all_respond: All respondes + label_user_all_respond: All replies label_layouts_feedback: Messages label_welcome_participate: participates - label_welcome_participate_project: projects + label_welcome_participate_project: projectshas new activity label_projects_feedback: responded to the project label_projects_feedback_respond: Respond label_projects_feedback_respond_success: Respond success diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6d23940fe..497ccbbba 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1021,6 +1021,7 @@ blockquote { padding-bottom: 0.6em; margin-left: 1.4em; margin-right: 0.4em; + border-radius: 4px; # added by bai (边框变圆润) font-family: 微软雅黑; background: url(/images/requirements/reference.jpg) } @@ -1547,7 +1548,7 @@ button.tab-right { border: 1px solid #15BCCF; /*border-bottom: 0px solid #15BCCF;*/ - background-color: #fff; + background-color: rgba(228, 247, 245, 0.64); # added by bai color:#606060; font-weight:bold; border-top-left-radius:4px; @@ -1560,10 +1561,10 @@ button.tab-right { } #content .tabs_new ul li a.selected { - background-color: #fff; + background-color: rgba(28, 158, 199, 0.68); # added by bai border: 1px solid #15BCCF; border-bottom: 1px solid #fff; - color:#111; + color:#FFF; } #content .tabs_new ul li a.selected:hover {background-color: #fff;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index c955e1e5a..2f4849473 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1740,6 +1740,7 @@ input[type='text'].noline { padding: 9px 5px; width: 98%; cursor: text; + border-radius: 4px; # added by bai (边框变圆润) } .grayline{ border: #d5dee9 1px solid;