p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
baiyu 2013-08-30 20:04:04 +08:00
parent 8be0703b6e 47185bdcc2
commit e1006e14c3
7 changed files with 105 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/views/bids/_bid_show.html.erb
View File

@ -13,19 +13,25 @@
<tr> <tr>
<td width="500"> <td width="500">
<table border="0"> <table border="0">
<tr><td> <tr><td>
<% if bid.reward_type.nil? or bid.reward_type == 1%> <% if bid.reward_type.nil? or bid.reward_type == 1%>
<strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong>
<% elsif bid.reward_type == 2%> <% elsif bid.reward_type == 2%>
<strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
<% else %> <% else %>
<strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong>
<% end %> <% end %>
<span class="font_lighter">(<%= link_to bid.biding_projects.count, project_for_bid_path(bid)%>)<%= l(:label_biding_project) %></span>
<span class="font_lighter">(<%= link_to bid.commit, respond_path(bid)%>)<%= l(:label_responses) %></span> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> -->
<span class="font_lighter">(<%= link_to bid.watcher_users.count, respond_path(bid)%>)<%= l(:label_followers) %></span></td> </td>
</tr> </tr>
</table></td> <tr><td>
<span class="font_lighter"><%= l(:label_biding_project) %>(<strong><%=link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>
<span class="font_lighter"><%= l(:label_responses) %>(<strong><%=link_to bid.commit, respond_path(bid) %></strong>)</span>
<span class="font_lighter"><%= l(:label_followers) %>(<strong><%=link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span>
</td>
</tr>
</table></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td> <td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>
</tr> </tr>
<tr> <tr>

8
app/views/projects/_new_respond.html.erb Normal file
View File

@ -0,0 +1,8 @@
<%= form_tag({:controller => 'projects',
:action => 'project_respond'}) do %>
<%= text_area_tag 'project_respond', "", :class => 'noline', :required => true, :style => "resize: none;", :rows => 6, :placeholder => l(:label_projects_feedback_respond_content) %>
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn"%> </td>
<%end%>

0
app/views/projects/project_respond.html.erb Normal file
View File

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

@ -6,7 +6,7 @@
<li> <li>
<table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;"> <table width="660" border="0" align="center" style="border-bottom: 1px dashed rgb(204, 204, 204); margin-bottom: 10px;">
<tr> <tr>
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar') %></td> <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(membership.project), :class => 'avatar'), project_path(membership.project) %></td>
<td> <td>
<table width="580" border="0"> <table width="580" border="0">
<tr> <tr>

12
app/views/users/watch_bids.html.erb
View File

@ -23,12 +23,16 @@
<strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong>
<% else %> <% else %>
<strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong>
<% end %></td> <% end %>
<!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> -->
<td class="font_lighter">(<%= bid.biding_projects.count%>)<%= l(:label_biding_project) %></td> </td>
<td class="font_lighter">(<%= bid.commit %>)<%= l(:label_responses) %></td> </tr>
<td class="font_lighter">(<%= bid.watcher_users.count%>)<%= l(:label_followers) %></td> <tr><td>
<span class="font_lighter"><%= l(:label_biding_project) %>(<strong><%=link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span>
<span class="font_lighter"><%= l(:label_responses) %>(<strong><%=link_to bid.commit, respond_path(bid) %></strong>)</span>
<span class="font_lighter"><%= l(:label_followers) %>(<strong><%=link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span>
</td>
</tr> </tr>
</table></td> </table></td>
<td width="220" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td><!-- modified by ming --> <td width="220" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td><!-- modified by ming -->

115
public/stylesheets/application.css
View File

@ -166,7 +166,7 @@ ul.tool li{list-style-type:none;
.font_welcome_trustie{ .font_welcome_trustie{
font-family:Impact; font-family:Impact;
font-weight: regular; font-weight: regular;
font-size: 25px; /* modified by bai */ font-size: 29px;
color:#15bccf; color:#15bccf;
} }
@ -176,14 +176,11 @@ ul.tool li{list-style-type:none;
color: #5c5c5c; color: #5c5c5c;
} }
/*modified by bai*/
.font_welcome_tdescription{ .font_welcome_tdescription{
font-family: 宋体; font-family: 微软雅黑;
font-weight: bold; font-size: 20px;
font-size: 18px; /* modified by bai */ color: #5c5c5c;
color: #777;
} }
/* end */
.font_welcome_Edescription{ .font_welcome_Edescription{
font-family: Default; font-family: Default;
@ -191,16 +188,13 @@ ul.tool li{list-style-type:none;
color: #9a9a9a; color: #9a9a9a;
} }
/* modified by bai */
.font_welcome_feature{ .font_welcome_feature{
font-family:宋体; font-family:微软雅黑;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 16px;
color:#09b2c8; color:#09b2c8;
padding-top: 50px; padding-top: 50px;
} }
/* end */
.info_font{ .info_font{
padding-left: 8px; padding-left: 8px;
font-family:微软雅黑; font-family:微软雅黑;
@ -635,9 +629,7 @@ ul.newprojects2 li{
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
white-space:nowrap; white-space:nowrap;
} }
#top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
/* modified by bai*/
#top-menu a {color: #fff; margin-right: 20px; font-weight: bold;}
#top-menu #loggedas #top-menu #loggedas
{ {
float: right; float: right;
@ -1030,12 +1022,7 @@ blockquote {
margin-left: 1.4em; margin-left: 1.4em;
margin-right: 0.4em; margin-right: 0.4em;
font-family: 微软雅黑; font-family: 微软雅黑;
background: url(/images/requirements/reference.jpg); background: url(/images/requirements/reference.jpg)
/*added by bai*/
border-radius: 5px; /*引用回复框变圆角*/
/*end*/
} }
blockquote blockquote { margin-left: 0;} blockquote blockquote { margin-left: 0;}
@ -1439,44 +1426,76 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
#roadmap table.progress td { height: 1.2em; } #roadmap table.progress td { height: 1.2em; }
/***** Tabs *****/ /***** Tabs *****/
/**
#content .tabs_new {height: 2.6em; margin-bottom:1.2em; margin-top: 0.8em; position:relative; overflow:hidden;}
#content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left: 0.5em; width: 2000px; border-bottom: 1px solid #15BCCF;}
#content .tabs_new ul li {
width:75px;
float:left;
list-style-type:none;
white-space:nowrap;
margin-right:4px;
background:#fff;
position:relative;
margin-bottom:-1px;
}
#content .tabs_new ul li a{
display:block;
font-size: 14px;
text-decoration:none;
line-height:1.2em;
padding-top: 6px;
padding-bottom: 2px;
text-align: center;
border: 1px solid #15BCCF;
border-bottom: 0px solid #15BCCF;
background-color: #fff;
color:#999;
font-weight:bold;
border-top-left-radius:4px;
border-top-right-radius:4px;
}
**/
#content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;} #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em;} #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width:2000px; border-bottom: 1px solid #15BCCF;}
#content .tabs ul li { #content .tabs ul li {
float:left; float:left;
list-style-type:none; list-style-type:none;
white-space:nowrap; white-space:nowrap;
margin-right:0px; margin-right:0px;
background:#fff; background:#fff;
position:relative; position:relative;
margin-bottom:5px; margin-bottom:-1px;
} }
#content .tabs ul li a{ #content .tabs ul li a{
display:block;
font-size: 0.9em; font-size: 0.9em;
text-decoration:none; text-decoration: none;
line-height:1.3em; line-height:1.3em;
padding:2px 6px 2px 6px; padding:2px 6px 2px 6px;
border: 1px solid #ccc; background-color:#fff;
border-bottom: 1px solid #bbbbbb; color:#606060;
background-color:#DEEBF0;
color:#999;
font-weight:bold; font-weight:bold;
border-top-left-radius:3px; border-top-left-radius:3px;
border-top-right-radius:3px; border-top-right-radius:3px;
} }
#content .tabs ul li a:hover { #content .tabs ul li a:hover {
background-color: #cacbcb; background-color: #fff;
text-decoration:none; text-decoration:none;
} }
#content .tabs ul li a.selected { #content .tabs ul li a.selected {
background-color: #fff; background-color: #fff;
border: 1px solid #bbbbbb; border: 1px solid #15BCCF;
border-bottom: 1px solid #BBBBBB;
color:#111; color:#111;
} }
#content .tabs ul li a.selected:hover {background-color: #E5DFC7;} #content .tabs ul li a.selected:hover {background-color: #E2F4FF;}
div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; } div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
@ -1505,9 +1524,10 @@ button.tab-right {
} }
/*added by young*/ /*added by young*/
/***** Settings Tabs *****/ /***** Settings Tabs *****/
#content .tabs_new {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;} #content .tabs_new {height: 2.6em; margin-bottom:1.2em; margin-top: 0.8em; position:relative; overflow:hidden;}
#content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;} #content .tabs_new ul {margin:0; position:absolute; bottom:0; padding-left: 0.5em; width: 2000px; border-bottom: 1px solid #15BCCF;}
#content .tabs_new ul li { #content .tabs_new ul li {
width:75px;
float:left; float:left;
list-style-type:none; list-style-type:none;
white-space:nowrap; white-space:nowrap;
@ -1518,27 +1538,30 @@ button.tab-right {
} }
#content .tabs_new ul li a{ #content .tabs_new ul li a{
display:block; display:block;
font-size: 0.9em; font-size: 14px;
text-decoration:none; text-decoration:none;
line-height:1.3em; line-height:1.2em;
padding:4px 6px 4px 6px; padding-top: 6px;
border: 1px solid #ccc; padding-bottom: 2px;
border-bottom: 1px solid #bbbbbb; text-align: center;
background-color: #f6f6f6;
color:#999; border: 1px solid #15BCCF;
/*border-bottom: 0px solid #15BCCF;*/
background-color: #fff;
color:#606060;
font-weight:bold; font-weight:bold;
border-top-left-radius:3px; border-top-left-radius:4px;
border-top-right-radius:3px; border-top-right-radius:4px;
} }
#content .tabs_new ul li a:hover { #content .tabs_new ul li a:hover {
background-color: #cacbcb; background-color: #E2F4FF;
text-decoration:none; text-decoration:none;
} }
#content .tabs_new ul li a.selected { #content .tabs_new ul li a.selected {
background-color: #fff; background-color: #fff;
border: 1px solid #bbbbbb; border: 1px solid #15BCCF;
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
color:#111; color:#111;
} }

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

@ -367,13 +367,13 @@ ul.projects li.root
{ {
background-color:#fff; /*顶层导航颜色*/ background-color:#fff; /*顶层导航颜色*/
color: #fff; color: #fff;
font-size:13px; /* modified by bai*/ font-size:15px;
font-family: 宋体; font-family: 微软雅黑;
position:relative; position:relative;
padding:0; padding:0;
height:1px; height:1px;
padding-top:0; padding-top:0;
/* modified by bai*/ /*by bai*/
border-radius: 5px;/*导航栏边角变圆*/ border-radius: 5px;/*导航栏边角变圆*/
/*end*/ /*end*/
} }
@ -431,7 +431,7 @@ ul.projects li.root
{ {
width:680px; width:680px;
float:right; float:right;
background-color: #FFFFFF background-color: #FFFFFF;
} }
#content .wiki img #content .wiki img
@ -1001,7 +1001,7 @@ input[type="submit"]
font-family:Arial,Helvetica,sans-serif; font-family:Arial,Helvetica,sans-serif;
font-size:13px; font-size:13px;
color:#050505; color:#050505;
padding:2px 7px;/*modified by ming*/ padding:5px 10px;
background:-moz-linear-gradient(top,#fff 0%,#ebebeb 50%,#dbdbdb 50%,#b5b5b5); background:-moz-linear-gradient(top,#fff 0%,#ebebeb 50%,#dbdbdb 50%,#b5b5b5);
background:-webkit-gradient(linear,left top,left bottom,from(#fff),color-stop(0.50,#ebebeb),color-stop(0.50,#dbdbdb),to(#b5b5b5)); background:-webkit-gradient(linear,left top,left bottom,from(#fff),color-stop(0.50,#ebebeb),color-stop(0.50,#dbdbdb),to(#b5b5b5));
-moz-border-radius:4px; -moz-border-radius:4px;
@ -1013,7 +1013,6 @@ input[type="submit"]
box-shadow:0 1px 3px rgba(000,000,000,0.2),inset 0 0 2px rgba(255,255,255,1); box-shadow:0 1px 3px rgba(000,000,000,0.2),inset 0 0 2px rgba(255,255,255,1);
text-shadow:0 -1px 0 rgba(000,000,000,0.2),0 1px 0 rgba(255,255,255,1); text-shadow:0 -1px 0 rgba(000,000,000,0.2),0 1px 0 rgba(255,255,255,1);
cursor:pointer cursor:pointer
} }
html > body #content html > body #content
@ -1339,7 +1338,7 @@ div.pagination {
margin: 25px 0px; margin: 25px 0px;
height: 36px; height: 36px;
text-align: left; text-align: left;
font-size: 11px; /* bai */ font-size: 13px;
} }
div.pagination ul { div.pagination ul {
@ -1740,7 +1739,6 @@ input[type='text'].noline {
padding: 9px 5px; padding: 9px 5px;
width: 98%; width: 98%;
cursor: text; cursor: text;
border-radius: 4px; /* added by bai */
} }
.grayline{ .grayline{
border: #d5dee9 1px solid; border: #d5dee9 1px solid;