jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

页面字体统一，登陆框异常排除，部分国际化

This commit is contained in:
kaizheng 2013-08-31 17:04:11 +08:00
parent 2d023f9d18
commit 3d729df268
6 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/views/account/login.html.erb
View File

@ -26,13 +26,15 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td align="left"> <td colspan="2" >
<% if Setting.lost_password? %>
<span style="float: left"><% if Setting.lost_password? %>
<%= link_to l(:label_password_lost), lost_password_path %> <%= link_to l(:label_password_lost), lost_password_path %>
<% end %> <% end %></span>
</td>
<td align="right"> <span style="float: right">
<input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/> <input type="submit" name="login" value="<%=l(:button_login)%> &#187;" tabindex="5"/></span>
</td> </td>
</tr> </tr>
</table> </table>

6
app/views/users/info.html.erb
View File

@ -13,12 +13,12 @@
<% if e.instance_of?(JournalsForMessage)%> <% if e.instance_of?(JournalsForMessage)%>
<% if e.reply_id == User.current.id%> <% if e.reply_id == User.current.id%>
<%if e.jour_type == 'Bid'%> <%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))%>&nbsp;<%= l(:label_quote_my_words) %>
<% else %> <% 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))%>&nbsp;<%= l(:label_quote_my_words) %>
<% end %> <% end %>
<% else %> <% 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))%>&nbsp;<%= l(:label_have_respond) %>
<% end %> <% end %>
<% else %> <% else %>
<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>

34
app/views/users/show.html.erb
View File

@ -17,9 +17,9 @@
<% when 'Bid' %> <% when 'Bid' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -34,9 +34,9 @@
<% when 'Journal' %> <% when 'Journal' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span><%= 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}"} %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= 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}"} %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span><%= 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}"} %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= 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}"} %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -51,9 +51,9 @@
<% when 'Changeset' %> <% when 'Changeset' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -68,9 +68,9 @@
<% when 'Message' %> <% when 'Message' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= 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}"}) %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= 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}"}) %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= 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}"}) %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= 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}"}) %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -85,9 +85,9 @@
<% when 'Principal' %> <% when 'Principal' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter">新建了用户</span></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">新建了用户</span></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter">新建了用户</span></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter">新建了用户</span></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -102,9 +102,9 @@
<% when 'News' %> <% when 'News' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -119,9 +119,9 @@
<% when 'Issue' %> <% when 'Issue' %>
<tr> <tr>
<% if e.user == User.current%> <% if e.user == User.current%>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span><%= 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} %></td> <td colspan="2" valign="top"><strong><%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_i_new_activity) %></span>&nbsp;<%= 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} %></td>
<% else %> <% else %>
<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_new_activity) %></span><%= 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} %></td> <td colspan="2" valign="top"><strong><%= link_to(h(e.user), user_path(e.user_id)) %></strong>&nbsp;<span class="font_lighter"><%= l(:label_new_activity) %></span>&nbsp;<%= 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} %></td>
<% end %> <% end %>
</tr> </tr>
<tr> <tr>
@ -180,12 +180,12 @@
<% if e.instance_of?(JournalsForMessage)%> <% if e.instance_of?(JournalsForMessage)%>
<% if e.reply_id == User.current.id%> <% if e.reply_id == User.current.id%>
<%if e.jour_type == 'Bid'%> <%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))%>&nbsp;<%= l(:label_quote_my_words) %>
<% else %> <% 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))%>&nbsp;<%= l(:label_quote_my_words) %>
<% end %> <% end %>
<% else %> <% 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))%>&nbsp;<%= l(:label_have_respond) %>
<% end %> <% end %>
<% else %> <% else %>
<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %> <% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>

3
config/locales/en.yml
View File

@ -1338,3 +1338,6 @@ en:
label_projects_feedback_respond_success: Respond success label_projects_feedback_respond_success: Respond success
button_projects_feedback_respond: Respond button_projects_feedback_respond: Respond
label_projects_feedback_respond_content: Please input your words 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：

6
public/stylesheets/application.css
View File

@ -1,5 +1,5 @@
html {overflow-y:scroll;} 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;} 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;} #content h1, h2, h3, h4 {color: #555;}
@ -205,7 +205,7 @@ ul.tool li{list-style-type:none;
.font_lighter{ .font_lighter{
font-family:微软雅黑; font-family:微软雅黑;
color:#acaeb1; color:#acaeb1;
font-size:12px; font-size:13px;
} }
.font_lighter2{ .font_lighter2{
@ -1005,7 +1005,7 @@ margin-left:-10px;
/*end*/ /*end*/
.splitcontentright{float:right; width:49%;} .splitcontentright{float:right; width:49%;}
form {display: inline;} 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;} fieldset {border: 1px solid #e4e4e4; margin:0;}
legend {color: #484848;} legend {color: #484848;}
hr { width: 100%; height: 1px; background: #ccc; border: 0; color:#000000;} hr { width: 100%; height: 1px; background: #ccc; border: 0; color:#000000;}

19
public/themes/redpenny-master/stylesheets/application.css
View File

@ -51,7 +51,7 @@ only screen and (min-device-pixel-ratio: 2) {
body,#wrapper body,#wrapper
{ {
background-color:#fff; /*整体背景色ecfffb*/ background-color:#fff; /*整体背景色ecfffb*/
font-family:Helvetica,Arial,"Lucida Grande",verdana,sans-serif font-family:'微软雅黑'Helvetica,Arial,"Lucida Grande",verdana,sans-serif
} }
a a
@ -512,7 +512,7 @@ ul.projects li.root
h1,h2,h3,h4 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 h1
@ -910,7 +910,7 @@ input#issue_subject
textarea.wiki-edit textarea.wiki-edit
{ {
font-family:Cambria,Verdana,Serif; font-family:'微软雅黑'Cambria,Verdana,Serif; /*modify by men*/
font-size:larger font-size:larger
} }
@ -998,7 +998,7 @@ ol li ol li ol li
input[type="submit"] input[type="submit"]
{ {
font-family:Arial,Helvetica,sans-serif; font-family:'微软雅黑'Arial,Helvetica,sans-serif; /*modify by men*/
font-size:13px; font-size:13px;
color:#050505; color:#050505;
padding:5px 10px; padding:5px 10px;
@ -1089,7 +1089,7 @@ div.wiki-description {
margin-top: 10px; margin-top: 10px;
width: 470px; width: 470px;
max-height: 121px; max-height: 121px;
font-family: helvetica,arial,sans-serif; font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
@ -1104,7 +1104,7 @@ div.wiki-description {
float: left; float: left;
height: auto; height: auto;
width: 246px; width: 246px;
font-family: helvetica,arial,sans-serif; font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/
color: rgb(0, 0, 0); color: rgb(0, 0, 0);
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
@ -1225,7 +1225,7 @@ p.stats {
height: 18px; height: 18px;
width: 375px; width: 375px;
font-size: 13px; font-size: 13px;
font-family: helvetica,arial,sans-serif; font-family: '微软雅黑'; /*modify by men*/
line-height: 18px; line-height: 18px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -1238,7 +1238,7 @@ p.stats {
height: 18px; height: 18px;
width: 260px; width: 260px;
font-size: 13px; font-size: 13px;
font-family: helvetica,arial,sans-serif; font-family: '微软雅黑'helvetica,arial,sans-serif; /*modify by men*/
line-height: 18px; line-height: 18px;
} }
@ -1682,7 +1682,7 @@ div.project-search {
} }
div.project-search input[type="submit"] { div.project-search input[type="submit"] {
width: 40px; width: 40px;
font-family: Arial,Helvetica,sans-serif; font-family: '微软雅黑'Arial,Helvetica,sans-serif;
font-size: 12px; font-size: 12px;
color: rgb(5, 5, 5); color: rgb(5, 5, 5);
padding: 0px; padding: 0px;
@ -1733,6 +1733,7 @@ input[type='text'].noline {
.noline { .noline {
/*border-style: none; /*border-style: none;
border-color: white;*/ border-color: white;*/
font-family:微软雅黑; /*modify by men*/
border: #d5dee9 1px solid; border: #d5dee9 1px solid;
font-size: 12px; font-size: 12px;
color: #ACAEB1; color: #ACAEB1;