jasder
/
trustieforge
forked from jacknudt/trustieforge
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

修改了不合理的地方

This commit is contained in:
baiyu 2013-08-31 21:45:20 +08:00
parent 3b2bad9d22
commit 844f1d2dcf
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<% when 'Bid' %>
<tr>
<% if e.user == User.current%>
<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>
<td colspan="2" valign="top"><strong> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %></strong><span class="font_lighter"><%= l(:label_i_new_activity) %></span> <%= link_to format_activity_title("#{l(:label_active_call)}##{act.id}:#{act.name}"), respond_path(e.act_id) %></td>
<% else %>
<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 %>

12
config/locales/en.yml
View File

@ -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

7
public/stylesheets/application.css
View File

@ -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;}

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

@ -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;