From 89f01e2aba5719798a7fc2b136969e2e6848e355 Mon Sep 17 00:00:00 2001 From: xianbo Date: Tue, 12 Nov 2013 10:31:21 +0800 Subject: [PATCH 1/2] modify the show of messages --- app/views/words/_message.html.erb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb index 73cf8b127..e45c72662 100644 --- a/app/views/words/_message.html.erb +++ b/app/views/words/_message.html.erb @@ -9,12 +9,17 @@ - + From 7935520612433da3f9bd3405176cce1d78d4211d Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Tue, 12 Nov 2013 10:44:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=B9=E8=AF=BE=E7=A8=8B=E3=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E3=80=81=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E5=BD=93=E5=89=8D=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=81=9A=E4=BA=86=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 8 ++++---- app/views/layouts/base_projects.html.erb | 2 +- public/stylesheets/application.css | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 08495e5e3..9a7e29f16 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -32,9 +32,9 @@ - +
<%= link_to journal.user, user_path(journal.user)%> <% if @user == User.current %> <%= l(:label_leave_me_message) %> <% else %> <%= l(:label_leave_others_message) %> <% end %> <%= link_to journal.user, user_path(journal.user)%> + <% if @user == User.current %> + <%= l(:label_leave_me_message) %> + <% else %> + <%= l(:label_leave_others_message) %> + <% end %>
-

- <%= textilizable journal.notes%> +

+ <%= h journal.notes%>

<%= link_to "forge.trustie.net/courses", :controller => 'projects', :action => 'course'%><%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > - <%= link_to(@bid.courses.first.name,project_path(@bid.courses.first)) %> > - <%=link_to(@bid.name, respond_path(@bid))%>

<%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > + <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %> > + <%=link_to(@bid.name, respond_path(@bid)) %>
@@ -48,7 +48,7 @@ 课程名： - <%= link_to @bid.courses.first.name,project_path(@bid.courses.first) %> + <%= link_to @bid.courses.first.name, homework_project_path(@bid.courses.first) %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 80457af33..333702f25 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -41,7 +41,7 @@ <%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'index', :project_type => 0 %> - <%=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) %> +

<%=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) %>

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 78007094c..9642b4e1e 100644 --- a/public/stylesheets/application.css +++ b/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);