From 1a7e1db3fb6caba0396ff098986d34f608f84adb Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 2 Nov 2015 14:20:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E5=9C=A8=E7=A7=BB=E5=8A=A8=E6=97=B6=EF=BC=8C=E7=81=B0?=
 =?UTF-8?q?=E8=89=B2=E6=9D=A1=E8=B7=9F=E7=9D=80=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource.html.erb | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f6bb3c8cb..5c6339e59 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -145,6 +145,7 @@
     var id; //资源id
     var sendType;  //发送到课程 1  发送到项目 2
     var lastSendType;  //保存上次发送的发送类型
+    var last_op
     $("#resources_list").mousedown(function(e) {
         //如果是右键的话
         if (3 == e.which) {
@@ -179,6 +180,28 @@
             last_line = line;
         }
     });
+
+    //鼠标经过时，背景颜色设为灰色
+    $("#resources_list").mouseover(function(e){
+        pageX = e.clientX;
+        pageY = e.clientY;
+        var ele = document.elementFromPoint(pageX,pageY);
+        line = $(ele).parent();
+        if(last_op != null){
+            last_op.children().css("background-color", 'white');
+            restore();
+            last_op == null;
+        }
+        //如果当前的tag是li，那么还要li的父级元素
+        if(line.get(0).tagName === 'LI'){
+            line = line.parent();
+        }
+        //将当前的元素的所有子元素的背景色改为蓝色
+        line.children().css("background-color", '#e1e1e1');
+        //将当前元素赋给 上一个对象 保存起来。
+        last_op = line;
+    });
+
     //元素包含关系计算
     var contains  = function(root, el) {
         if (root.compareDocumentPosition)

From 4abb532fd48640a304e98caf82037832ab0a4eaf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 2 Nov 2015 14:51:56 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E6=B3=A8=E5=86=8C=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=BB=98=E8=AE=A4=E8=BA=AB=E4=BB=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=20=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E6=97=B6?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=98=AF=E5=BF=85=E5=A1=AB=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 7bc674ea6..c2a94a478 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -17,7 +17,7 @@
         <ul class="setting_left">
           <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>身份&nbsp;:&nbsp;</li>
+          <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
@@ -34,7 +34,10 @@
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>
-            <select onchange="showtechnical_title(this.value);" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+            <select onchange="showtechnical_title(this.value);" required = true, nh_required="1" name="identity" id="userIdentity" class="location" class="w70" style="height:28px;margin-left:2px;">
+              <option value="-1">
+                <%= l(:label_account_identity_choose) %>
+              </option>
               <option value="0">
                 <%= l(:label_account_identity_teacher) %>
               </option>
@@ -61,6 +64,7 @@
                 <%= text_field_tag :no, nil, :placeholder => l(:label_account_identity_studentID),:style=>"60px" %></span>
               <% end %>
             </span>
+            <span id="identity_hint" style="display: none"></span>
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
@@ -701,6 +705,11 @@
     $("#users_tb_2").click();
     <% end %>
     $('#my_account_form_link').click(function(e){
+        if($("#userIdentity").val() == -1 ) {
+            $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
+            e.stopImmediatePropagation();
+            return;
+        }
         if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
             $("#hint").html('<span style="color:red">学校必须是从下拉列表中选择的,不能手动修改</span>').show();
             e.stopImmediatePropagation();

From ec42f9413cb05a7bc4f355462efce89ba76bc548 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 2 Nov 2015 14:59:17 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=94=BE=E5=9C=A8=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E7=9A=84?=
 =?UTF-8?q?=E5=8F=B3=E8=BE=B9=EF=BC=8C=E5=8D=A0=E4=BD=8D=E7=AC=A6=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F(=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index e5fabee0c..c9be16521 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -18,13 +18,13 @@
   <div class=" mt10">
     <%= link_to("导入作业", user_import_homeworks_user_path(User.current.id,:select_course => defined?(select_course)),:class => "BlueCirBtn fl mr10",:remote => true) unless edit_mode%>
     <div class="calendar_div fl">
-      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
-      <%= calendar_for('homework_publish_time')%>
-    </div>
-    <div class="calendar_div fl ml10">
       <input  type="text" name="homework_common[end_time]" id="homework_end_time" placeholder="截止日期" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.end_time%>"  >
       <%= calendar_for('homework_end_time')%>
     </div>
+    <div class="calendar_div fl ml10">
+      <input  type="text" name="homework_common[publish_time]" id="homework_publish_time" placeholder="发布日期(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= homework.publish_time%>"  >
+      <%= calendar_for('homework_publish_time')%>
+    </div>
   </div>
   <div class="cl"></div>
   <p id="homework_end_time_span" class="c_red mt5"></p>

From 7980d92ff74fcd4637f8912938cdc971390d3f14 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 2 Nov 2015 15:46:21 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=BB=93=E6=9E=9C=E6=8C=89=E7=85=A7=E5=BC=80?=
 =?UTF-8?q?=E8=AF=BE=E6=97=B6=E9=97=B4=E3=80=81=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=80=92=E6=8E=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 0a3c61c90..1a561006a 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -107,7 +107,7 @@ class CoursesController < ApplicationController
       courses = Course.visible
       @courses = paginateHelper courses,10
     else
-      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'")
+      courses = Course.visible.where("LOWER(name) like '%#{params[:name].to_s.downcase}%'").order("time desc, created_at desc")
       @courses = paginateHelper courses,10
     end
    @name = params[:name]

From d57e01f17ee427fbeadde60411d4111161dcbdf0 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 2 Nov 2015 17:19:38 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=90=8E=EF=BC=8C=E6=9B=B4=E6=96=B0=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E6=95=B0=E9=87=8F=E5=92=8C=E5=AD=A6=E7=94=9F=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/members/update.js.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/members/update.js.erb b/app/views/members/update.js.erb
index c5ef983e7..7c27e39fc 100644
--- a/app/views/members/update.js.erb
+++ b/app/views/members/update.js.erb
@@ -2,6 +2,8 @@
 $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
 <%elsif @course%>
 $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+$("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>")
+$("#student_number").html("<%= studentCount(@course) %>");
 <%end%>
 hideOnLoad();
 

From 636063c6cafdc287616310661da8a45a5a7c9c11 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 2 Nov 2015 17:22:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20151102083844_drop_organization.rb |  8 ++++++++
 .../20151102084419_create_organization.rb      | 18 ++++++++++++++++++
 .../20151102090519_create_org_members.rb       | 14 ++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 db/migrate/20151102083844_drop_organization.rb
 create mode 100644 db/migrate/20151102084419_create_organization.rb
 create mode 100644 db/migrate/20151102090519_create_org_members.rb

diff --git a/db/migrate/20151102083844_drop_organization.rb b/db/migrate/20151102083844_drop_organization.rb
new file mode 100644
index 000000000..1abb0f6d9
--- /dev/null
+++ b/db/migrate/20151102083844_drop_organization.rb
@@ -0,0 +1,8 @@
+class DropOrganization < ActiveRecord::Migration
+  def up
+    drop_table :organizations
+  end
+
+  def down
+  end
+end
diff --git a/db/migrate/20151102084419_create_organization.rb b/db/migrate/20151102084419_create_organization.rb
new file mode 100644
index 000000000..af84ebee9
--- /dev/null
+++ b/db/migrate/20151102084419_create_organization.rb
@@ -0,0 +1,18 @@
+class CreateOrganization < ActiveRecord::Migration
+  def up
+    create_table :organizations do |t|
+      t.string :name
+      t.text :description
+      t.integer :creator_id
+      t.integer :home_id
+      t.string :domain
+      t.boolean :is_public
+
+      t.timestamps
+    end
+  end
+
+  def down
+    drop_table :organizations
+  end
+end
diff --git a/db/migrate/20151102090519_create_org_members.rb b/db/migrate/20151102090519_create_org_members.rb
new file mode 100644
index 000000000..037d8a3c6
--- /dev/null
+++ b/db/migrate/20151102090519_create_org_members.rb
@@ -0,0 +1,14 @@
+class CreateOrgMembers < ActiveRecord::Migration
+  def up
+    create_table :org_members do |t|
+      t.integer :user_id
+      t.integer :organization_id
+      t.string :role
+
+    end
+  end
+
+  def down
+    drop_table :org_members
+  end
+end