parent
482600e2ed
commit
a04528116c
|
|
@ -55,7 +55,7 @@
|
|||
<legend onclick="toggleFieldset(this);">
|
||||
<%= l(:field_mail_notification)%>
|
||||
</legend>
|
||||
<div>
|
||||
<div style="padding-left: 26px;"> <!-- modified by ming -->
|
||||
<p style="width:380px;>
|
||||
<%= render :partial => 'users/mail_notifications' %>
|
||||
</p></div>
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
<legend onclick="toggleFieldset(this);">
|
||||
<%= l(:label_preferences)%>
|
||||
</legend>
|
||||
<div>
|
||||
<div style="padding-left: 26px;"> <!-- modified by ming -->
|
||||
<%= render :partial => 'users/preferences' %></div>
|
||||
</fieldset>
|
||||
<!-- added by william -->
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
</p></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="left"><span class="font_lighter"> <%= format_date(membership.created_on) %></span></td>
|
||||
<td align="left"><span class="font_lighter"> <%= format_time(membership.created_on) %></span></td><!-- modified by ming -->
|
||||
<td align="right" ><%= h membership.roles.sort.collect(&:to_s).join(', ') %> </td>
|
||||
</tr>
|
||||
</table></td>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<td class="font_lighter">(<%= bid.watcher_users.count%>)<%= l(:label_followers) %></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
<td width="200" align="right" class="a"><a class="font_lighter"> <%= format_time bid.created_on %></a></td>
|
||||
<td width="220" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td><!-- modified by ming -->
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -186,24 +186,27 @@ software development and software crowdsourcing.</td></tr>
|
|||
<% else %>
|
||||
<div>
|
||||
<!--info-->
|
||||
<table width="200" border="0">
|
||||
|
||||
<!-- modified by bai -->
|
||||
<table width="200" border="0">
|
||||
<tr>
|
||||
<td colspan="2" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
|
||||
<td colspan="2" align="center" class="font_welcome_Cdescription" ><%= l(:label_welcome) %> <strong class="font_small_watch" style=" word-wrap: break-word; word-break: break-all"><%=link_to User.current.lastname<<User.current.firstname, user_path(User.current) %></strong> <%= l(:label_join) %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td rowspan="2" align="left"><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %></td>
|
||||
|
||||
<td rowspan="2" style="padding-left: 20px"><%=link_to image_tag(url_to_avatar(User.current), :class => 'avatar'), user_path(User.current) %></td>
|
||||
<td><strong class="font_small_watch"><%= link_to l(:label_user_watcher)+"("+User.watched_by(User.current).count.to_s+")", user_path(User.current) %></strong> 
|
||||
<strong class="font_small_watch"><%=link_to l(:label_user_fans)+"("+User.current.watcher_users(User.current.id).count.to_s+")", user_path(User.current) %></strong></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><% unless User.current.memberships.empty? %>
|
||||
<%= l(:label_welcome_participate) %> (<strong class="font_small_watch"><%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %></strong>) <%= l(:label_welcome_participate_project)%>
|
||||
<td align="left"><% unless User.current.memberships.empty? %>
|
||||
<%= l(:label_welcome_participate) %> <strong class="font_small_watch"><%= link_to User.current.memberships.count, {:controller => 'users', :action => 'user_projects', :id => User.current} %></strong> <%= l(:label_welcome_participate_project)%>
|
||||
<!-- <% for member in User.current.memberships %>
|
||||
<%= link_to_project(member.project) %><%= (User.current.memberships.last == member) ? '' : '，' %>
|
||||
<% end %> --> <% end %></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<!-- end -->
|
||||
</div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
<style>
|
||||
input[type="submit"].bid_btn {
|
||||
vertical-align: middle;
|
||||
width: 60px;
|
||||
height: 30px;
|
||||
line-height: 18px;
|
||||
width: 47px;/*modified by ming*/
|
||||
height: 20px;
|
||||
line-height: 19px;
|
||||
font-size: 14px;
|
||||
color: rgb(0, 0, 0);
|
||||
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
||||
background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/
|
||||
padding: 0px 0px 4px 0px;
|
||||
border-radius: 2px;
|
||||
border: 1px solid rgb(148, 148, 148);
|
||||
|
|
@ -17,12 +17,12 @@
|
|||
/*margin-right: -4px;*/
|
||||
}
|
||||
input[type="button"].bid_btn {
|
||||
width: 60px;
|
||||
height: 30px;
|
||||
line-height: 18px;
|
||||
width: 47px;/*modified by ming*/
|
||||
height: 20px;
|
||||
line-height: 19px;
|
||||
font-size: 14px;
|
||||
color: rgb(0, 0, 0);
|
||||
background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
|
||||
background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/
|
||||
padding: 0px 0px 4px 0px;
|
||||
border-radius: 2px;
|
||||
border: 1px solid rgb(148, 148, 148);
|
||||
|
|
|
|||
|
|
@ -1348,4 +1348,4 @@ zh:
|
|||
label_user_all_respond: 所有反馈
|
||||
label_layouts_feedback: 留言
|
||||
label_welcome_participate: 参与了
|
||||
label_welcome_participate_project: 个项目！
|
||||
label_welcome_participate_project: 个项目
|
||||
|
|
@ -166,7 +166,7 @@ ul.tool li{list-style-type:none;
|
|||
.font_welcome_trustie{
|
||||
font-family:Impact;
|
||||
font-weight: regular;
|
||||
font-size: 29px;
|
||||
font-size: 25px; /* modified by bai */
|
||||
color:#15bccf;
|
||||
}
|
||||
|
||||
|
|
@ -176,11 +176,14 @@ ul.tool li{list-style-type:none;
|
|||
color: #5c5c5c;
|
||||
}
|
||||
|
||||
/*modified by bai*/
|
||||
.font_welcome_tdescription{
|
||||
font-family: 微软雅黑;
|
||||
font-size: 20px;
|
||||
color: #5c5c5c;
|
||||
font-family: 宋体;
|
||||
font-weight: bold;
|
||||
font-size: 18px; /* modified by bai */
|
||||
color: #777;
|
||||
}
|
||||
/* end */
|
||||
|
||||
.font_welcome_Edescription{
|
||||
font-family: Default;
|
||||
|
|
@ -188,13 +191,16 @@ ul.tool li{list-style-type:none;
|
|||
color: #9a9a9a;
|
||||
}
|
||||
|
||||
/* modified by bai */
|
||||
.font_welcome_feature{
|
||||
font-family:微软雅黑;
|
||||
font-family:宋体;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
font-size: 20px;
|
||||
color:#09b2c8;
|
||||
padding-top: 50px;
|
||||
}
|
||||
/* end */
|
||||
|
||||
.info_font{
|
||||
padding-left: 8px;
|
||||
font-family:微软雅黑;
|
||||
|
|
@ -629,7 +635,9 @@ ul.newprojects2 li{
|
|||
padding: 0px 0px 0px 0px;
|
||||
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
|
||||
{
|
||||
float: right;
|
||||
|
|
@ -1022,7 +1030,12 @@ blockquote {
|
|||
margin-left: 1.4em;
|
||||
margin-right: 0.4em;
|
||||
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;}
|
||||
|
|
|
|||
|
|
@ -367,13 +367,13 @@ ul.projects li.root
|
|||
{
|
||||
background-color:#fff; /*顶层导航颜色*/
|
||||
color: #fff;
|
||||
font-size:15px;
|
||||
font-family: 微软雅黑;
|
||||
font-size:13px; /* modified by bai*/
|
||||
font-family: 宋体;
|
||||
position:relative;
|
||||
padding:0;
|
||||
height:1px;
|
||||
padding-top:0;
|
||||
/*by bai*/
|
||||
/* modified by bai*/
|
||||
border-radius: 5px;/*导航栏边角变圆*/
|
||||
/*end*/
|
||||
}
|
||||
|
|
@ -1013,6 +1013,7 @@ input[type="submit"]
|
|||
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);
|
||||
cursor:pointer
|
||||
|
||||
}
|
||||
|
||||
html > body #content
|
||||
|
|
@ -1338,7 +1339,7 @@ div.pagination {
|
|||
margin: 25px 0px;
|
||||
height: 36px;
|
||||
text-align: left;
|
||||
font-size: 13px;
|
||||
font-size: 11px; /* bai */
|
||||
}
|
||||
|
||||
div.pagination ul {
|
||||
|
|
@ -1739,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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue