From a3d71ca93f2327b239dee48cb17a9b4aa9d16ca2 Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Thu, 9 Jul 2015 10:18:02 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=EF=BC=9A=E5=A6=82=E5=9B=BE=EF=BC=8C=E7=94=A8=E6=88=B7=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=9C=A8=E5=9B=9E=E5=A4=8D=E7=95=99=E8=A8=80=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 5e9d6ef46..692cca85d 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -6,7 +6,7 @@
     <div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
       <div class="recall_head">
         <% if show_name %>
-            <%= image_tag url_to_avatar(reply.user.show_name),:width => '30',:height => '30' %>
+            <%= image_tag url_to_avatar(journal.user),:width => '30',:height => '30' %>
         <% else %>
             <%= image_tag url_to_avatar(nil),:width => '30',:height => '30' %>
         <% end %>

From 2b00f65f426b82759ea39c89237e7cecfcd14753 Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Thu, 9 Jul 2015 15:08:36 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=BC=80?=
 =?UTF-8?q?=E5=AD=A6=E5=AD=A6=E6=9C=9F=EF=BC=8C=E5=A2=9E=E5=8A=A0=EF=BC=9A?=
 =?UTF-8?q?=E5=A4=8F=E5=AD=A3=E5=AD=A6=E6=9C=9F=EF=BC=8C=E5=BF=AB=EF=BC=81?=
 =?UTF-8?q?=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index a0bd18582..a67259efd 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -520,10 +520,14 @@ module CoursesHelper
     option1 << l(:label_spring)
     option1 << l(:label_spring)
     option2 = []
-    option2 << l(:label_autumn)
-    option2 << l(:label_autumn)
+    option2 << l(:label_summer)
+    option2 << l(:label_summer)
+    option3 = []
+    option3 << l(:label_autumn)
+    option3 << l(:label_autumn)
     type << option1
     type << option2
+    type << option3
     type
   end
 

From 66042a90f3c72704928a9fb9c28eb1766737b9ac Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Fri, 10 Jul 2015 09:23:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=88=9B=E6=96=B0=E7=AB=9E=E8=B5=9B--?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=80=9A=E7=9F=A5=EF=BC=9A=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=BE=93=E5=85=A5=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/jstoolbar.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 2cc00b4a3..bfd93619a 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -3,7 +3,7 @@
 }
 .jstEditor textarea, .jstEditor iframe {
     margin: 0;
-    margin-left: 80px;
+    margin-left: 0px;
 }
 
 .jstHandle {

From bf9e905b57d0bd88c9bd4dc46d644809474a106f Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Fri, 10 Jul 2015 10:23:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=A6=82=E5=9B=BE=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=8F=AD=E7=9A=84=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E7=8F=AD=E7=9A=84?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E5=90=8C=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E5=90=88=E9=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_groups_name.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_new_groups_name.html.erb b/app/views/courses/_new_groups_name.html.erb
index da599ef5a..39fa33677 100644
--- a/app/views/courses/_new_groups_name.html.erb
+++ b/app/views/courses/_new_groups_name.html.erb
@@ -21,7 +21,7 @@
                       <img src="/images/pic_del.gif" width="11" height="12" alt="删除班级" title="删除该班级" />
                     </a>
                 <% end%>
-                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();">
+                <a href="javascript:void(0)" class="f_l" style="padding-left: 5px;" onclick="$('#group_name_<%= group.id %>').val('');$('#edit_group_<%= group.id %>').slideToggle();$('#new_group_name').hide();">
                   <img src="/images/pic_edit.png" width="14" height="15" alt="编辑班级" />
                 </a>
             <% end %>
@@ -42,7 +42,7 @@
 
   <% if @canShowCode %>
       <li style="margin-left:15px;margin-top: 2px;">
-        <a href="javascript:void(0)" class="st_add f_l" onclick="$('#group_name').value='';$('#new_group_name').slideToggle();">+添加分班</a>
+        <a href="javascript:void(0)" class="st_add f_l" onclick="$('#group_name').value='';$('#new_group_name').slideToggle();$('#edit_group_36').hide();">+添加分班</a>
       </li>
       <li >
         <span id="new_group_name" style="display:none; vertical-align: middle;" class="ml10 f_l">

From a52b2b37e5cd32aa96d0135cb821f95390674206 Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Fri, 10 Jul 2015 10:45:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B--=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=EF=BC=9A=E5=BB=BA=E8=AE=AE=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E2=80=9C=E5=8A=A0=E5=85=A5=E5=BD=93=E5=89=8D=E5=88=86=E5=88=AB?=
 =?UTF-8?q?=E2=80=9D=E3=80=81=E2=80=9C=E6=8E=A8=E5=87=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=88=86=E7=8F=AD=E2=80=9D=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/watchers_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index d3b2a49b1..52f2ea119 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -169,14 +169,14 @@ module WatchersHelper
       if joined
         link_to text, {:controller => "courses", :action => "join_group", :object_id => "#{group.id}"},
                 :remote => true, :method => 'delete',
-                :id => "#{group.id}", :style => "padding: 8px 8px 4px; ",
+                :id => "#{group.id}", :style => "padding: 2px 8px 2px; background-color:#15bccf; color:#fff; ",
                 :confirm => l(:text_are_you_sure_out_group), :class => 'group_in'
 
       end
     else
       text = l(:label_new_join_group)
       form_tag({:controller => "courses", :action => "join_group", :object_id => "#{group.id}"}, :remote => true, :method => 'post') do
-        submit_tag text, class: "group_in", style: "width: 90px;height: 21px;"
+        submit_tag text, class: "group_in", style: "width: 90px;height: 21px; background-color:#15bccf; color:#fff;"
       end
     end
   end