Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/views/layouts/base_homework.html.erb

@@ -32,9 +32,9 @@
 								</tr>
 								<tr>
 									<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/courses", :controller => 'projects', :action => 'course'%></a></td>
-									<td ><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > 
-										<span><%= link_to(@bid.courses.first.name,project_path(@bid.courses.first)) %></span> > 
-										<%=link_to(@bid.name, respond_path(@bid))%></td>
+									<td><p class="top-content-list-homework"><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > 
+										<span><%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %></span> > 
+										<%=link_to(@bid.name, respond_path(@bid)) %></p></td>
 								</tr>
 							</table>							
 						</div>
@@ -48,7 +48,7 @@
 											<tr valign="top">
 												<td style="width: 70px" >课程名：</td>
 												<td>
-													<span style=" word-wrap: break-word; word-break: break-all"><strong> <%= link_to @bid.courses.first.name,project_path(@bid.courses.first) %></strong></span>
+													<span style=" word-wrap: break-word; word-break: break-all"><strong> <%= link_to @bid.courses.first.name, homework_project_path(@bid.courses.first) %></strong></span>
 												</td>
 											</tr>
 											<tr style="">

app/views/layouts/base_projects.html.erb

@@ -41,7 +41,7 @@
 								</tr>
 								<tr>
 									<td style="padding-left: 8px"><a><%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %></a></td>
-									<td ><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index', :project_type => 0 %> > <%=link_to @project, project_path(@project) %></td>
+									<td><p class="top-content-list"><%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index', :project_type => 0 %> > <%=link_to @project, project_path(@project) %></p></td>
 								</tr>
 							</table>							
 						</div>

app/views/words/_message.html.erb

@@ -9,12 +9,17 @@
 		<td>
 		<table width="580px" border="0">
 			<tr>
-				<td colspan="2" valign="top"><strong> <%= link_to journal.user, user_path(journal.user)%></strong> <% if @user == User.current %> <span class="font_lighter"><%= l(:label_leave_me_message) %></span> <% else %> <span class="font_lighter"><%= l(:label_leave_others_message) %></span> <% end %> </td>
+				<td colspan="2" valign="top"><strong> <%= link_to journal.user, user_path(journal.user)%></strong>
+					 <% if @user == User.current %> 
+					 	<span class="font_lighter"><%= l(:label_leave_me_message) %></span>
+					 <% else %> 
+					 	<span class="font_lighter"><%= l(:label_leave_others_message) %></span> 
+					 <% end %> </td>
 			</tr>
 			<tr>
 				<td colspan="2" width="580px" >
-				<p class="font_description">
-					<%= textilizable journal.notes%>
+				<p class="info-break">
+					<%= h journal.notes%>
 				</p></td>
 			</tr>
 			<tr>

public/stylesheets/application.css

@@ -60,6 +60,14 @@ h4 {border-bottom: 1px dotted #bbb;}
 	text-overflow: ellipsis;	
 }
 
+.top-content-list-homework{
+	width: 650px; 	
+	white-space: nowrap;
+	overflow: hidden;
+	-o-text-overflow: ellisis;
+	text-overflow: ellipsis;	
+}
+
 /*added by bai*/
 .top-course-content{
 	background-color: rgb(181,227, 251);