From 49984204108911ddf87c5206612f2abe72dd3283 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 22 Aug 2014 16:52:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=97=B6=EF=BC=8C=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=9C=A8=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E4=BC=9A?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 14814ed32..0559d1a4a 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -140,11 +140,11 @@ class MyController < ApplicationController
         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
         
         if @user.save
-          flash[:notice] = l(:notice_account_password_updated)
+          flash.now[:notice] = l(:notice_account_password_updated)
           redirect_to my_account_path
         end
       else
-        flash[:error] = l(:notice_account_wrong_password)
+        flash.now[:error] = l(:notice_account_wrong_password)
       end
     end
   end

From fa90219a523df121d802dea5d489573d36023550 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Fri, 22 Aug 2014 17:24:06 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=9C=A8=E6=B2=A1=E6=9C=89=E2=80=9C?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E2=80=9D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=A1=B9=E6=97=B6"=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E2=80=9D=E6=98=BE=E7=A4=BA=E5=AD=90=E9=A1=B5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_header.html.erb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb
index b943cf565..37b8aa7e7 100644
--- a/app/views/layouts/_base_header.html.erb
+++ b/app/views/layouts/_base_header.html.erb
@@ -42,15 +42,14 @@
 			<ul class="sub_menu">
               <% if @show_course == 1 %>
 				<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
-                 <% hasCourse=true%>
 
-                <% _bool=false %>
+                <% hasCourse=false %>
                 <% User.current.courses.each do |course| %>
                     <% if !course_endTime_timeout?(course) %>
-                          <% _bool=true %>
+                          <% hasCourse=true %>
                     <% end %>
                 <% end %>
-                <% if _bool %>
+                <% if hasCourse %>
 				<li  id="course_loggedas_li" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id} %>
                     <ul class="course_sub_menu">
                     <% User.current.courses.each do |course| %>
@@ -71,7 +70,7 @@
                 <% if hasCourse %>
                     <ul class="project_sub_menu" style="top: 35px">
                 <% else %>
-                    <ul class="project_sub_menu">
+                    <ul class="project_sub_menu" style="top: 0px">
                 <% end %>
                 <% User.current.projects.each do |project| %>
                       <li><%= link_to project.name.truncate(10, omission: '...'), {:controller => 'projects', :action => 'show',id: project.id, host: Setting.project_domain } %></li>

From 9f54df232b371e1e9ce4ad6eb0ff531ba24bebe0 Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Sat, 23 Aug 2014 09:19:05 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E7=82=B9=E5=87=BB=E7=B2=89=E4=B8=9D=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=85=B3=E6=B3=A8=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E5=8F=82=E5=8A=A0=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=92=8C=E9=A1=B9=E7=9B=AE=E4=B8=BA0=E7=9A=84bug=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_fanslist.html.erb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index fb1a6d0dc..f9e4341bf 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -6,9 +6,9 @@
         <li>
           <table width="660px" border="0" align="center">
             <tr>
-              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(user), :class => "avatar"),
-                                                                  user_path(user),
-                                                                  :title => "#{user.name}" %></td>
+              <td colspan="2" valign="top" width="50">
+                <%= link_to image_tag(url_to_avatar(user), :class => "avatar"),user_path(user),:title => "#{user.name}" %>
+              </td>
               <td>
                 <table width="580px" border="0">
                   <tr>  <!-- modified by bai -->
@@ -27,6 +27,8 @@
                           <% for member in memberships %>
                               <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
                           <% end %>
+                      <% else %>
+                          <%= l(:label_x_contribute_to, :count => 0) %>
                       <% end %>
                     </p>
 
@@ -38,6 +40,8 @@
                             <% for member in memberships %>
                                 <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
                             <% end %>
+                        <% else %>
+                            <%= l(:label_x_course_contribute_to, :count => 0) %>
                         <% end %>
                       </p>
                     </td>

From 7ec103e135b4114fcc7831069556bf5cdfafc3f6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 23 Aug 2014 09:21:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?#1457=20=E4=BF=AE=E5=A4=8D=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=BC=80=E8=AF=BE=E6=97=A5=E6=9C=9F=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84BUG=20=E4=BC=98=E5=8C=96=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=BC=80=E8=AF=BE=E6=97=B6=E9=97=B4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb   |   2 +
 app/helpers/courses_helper.rb           |  27 ++
 app/views/courses/_course_form.html.erb | 322 ++++++------------------
 3 files changed, 109 insertions(+), 242 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 6989b0b4f..c42944947 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -63,6 +63,8 @@ class CoursesController < ApplicationController
   #更新课程信息
   def update
     @course.safe_attributes = params[:course]
+    @course.time = params[:time]
+    @course.term = params[:term]
     @course.class_period = params[:class_period]
     if  @course.save
       if params[:course][:is_public] == '0'
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 1fd1646b8..d075f67ae 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -453,4 +453,31 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  #课程实践年份下拉框
+  def course_time_option
+    type = []
+    #work_types = WorksCategory.all
+    for i in (2008..2020)
+      option = []
+      option << i
+      option << i
+      type << option
+    end
+    type
+  end
+
+  #课程课时下拉框
+  def course_term_option
+    type = []
+    option1 = []
+    option1 << l(:label_spring)
+    option1 << l(:label_spring)
+    option2 = []
+    option2 << l(:label_autumn)
+    option2 << l(:label_autumn)
+    type << option1
+    type << option2
+    type
+  end
+
 end
diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 23a0caabd..63c196cef 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -1,10 +1,10 @@
 <script type="text/javascript">
-    function get_options(value){
+    function get_options(value) {
         $.ajax({
-                      type :"POST",
-                      url :'/school/get_options/'+encodeURIComponent(value),
-                      data :'text',
-                      success: function(data){
+                      type: "POST",
+                      url: '/school/get_options/' + encodeURIComponent(value),
+                      data: 'text',
+                      success: function (data) {
                           $("#occupation").html(data);
 
                       }
@@ -14,13 +14,12 @@
     }
 </script>
 
-<script  type="text/javascript">
-    function check(){
-        var regex=/^\d*$/;
-        if (!regex.test($("#class_period").val())){
+<script type="text/javascript">
+    function check() {
+        var regex = /^\d*$/;
+        if (!regex.test($("#class_period").val())) {
             alert("学时只能为整数");
         }
-        }
     }
 </script>
 
@@ -33,10 +32,12 @@
 
 <!--[form:course]-->
 <% unless @course.new_record? %>
-    <p><%= render :partial=>"avatar/avatar_form",:locals=> {source:@course} %></p>
+    <p><%= render :partial => "avatar/avatar_form", :locals => {source: @course} %></p>
 <% end %>
 <!-- <p><%#= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p> -->
-<p><label for="course_name"  style="font-size: 13px;" ><%=l(:label_tags_course_name)%><span class="required" > *&nbsp;&nbsp;</span></label><input id="course_name" type="text" value="<%=@course.name%>" style="width:490px;" size="60" name="course[name]"></p>
+<p><label for="course_name" style="font-size: 13px;"><%= l(:label_tags_course_name) %><span class="required">
+  *&nbsp;&nbsp;</span></label><input id="course_name" type="text" value="<%= @course.name %>" style="width:490px;" size="60" name="course[name]">
+</p>
 
 <!-- <p><%#= f.text_field :extra, :required => true, :size => 60, :style => "width:488px;", :disabled => @course.extra_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
 <%# unless @course.extra_frozen? %>
@@ -75,254 +76,91 @@
 	</td></tr></table></p>
 	<%# end %>
     -->
-    <% unless @course.nil?%>
-        <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时",:maxlength=>5 %></span> <span>&nbsp;<strong><%= l(:label_class_hour)%></strong></span>
-</td></tr></table></p>
+    <% unless @course.nil? %>
+        <p>
+        <table>
+          <tr>
+            <td>
+              <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
+                <span class="required"> *&nbsp;&nbsp;</span></span>
+              <span class="info" style="width: 10px;"><%= text_field_tag :class_period, @course.class_period, :placeholder => "在此输入课时", :maxlength => 5 %></span>
+              <span>&nbsp;<strong><%= l(:label_class_hour) %></strong></span>
+            </td>
+          </tr>
+        </table></p>
     <% else %>
-        <p><table><tr><td><span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %><span class="required"> *&nbsp;&nbsp;</span></span>
-  <span class="info" style="width: 10px;"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时",:maxlength=>5 %></span><strong><%= l(:label_class_hour)%></strong>
-</td></tr></table></p>
+        <p>
+        <table>
+          <tr>
+            <td>
+              <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
+                <span class="required"> *&nbsp;&nbsp;</span></span>
+              <span class="info" style="width: 10px;"><%= text_field_tag :class_period, nil, :placeholder => "在此输入课时", :maxlength => 5 %></span><strong><%= l(:label_class_hour) %></strong>
+            </td>
+          </tr>
+        </table></p>
     <% end %>
 
     <!-- end  -->
 
     <!-- added by bai 增加了“年度”和“学期”		 -->
-    <p><table><tr><td>
-
-  <% unless @course.nil? %>
-      <% if @course.time == 2008 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px; margin-left:20px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008' selected='selected'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table>
-          </p>
-
-      <% elsif @course.time == 2009 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009' selected='selected'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2010 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010' selected='selected'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2011 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011' selected='selected'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-
-      <% elsif @course.time == 2012 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012' selected='selected'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2013 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013' selected='selected'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2014 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014' selected='selected'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2015 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015' selected='selected'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2016 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016' selected='selected'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% elsif @course.time == 2017 %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017' selected='selected'>2017</option>".html_safe %></td></tr></table></p>
-      <% else %>
-          <p><table><tr><td class="info" align="right" style="width: 86px"><strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong></td>
-  <td class="info" style="width: 10px">
-    <%= select_tag 'time', "<option value = '2008'>2008</option>
-	          							<option value = '2009'>2009</option>
-	          							<option value = '2010'>2010</option>
-	          							<option value = '2011'>2011</option>
-	          							<option value = '2012'>2012</option>
-	          							<option value = '2013'>2013</option>
-	          							<option value = '2014' selected='selected'>2014</option>
-	          							<option value = '2015'>2015</option>
-	          							<option value = '2016'>2016</option>
-	          							<option value = '2017'>2017</option>".html_safe %></td></tr></table></p>
-
-      <% end %>
-  <% end %>
-  </td>
-  <td>
-    <% unless @course.nil? %>
-        <% if @course.term == l(:label_spring) %>
-            <p><table><tr>
-    <td class="info" style="width: 10px">
-      <%= select_tag 'term', "<option value = '#{l(:label_spring)}' selected='selected'>#{l(:label_spring)}</option>
-	          							<option value = '#{l(:label_autumn)}'>#{l(:label_autumn)}</option>
-	          							".html_safe %></td></tr></table></p>
-
-        <% elsif @course.term == l(:label_summer)%>
-            <p><table><tr>
-    <td class="info" style="width: 10px">
-      <%= select_tag 'term', "<option value = '#{l(:label_spring)}'>#{l(:label_spring)}</option>
-	          							<option value = '#{l(:label_autumn)}'>#{l(:label_autumn)}</option>
-	          							".html_safe %></td></tr></table></p>
-
-        <% elsif @course.term == l(:label_autumn)%>
-            <p><table><tr>
-    <td class="info" style="width: 10px">
-      <%= select_tag 'term', "<option value = '#{l(:label_spring)}'>#{l(:label_spring)}</option>
-	          							<option value = '#{l(:label_autumn)}' selected='selected'>#{l(:label_autumn)}</option>
-	          							".html_safe %></td></tr></table></p>
-
-        <% elsif @course.term == l(:label_winter)%>
-            <p><table><tr>
-    <td class="info" style="width: 10px">
-      <%= select_tag 'term', "<option value = '#{l(:label_spring)}'>#{l(:label_spring)}</option>
-	          							<option value = '#{l(:label_autumn)}'>#{l(:label_autumn)}</option>
-	          							".html_safe %></td></tr></table></p>
-
-        <% else %>
-            <p><table><tr>
-    <td class="info" style="width: 10px">
-      <%= select_tag 'term', "<option value = '#{l(:label_spring)}'>#{l(:label_spring)}</option>
-	          							<option value = '#{l(:label_autumn)}'>#{l(:label_autumn)}</option>
-	          							".html_safe %></td></tr></table></p>
-
-        <% end %>
-
-    <% end %></td></tr></table>
-  </p>
-  <!-- end  -->
-
-
-
-
-  <!--added by Wen -->
-
-
-  <!-- end -->
-
-
-
-
-
-  <!-- <p style="margin-left:-10px;"><%#= m.text_field :password, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->
-  <p style="margin-left:-10px;"><label for="course[course]_password"  style="font-size: 13px;" ><%=l(:label_new_course_password)%><span class="required"> *</span></label><input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%=@course.password  %>" size="60" name="course[password]"></p>
-  <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
+    <p>
+    <table>
+      <tr>
+        <td>
+          <% if @course != nil %>
+              <table>
+                <tr>
+                    <td class="info" align="right" style="width: 86px">
+                        <strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong>
+                    </td>
+                    <td class="info" style="width: 10px">
+                        <%= select_tag :time,options_for_select(course_time_option,@course.time), {}  %>
+                    </td>
+                    <td class="info" style="width: 10px">
+                      <%= select_tag :term,options_for_select(course_term_option,@course.term),{}  %>
+                    </td>
+                </tr>
+              </table>
+          <% end %>
+        </td>
+      </tr>
+      </table>
+    </p>
+      <!-- end  -->
+
+
+      <!--added by Wen -->
+
+
+      <!-- end -->
+
+
+      <!-- <p style="margin-left:-10px;"><%#= m.text_field :password, :required => true, :size => 60, :style => "width:488px;margin-left: 10px;" %></p> -->
+      <p style="margin-left:-10px;">
+        <label for="course[course]_password" style="font-size: 13px;"><%= l(:label_new_course_password) %>
+          <span class="required">
+          *</span></label><input id="course_course_password" type="text" style="width:488px;margin-left: 10px;" value="<%= @course.password %>" size="60" name="course[password]">
+      </p>
+      <em class="info" style="margin-left:95px;"><%= l(:text_command) %></em>
 <% end %>
 
 <!-- <p style="margin-left:-10px;padding-right: 20px;"><%#= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p> -->
 <p style="padding-right: 20px;">
   <label for="course_description" style="font-size: 13px;">
-    <%=l(:label_new_course_description)%>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+    <%= l(:label_new_course_description) %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
   </label>
   <span class="jstEditor">
-      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40" >
-        <%=@course.description%>
+      <textarea id="course_description" class="wiki-edit" style="font-size:small;width:490px;margin-left:10px;" rows="8" name="course[description]" cols="40">
+        <%= @course.description %>
       </textarea>
   </span>
 </p>
 
 
-<p style="margin-left:-10px;"><em style ="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_course_public_info) %></em></p><!-- modified by bai -->
+<p style="margin-left:-10px;">
+  <em style="color: #888888;display: block;font-size: 90%;font-style: normal;"><%= f.check_box :is_public, :style => "margin-left:10px;" %><%= l(:label_course_public_info) %></em>
+</p><!-- modified by bai -->
 <p style="display:none;"><%= f.text_field :course_type, :value => 1 %></p>
 
 

From 37920d36c96f8c23fb102c8603c42654bb2cf9ed Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Sat, 23 Aug 2014 10:09:36 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=87=AA=E5=8A=A8=E5=88=86=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 75030797b..76e4990a5 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -46,7 +46,7 @@
 				
 		</div>
 
-		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
+		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
 		<%= textAreailizable(@memo,:content) %>
 			<p>							

From 38c5c86a39776d77f1abb4b542bb7de37f53c216 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 23 Aug 2014 10:58:07 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E4=B8=8D=E8=83=BD=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb |  3 +-
 public/javascripts/application.js       | 52 +++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 23a0caabd..6a2ee456a 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -20,8 +20,7 @@
         if (!regex.test($("#class_period").val())){
             alert("学时只能为整数");
         }
-        }
-    }
+     }
 </script>
 
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 445a9053c..1dedc1b8c 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -633,3 +633,55 @@ function img_thumbnails() {
   });
 }
 $(document).ready(img_thumbnails);
+
+function TimeClose(dateText, inst) {
+    if(inst.id=="issue_start_date"){
+        time=dateText;
+    }
+}
+var time=new Date();
+function TimeBeforeShow(input){
+    if(input.id=="issue_due_date"){
+        //var minDate = $(input).datepicker('option', 'minDate');
+        var tempdata=$("#issue_start_date").attr("value");
+
+        $(input).datepicker('option', 'minDate',new Date(tempdata.replace(/-/g,   "/")));
+        //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+    }
+}
+
+function SetMinValue(){
+    /// var tempdata=$("#issue_start_date").attr("value");
+    //$('.selector').datepicker('option', 'minDate', '12/25/2012');
+    //alert(tempdata);
+    //$("#issue_due_date").datepicker({
+    //    minDate: new Date(2014,08,23)
+    //var datepickerOptions=
+    //{dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true};
+    //alert( $('.issue_due_date').length);
+    //$('.selector')[1].datepicker('option', 'minDate', new Date(2014, 0 - 8, 23));
+    //$("#issue_due_date").datepicker(datepickerOptions);
+    //$("##{issue_due_date}").datepicker(datepickerOptions);
+    //$("#issue_due_date").datepicker(
+    //        {dateFormat: 'yy-mm-dd',minDate: new Date(2014,08,23), showOn: 'button', buttonImageOnly: true, buttonImage: "path_to_image('/images/calendar.png')", showButtonPanel: true, showWeek: true, showOtherMonths: true, selectOtherMonths: true}
+    //)
+    //});
+}
+function  PrecentChange(obj){
+    var _v=    obj;
+    if(_v==100)
+    {
+        //var select=$("select[id='issue_status_id']");
+        $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected");
+    }
+    else if(_v==0)
+    {
+        //alert(1);
+        $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected");
+    }
+    else if(_v!=100&&_v!=0)
+    {
+        // alert(2);
+        $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected");
+    }
+}