From fa90219a523df121d802dea5d489573d36023550 Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Fri, 22 Aug 2014 17:24:06 +0800
Subject: [PATCH 1/4] =?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 2/4] =?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 37920d36c96f8c23fb102c8603c42654bb2cf9ed Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Sat, 23 Aug 2014 10:09:36 +0800
Subject: [PATCH 3/4] =?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 4/4] =?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");
+    }
+}