From d0743e4dbf78004a0af1ec8d93767869b5939a47 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 1 Sep 2015 16:48:56 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=8F=8F=E8=BF=B0=E5=A2=9E=E5=8A=A0html=5Fsa?=
=?UTF-8?q?fe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/journals_helper.rb | 2 +-
app/views/users/_user_activities.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 0eee08b6b..1a0b9ca0d 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -116,7 +116,7 @@ module JournalsHelper
end
end
#content << content_tag('div', links.join(' ').html_safe, :class => 'contextual', :style => 'margin-top:-25px;') unless links.empty?
- content << textilizable(journal, :notes)
+ content << textAreailizable(journal, :notes)
css_classes = "wiki"
css_classes << " editable" if editable
content_tag('div', content.html_safe, :id => "journal-#{journal.id}-notes", :class => css_classes ,:style => "width:510px")
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2dcdd04cf..661e0eade 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -61,4 +61,4 @@
<% end %>
<% end %>
- <%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
From ed4153faeff3da3d28da5f5481fa5a999f920744 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Tue, 1 Sep 2015 17:21:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/courses.css | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 217464dc7..d9d5bfd36 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -126,7 +126,7 @@ a.re_de{ color:#6883b6; margin-left:15px;}
/* 作业列表 */
.ttl{ }
.ctt{clear:both; }
-#contentbox{float:right;clear:both;width:730px;/*滑动门的宽度*/}
+#contentbox{float:right;clear:both;width:670px;/*滑动门的宽度*/}
/* TAB 切换效果 */
.tb_{ background-color: #eaeaea; height:40px; }
.tb_ ul{height:40px; }
@@ -161,7 +161,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
.dis ul li.wping{margin-left:12px; }
.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:22px; background:#15bccf; color:#fff; text-align:center; padding-top:4px;}
.dis ul li.wping a:hover{ background-color:#03a1b3;}
-.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:725px; margin-bottom:10px;}
+.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:665px; margin-bottom:10px;}
.code_list a{ color:#787878;}
.fr{ float:right;}
.c_grey{ color:#999; font-weight:normal;}
@@ -634,7 +634,7 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.w80{ width:80px;}
.t_c{ text-align:center;}
-.hwork_tit{ width:230px; float:left; }
+.hwork_tit{ width:210px; float:left; }
.hwork_tit a{ width:205px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
.hwork_tit_une{ width:270px; float:left; }
.hwork_tit_une a{ width:265px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
@@ -642,10 +642,10 @@ a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
.hwork_code02{ width:60px; text-align:center; }
.hwork_tit_e{ width:420px; float:left; }
.hwork_tit_e a{ width:405px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
-.hwork_num{ width:110px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_num{ width:95px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
.mr18{ margin-right:18px;}
a.hwork_center{ display:block; width:60px; margin-right:5px;overflow: hidden; white-space: nowrap; text-overflow:ellipsis;}
-.hwork_name{ display:block;width:100px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
+.hwork_name{ display:block;width:85px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
.absence_penalty{ display:block;width:45px; overflow: hidden;white-space: nowrap; text-overflow:ellipsis;min-height: 1px;}
.border_ce {border: 1px solid #e4e4e4;}
.show_hwork{ border:2px solid #64bdd9; width:646px; padding:10px; color:#666666; padding-bottom:0px; }
From 7276b5685ea74599dfc1f1d8e095c87389c8f7e6 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Tue, 1 Sep 2015 17:31:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=A8=E6=83=85=E6=A1=86=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/_course_message.html.erb | 4 ++--
app/views/users/_course_news.html.erb | 4 ++--
app/views/users/_project_issue.html.erb | 4 ++--
app/views/users/_project_message.html.erb | 4 ++--
app/views/users/user_newfeedback.html.erb | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 85e958253..a2ff03dd2 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -76,8 +76,8 @@
- 取消
- 发送
+ 取消
+ 发送
<% end%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 669c67ded..42475fde1 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -51,8 +51,8 @@
- 取消
- 发送
+ 取消
+ 发送
<% end%>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 97c647111..ba7295b67 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -89,8 +89,8 @@
- 取消
- 发送
+ 取消
+ 发送
<% end%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 286a272c4..7d563bdf7 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -72,8 +72,8 @@
- 取消
- 发送
+ 取消
+ 发送
<% end%>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index e331b49e7..c8196c90f 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -23,8 +23,8 @@
- 取消
- 留言
+ 取消
+ 留言
<% end%>
From e3b0eae427d1bc95ad21311a8fef9f7a32567f13 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Tue, 1 Sep 2015 17:38:42 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/users/_user_homework_list.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index e1bbf6e1c..fc6e723f2 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -54,4 +54,4 @@
<% end%>
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore mt10 f_grey"%>
\ No newline at end of file
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
\ No newline at end of file