diff --git a/app/views/account/login.html.erb b/app/views/account/login.html.erb index 05a9f61f7..4ee1fcfc2 100644 --- a/app/views/account/login.html.erb +++ b/app/views/account/login.html.erb @@ -26,13 +26,15 @@ - - <% if Setting.lost_password? %> + + + <% if Setting.lost_password? %> <%= link_to l(:label_password_lost), lost_password_path %> - <% end %> - - - + <% end %> + + + + diff --git a/app/views/users/info.html.erb b/app/views/users/info.html.erb index cdf4f5c37..d3940caf5 100644 --- a/app/views/users/info.html.erb +++ b/app/views/users/info.html.erb @@ -13,12 +13,12 @@ <% 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) %> + <%= l(:label_in_bids)%><%= link_to(e.jour.name, respond_path(e.jour))%> <%= l(:label_quote_my_words) %> <% else %> - <%= l(:label_in_users)%><%= link_to(e.jour.firstname, feedback_path(e.jour))%><%= l(:label_quote_my_words) %> + <%= l(:label_in_users)%><%= link_to(e.jour.firstname, feedback_path(e.jour))%> <%= l(:label_quote_my_words) %> <% end %> <% else %> - <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %> + <%= 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 %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index a16ec0d86..39699ece0 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -17,9 +17,9 @@ <% when 'Bid' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", 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) %> + <%= 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) %> + <%= 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 %> @@ -34,9 +34,9 @@ <% when 'Journal' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %><%= link_to("项目:"+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}"} %> + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to("项目:"+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}"} %> <% else %> - <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %><%= link_to("项目:"+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}"} %> + <%= link_to(h(e.user), user_path(e.user_id)) %> <%= l(:label_new_activity) %> <%= link_to("项目:"+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}"} %> <% end %> @@ -51,9 +51,9 @@ <% when 'Changeset' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", 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} %> + <%= 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} %> <% else %> - <%= 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} %> + <%= 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} %> <% end %> @@ -68,9 +68,9 @@ <% when 'Message' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", 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}"}) %> + <%= 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}"}) %> <% else %> - <%= 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}"}) %> + <%= 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}"}) %> <% end %> @@ -85,9 +85,9 @@ <% when 'Principal' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>新建了用户 + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> 新建了用户 <% else %> - <%= link_to(h(e.user), user_path(e.user_id)) %>新建了用户 + <%= link_to(h(e.user), user_path(e.user_id)) %> 新建了用户 <% end %> @@ -102,9 +102,9 @@ <% when 'News' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", 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} %> + <%= 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} %> <% else %> - <%= 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} %> + <%= 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} %> <% end %> @@ -119,9 +119,9 @@ <% when 'Issue' %> <% if e.user == User.current%> - <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %><%= link_to("项目:"+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> + <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %> <%= l(:label_i_new_activity) %> <%= link_to("项目:"+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> <% else %> - <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %><%= link_to("项目:"+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{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("项目:"+act.project.name, project_path(act.project.identifier))%> <%= link_to format_activity_title("#{act.tracker.name} ##{act.id} (#{act.status}): #{act.subject}"), {:controller => 'issues', :action => 'show', :id => act.id} %> <% end %> @@ -180,12 +180,12 @@ <% 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) %> + <%= l(:label_in_bids)%><%= link_to(e.jour.name, respond_path(e.jour))%> <%= l(:label_quote_my_words) %> <% else %> - <%= l(:label_in_users)%><%= link_to(e.jour.firstname, feedback_path(e.jour))%><%= l(:label_quote_my_words) %> + <%= l(:label_in_users)%><%= link_to(e.jour.firstname, feedback_path(e.jour))%> <%= l(:label_quote_my_words) %> <% end %> <% else %> - <%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %> + <%= 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 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 12e74b955..6759a6eb3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1338,3 +1338,6 @@ en: label_projects_feedback_respond_success: Respond success button_projects_feedback_respond: Respond label_projects_feedback_respond_content: Please input your words + label_in_issues: in the issue： + label_in_bids: in the call： + label_in_users: in the user： diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6101ddfdc..5e4a40be4 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1,5 +1,5 @@ html {overflow-y:scroll;} -body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; } +body { font-family: Verdana, sans-serif; font-size: 13px; color:#484848; margin: 0; padding: 0; min-width: 900px; } /*modified by men*/ h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;} #content h1, h2, h3, h4 {color: #555;} @@ -205,7 +205,7 @@ ul.tool li{list-style-type:none; .font_lighter{ font-family:微软雅黑; color:#acaeb1; - font-size:12px; + font-size:13px; } .font_lighter2{ @@ -1005,7 +1005,7 @@ margin-left:-10px; /*end*/ .splitcontentright{float:right; width:49%;} form {display: inline;} -input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} +input, select {font-family: 微软雅黑;vertical-align: middle; margin-top: 1px; margin-bottom: 1px;} /*modify by men*/ fieldset {border: 1px solid #e4e4e4; margin:0;} legend {color: #484848;} hr { width: 100%; height: 1px; background: #ccc; border: 0; color:#000000;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index a718012a7..bdf8d65dc 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -51,7 +51,7 @@ only screen and (min-device-pixel-ratio: 2) { body,#wrapper { background-color:#fff; /*整体背景色ecfffb*/ - font-family:Helvetica,Arial,"Lucida Grande",verdana,sans-serif + font-family:'微软雅黑'Helvetica,Arial,"Lucida Grande",verdana,sans-serif } a @@ -512,7 +512,7 @@ ul.projects li.root h1,h2,h3,h4 { - font-family:"PT Sans","Lucida Grande",arial,sans-serif + font-family:'微软雅黑'"PT Sans","Lucida Grande",arial,sans-serif /*modify by men*/ } h1 @@ -910,7 +910,7 @@ input#issue_subject textarea.wiki-edit { - font-family:Cambria,Verdana,Serif; + font-family:'微软雅黑'Cambria,Verdana,Serif; /*modify by men*/ font-size:larger } @@ -998,7 +998,7 @@ ol li ol li ol li input[type="submit"] { - font-family:Arial,Helvetica,sans-serif; + font-family:'微软雅黑'Arial,Helvetica,sans-serif; /*modify by men*/ font-size:13px; color:#050505; padding:5px 10px; @@ -1089,7 +1089,7 @@ div.wiki-description { margin-top: 10px; width: 470px; max-height: 121px; - font-family: helvetica,arial,sans-serif; + font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/ color: rgb(0, 0, 0); font-size: 13px; line-height: 18px; @@ -1104,7 +1104,7 @@ div.wiki-description { float: left; height: auto; width: 246px; - font-family: helvetica,arial,sans-serif; + font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/ color: rgb(0, 0, 0); font-size: 13px; line-height: 18px; @@ -1225,7 +1225,7 @@ p.stats { height: 18px; width: 375px; font-size: 13px; - font-family: helvetica,arial,sans-serif; + font-family: '微软雅黑'; /*modify by men*/ line-height: 18px; overflow: hidden; white-space: nowrap; @@ -1238,7 +1238,7 @@ p.stats { height: 18px; width: 260px; font-size: 13px; - font-family: helvetica,arial,sans-serif; + font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/ line-height: 18px; } @@ -1682,7 +1682,7 @@ div.project-search { } div.project-search input[type="submit"] { width: 40px; - font-family: Arial,Helvetica,sans-serif; + font-family: '微软雅黑'Arial,Helvetica,sans-serif; font-size: 12px; color: rgb(5, 5, 5); padding: 0px; @@ -1733,6 +1733,7 @@ input[type='text'].noline { .noline { /*border-style: none; border-color: white;*/ + font-family:微软雅黑; /*modify by men*/ border: #d5dee9 1px solid; font-size: 12px; color: #ACAEB1;