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

1234

This commit is contained in:
nieguanghui 2013-12-16 16:46:01 +08:00
parent 8043c527ce
commit 41fd14c074
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base_bids.html.erb
View File

@ -70,10 +70,10 @@
<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td> <td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
</tr> </tr>
<tr> <tr>
<td align="center"> <%= watcher_link(@bid, User.current) %></td> <td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td>
</tr> </tr>
<tr> <tr>
<td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td> <td align="center"> <span style="margin-right:10px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span></td>
</tr> </tr>
</table></td> </table></td>
</tr> </tr>

5
app/views/layouts/base_contest.html.erb
View File

@ -65,8 +65,9 @@
</tr> </tr>
<tr colspan='3'> <tr colspan='3'>
<td valign="middle"> <td valign="middle">
<%= join_in_contest(@bid, User.current)%> <span style="display:block; margin-left:20px;"><%= join_in_contest(@bid, User.current)%></span>
<%= watcher_link(@bid, User.current) %> <!-- <%= link_to("选为作业", fork_path(@bid)) %> --></td> <span style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span>
</td>
</tr> </tr>
</table> </table>
<!-- added by bai 增加了竞赛的配置 --> <!-- added by bai 增加了竞赛的配置 -->

3
app/views/layouts/base_projects.html.erb
View File

@ -62,7 +62,8 @@
<div class="info-course"> <div class="info-course">
<%= @project.name %> <%= @project.name %>
</div> </div>
<div style="text-align: center;"> <div style="margin-left: 20px;">
<span class="icon-fav icon"></span>
<% unless User.current.member_of? @project %> <% unless User.current.member_of? @project %>
<span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %> <span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
<% end %> <% end %>

2
app/views/welcome/index.html.erb
View File

@ -1,5 +1,5 @@
<!--add by huang--> <!--add by huang-->
<div style="height:200px;"> <div style="height:220px;">
<div class="welcome_left" style="margin-top: 60px"> <div class="welcome_left" style="margin-top: 60px">
<table width="388px"> <table width="388px">
<tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr> <tr><td><span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %> </span><span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_description) %></span></td></tr>

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

@ -1869,7 +1869,7 @@ input[type='text'].noline {
font-size: 12px; font-size: 12px;
color: #818283; # modified by bai color: #818283; # modified by bai
padding: 9px 5px; padding: 9px 5px;
width: 85%; width: 98%;
cursor: text; cursor: text;
border-radius: 4px; /*# added by bai (边框变圆润)*/ border-radius: 4px; /*# added by bai (边框变圆润)*/
} }