整个界面样式协调

app/views/news/index.html.erb

@@ -46,7 +46,7 @@
 <% end %> -->
 
 <!--add by huang :list news-->
-<div style="padding-top: 15px">
+<div>
 	<% if @newss.empty? %>
 	<p class="nodata">
 		<%= l(:label_no_data) %>

app/views/projects/homework.html.erb

@@ -1,17 +1,9 @@
 <!-- fq -->
-
+<!--modified by huang-->
-<div class="project-search-block">
+<div class="content-title-top">
-	<table width="100%" valign="center">
+	<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>		
-		<tr>
+		<%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %>			
-			<td width="16%"><span style="margin-left:0px"><%= l(:label_course_homework_list)%></span></td>
+	<% end %>
-			<td valign="center"><% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 3, 7)).size >0))%>
-	
-		<!-- <div class='icon icon-add'> -->
-			<%= link_to(l(:label_course_homework_new), {:controller => 'projects', :action => 'new_homework'}, :class => 'icon icon-add') %>
-			<!-- <%= toggle_link l(:label_new_call), 'put-bid-form', {:focus => 'project_id'} %> -->
-		<!-- </div> -->
-	<% end %></td> 
-	</tr></table>
 </div>
 <div id="bid-show">
 	<%= render :partial => 'bids/bid_homework_show', :locals => {:bids => @bids, :bid_pages => @bid_pages} %>

app/views/projects/show.html.erb

@@ -1,17 +1,15 @@
-<p>
+<% if @events_by_day.size >0 %>
-	<% if @events_by_day.size >0 %>
+	<div class="content-title-top-avtive">
-	<div style="padding-left: 8px">
+		<!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
-		<h3><!-- %= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe % --></h3>
 		<p class="subtitle">
 			<%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>
 		</p>
-		<div id="activity">
+		
-			<% @events_by_day.keys.sort.reverse.each do |day| %>
+			<% @events_by_day.keys.sort.reverse.each do |day| %>			
-			<h3></h3>
 			<div>
 				<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
-				<div class="issue-note">
+				<div>
-					<table width="660px" border="0" align="center" style="font-size: 14px;">
+					<table class="underline-evreycontent" style="font-size: 14px;">
 						<tr>
 							<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(e.event_author), :class => "avatar")%></td>
 							<td>
@@ -48,11 +46,10 @@
 				<ul>
 					<%= pagination_links_full @events_pages%>
 				</ul>
-			</div>
+			</div>		
-		</div>
 	</div>
-	<% else %>
+<% else %>
-<p class="font_description">
+<div class="font_description">
 	<table width="660">
 		<tr>
 			<td><%= image_tag(url_to_avatar(@user), :class => "avatar") %></td>
@@ -66,6 +63,5 @@
 			</table></td>
 		</tr>
 	</table>
-</p>
+</div>
 <% end %>
-</p>

app/views/users/_course_form.html.erb

@@ -1,3 +1,4 @@
+<div class="content_frame">
 <ul class="user_project_sort">				
 		<% for membership in @memberships %>		
 		<li>								
@@ -48,5 +49,6 @@
 		
 		<% end %>
 		
-	</ul>		
+	</ul>
+</div>			
 	<%= call_hook :view_account_left_bottom, :user => @user %>

app/views/users/_my_course.html.erb

@@ -1,4 +1,4 @@
-<div class="content_frame">
+<div class="content-title-top">
 <% if @memberships.empty? %>
 		<% if @user != User.current %>
 		<p class="font_description">

app/views/users/_my_joinedcourse.html.erb

@@ -1,4 +1,4 @@
-<div class="content_frame">
+<div class="content-title-top">
 <% if @memberships.empty? %>
 		<% if @user != User.current %>
 		<p class="font_description">

app/views/users/user_projects.html.erb

@@ -1,10 +1,11 @@
 <!--add by huang-->
 <p>温馨提示：项目可以是一次作业，也可以是别人或者自己创建的一项小工程~</p>
+<div class="content-title-top">
 <% if @user == User.current %>
 	<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new', :course => 0, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
 <% end %>
+</div>
 <p><%= watch_projects @state%>
-
 <% unless @memberships.empty? %>
 <div class="content_frame">
 <ul class="user_project_sort">

public/stylesheets/application.css

@@ -11,12 +11,25 @@ h4 {border-bottom: 1px dotted #bbb;}
 
 /*new by huang*/
 /**/
-.content-title-top{
+.underline-evreycontent{
+	margin-bottom: 10px;
+	border-bottom: 1px dashed rgb(204, 204, 204);
+	width: 660px;	
+}	
+	
+.content-title-top-avtive{
 	padding-bottom: 15px;
 	padding-left: 5px;
+	padding-top: 5px;
+}	
+	
+.content-title-top{
+	padding-bottom: 20px;
+	padding-left: 5px;
 }
 	
 .content-text-list{
+	margin-bottom: 10px;
 	border-bottom: 1px dashed rgb(204, 204, 204);
 	width: 580px; 	
 }

public/themes/redpenny-master/stylesheets/application.css

@@ -1204,8 +1204,7 @@ a.root {
 	padding-bottom: 10px;
 	margin-bottom: 0px;
 	/*background-color: #f5f5f5;*/
-	border-bottom: 1px solid #e3c3ca;
+	border-bottom: 1px dashed rgb(204, 204, 204);
-	border-bottom: 1px solid #e3c3ca;
 	/*-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
 	border-radius: 4px;