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

add activityBox to project/course/contest html

This commit is contained in:
yanxd 2014-01-13 08:23:35 +08:00
parent 289b0581df
commit 3d2c0ba721
4 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/bids/contest.html.erb
View File

@ -1,5 +1,3 @@
<!-- huang-->
<!-- modified by huang -->
<div class="top-content"> <div class="top-content">
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> <%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %>
<table width="940px"> <table width="940px">
@ -28,7 +26,6 @@
</table> </table>
<% end %> <% end %>
</div> </div>
<!-- end -->
@ -46,6 +43,9 @@
<!-- </ul> <!-- </ul>
</div> --> </div> -->
<% if @bids.size > 0%> <% if @bids.size > 0%>
<div class="project_acts">
</div>
<%= sort_contest(@s_state)%> <%= sort_contest(@s_state)%>
<div id="bid-show"> <div id="bid-show">
<%= render :partial => 'contest_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %> <%= render :partial => 'contest_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>

8
app/views/projects/course.html.erb
View File

@ -2,7 +2,6 @@
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %> <% end %>
<!-- modified by huang -->
<div class="top-content"> <div class="top-content">
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> <%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
<table width="940px"> <table width="940px">
@ -31,7 +30,12 @@
</table> </table>
<% end %> <% end %>
</div> </div>
<!-- end --> <!-- activity box -->
<div class="project_acts">
<div class="project_acts_left"></div>
<div class="project_acts_right">aaaa</div>
</div>
<div class="clear_both"></div>
<%= sort_course(@s_type, @project_type)%> <%= sort_course(@s_type, @project_type)%>

10
app/views/projects/index.html.erb
View File

@ -2,12 +2,11 @@
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %> <% end %>
<!-- modified by huang -->
<div class="top-content"> <div class="top-content">
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> <%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
<table width="940px"> <table width="940px">
<tr> <tr>
<td class="info_font" style="width: 220px; color: #15bccf""><%= l(:label_project_deposit) %></td> <td class="info_font" style="width: 220px; color: #15bccf"><%= l(:label_project_deposit) %></td>
<td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td> <td class="location-list"><strong><%= l(:label_user_location) %> :</strong></td>
<td rowspan="2"> <td rowspan="2">
<% if User.current.logged? %> <% if User.current.logged? %>
@ -29,8 +28,11 @@
</table> </table>
<% end %> <% end %>
</div> </div>
<!-- end --> <div class="project_acts ">
<div class="project_acts_left"></div>
<div class="project_acts_right">a</div>
</div>
<div class="clear_both"></div>
<%= sort_project(@s_type, @project_type) %> <%= sort_project(@s_type, @project_type) %>
<div id="projects-index"> <div id="projects-index">
<%= render_project_hierarchy(@projects)%> <%= render_project_hierarchy(@projects)%>

19
public/stylesheets/nyan.css
View File

@ -11,6 +11,9 @@
.ph10_5{ /*padding horizontal 10% 5%*/ .ph10_5{ /*padding horizontal 10% 5%*/
padding: 0px 5% 0px 10%; padding: 0px 5% 0px 10%;
} }
.clear_both{
clear: both;
}
* { * {
font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif; font-family: Helvetica, Tahoma, Arial, "Microsoft YaHei", "微软雅黑", SimSun, "宋体", STXihei, "华文细黑", Heiti, "黑体", sans-serif;
} }
@ -341,3 +344,19 @@ table.content-text-list tbody tr td.locked, div.memo-section .locked{
font-size: 1.5em; font-size: 1.5em;
padding-left: 4%; padding-left: 4%;
} }
/* xx动态框
*******************************************************************************/
.project_acts *{border:1px solid #000000;}
.project_acts{
height: 250px;
}
.project_acts .project_acts_left{
float: left;
height: 100%;
width: 61%;
}
.project_acts .project_acts_right{
height: 100%;
margin-left: 61%;
}