From 7d93a4e4aa8bc1e8262191d676536c9614dbb556 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 11 Nov 2014 08:38:58 +0800
Subject: [PATCH] Merge branch 'szzh' of
 http://repository.trustie.net/xianbo/trustie2 into szzh

Conflicts:
	app/models/user.rb
	app/views/courses/_course_form.html.erb
	db/schema.rb
---
 app/views/courses/_course_form.html.erb | 36 +++++++++++++------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index 305b6fa19..b722956e8 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -58,21 +58,27 @@
         <table>
           <tr>
             <td>
-              <span class="info" align="right" style="width: 90px; font-weight: bold ;margin-left:22px"><%= l(:label_class_period) %>
-              <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" 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 => "#{l(:lable_input_class)}", :maxlength => 5 %>
+                 <%= l(:label_class_period) %>
+                  <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" 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 => "#{l(:lable_input_class)}", :maxlength => 5 %>
+                  </span>
+                  <strong>
+                    <%= l(:label_class_hour) %>
+                  </strong>
               </span>
-              <strong><%= l(:label_class_hour) %></strong>
-              <strong><%= l(:label_class_hour) %></strong>
-              <strong>
-                <%= l(:label_class_hour) %>
-              </strong>
             </td>
           </tr>
         </table>
@@ -86,7 +92,6 @@
               <table>
                 <tr>
                     <td class="info" align="right" style="width: 86px">
-                        <strong><%= l(:label_term) %><span class="required"> *&nbsp;&nbsp;</span></strong>
                         <strong>
                           <%= l(:label_term) %>
                           <span class="required"> *&nbsp;&nbsp;</span>
@@ -96,7 +101,6 @@
                         <%= 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),{}  %>
                       <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{}  %>
                     </td>
                 </tr>
@@ -107,14 +111,12 @@
       </table>
     </p>
       <p style="margin-left:-10px;">
-        <label for="course[course]_password" style="font-size: 13px;"><%= l(:label_new_course_password) %>
         <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>
       <em class="info" style="margin-left:95px;">
         <%= l(:text_command) %>
       </em>