add activityBox to project/course/contest html

app/views/bids/contest.html.erb

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

app/views/projects/course.html.erb

@@ -2,7 +2,6 @@
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<!-- modified by huang -->
 <div class="top-content">
 	<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %>
 	<table width="940px">
@@ -31,7 +30,12 @@
 	</table>
 	<% end %>
 </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)%>
 

app/views/projects/index.html.erb

@@ -2,12 +2,11 @@
 <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<!-- modified by huang -->
 <div class="top-content">
 	<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %>
 	<table width="940px">
 		<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 rowspan="2">
 			<% if User.current.logged? %>
@@ -29,8 +28,11 @@
 	</table>
 	<% end %>
 </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) %>
 <div id="projects-index">
 	<%= render_project_hierarchy(@projects)%>

public/stylesheets/nyan.css

@@ -11,6 +11,9 @@
 .ph10_5{ /*padding horizontal 10% 5%*/
   padding: 0px 5% 0px 10%;
 }
+.clear_both{
+  clear: both;
+}
 * {
   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;
   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%;
+}