Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings

app/views/trainings/enroll.html.erb

@@ -146,11 +146,42 @@
     </li>
     <li class="clearfix infoBar">
       <span class="left_tag fl">职称</span>
-      <input type="text" class="right_input" id="userPositional" placeholder="请输入职称"
+        <span class="fr PositionalRight">
+            <span class="fl mr15">
+              <input type="radio" name="Positional" value="Positional1" id="Positional_1" class="magic-radio" checked>
+              <label for="Positional_1" style="top:0px">教师</label>
+            </span>
+            <span class="fl">
+              <input type="radio" name="Positional" value="Positional2" id="Positional_2" class="magic-radio">
+              <label for="Positional_2" style="top:0px">学生</label>
+            </span>
+        </span>
+      <!--<input type="text" class="right_input" id="userPositional" placeholder="请输入职称"
              name="technical_title"
-             value="<%= @training.technical_title %>"/>
+             value="<%#= @training.technical_title %>"/>-->
     </li>
-
+    <p class="subtitle">培训类型</p>
+      <li class="clearfix infoBar">
+        <span class="left_tag fl">大数据方向</span>
+        <span class="fr">
+          <input type="radio" name="type" value="type1" id="type_1" class="magic-radio">
+          <label for="type_1" style="top:8px">&nbsp;</label>
+        </span>
+      </li>
+      <li class="clearfix infoBar">
+        <span class="left_tag fl">人工智能方向</span>
+        <span class="fr">
+          <input type="radio" name="type" value="type2" id="type_2" class="magic-radio">
+          <label for="type_2" style="top:8px">&nbsp;</label>
+        </span>
+      </li>
+      <li class="clearfix infoBar">
+        <span class="left_tag fl">大数据+人工智能方向</span>
+        <span class="fr">
+          <input type="radio" name="type" value="type3" id="type_3" class="magic-radio">
+          <label for="type_3" style="top:8px">&nbsp;</label>
+        </span>
+      </li>
     <% if @training_type == 3 %>
       <p class="subtitle">您的授课/研究领域（最少选1项）</p>
       <li class="clearfix infoBar">

db/migrate/20190613013623_add_reseach_field_to_trainings.rb

@@ -1,5 +0,0 @@
-class AddReseachFieldToTrainings < ActiveRecord::Migration
-  def change
-    add_column :trainings, :research_field, :string
-  end
-end

db/migrate/20190613021248_add_technical_title_to_trainings.rb

@@ -1,5 +0,0 @@
-class AddTechnicalTitleToTrainings < ActiveRecord::Migration
-  def change
-    add_column :trainings, :technical_title, :string
-  end
-end

public/stylesheets/educoder/trainings.css

@@ -122,6 +122,13 @@ input[type='text'].right_input{
     float: right;border: none;text-align: right;height: 44px;line-height: 44px;outline: none;
     font-size: 1.4rem;width: 70%;/*margin-right: 24px;*/
 }
+.PositionalRight .magic-radio + label:before,.PositionalRight .magic-checkbox + label:before{
+    top:13px!important;
+}
+.PositionalRight .magic-radio + label:after{
+    top: 18px!important;
+}
+.mr15{margin-right: 15px;}
 .infoBar label.right_tag{
     float: right;color: #cccccc;font-size: 1.4rem;margin-right: 24px;
 }