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 1/2] =?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 2/2] =?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>