From 9f0128a878fc8c795a9e5c8d7b12441eb242bbc6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 22 Mar 2017 10:30:20 +0800
Subject: [PATCH] =?UTF-8?q?shixun=E6=96=B0=E5=BB=BA=E5=92=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/shixuns_controller.rb | 2 +-
 app/views/shixuns/_form.html.erb      | 8 ++++----
 app/views/shixuns/new.html.erb        | 2 +-
 public/stylesheets/css/taskstyle.css  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 163fc038a..daa71da95 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -68,7 +68,7 @@ class ShixunsController < ApplicationController
   def create
     @shixun = Shixun.new(params[:shixun])
     @shixun.user_id = User.current.id
-
+    params[:shixun][:is_public] == "on" ? @shixun.is_public = 1 : @shixun.is_public = 0
     respond_to do |format|
       if @shixun.save
         m = ShixunMember.new(:user_id => User.current.id, :role => 1)
diff --git a/app/views/shixuns/_form.html.erb b/app/views/shixuns/_form.html.erb
index 7245faeb6..5641fa1c8 100644
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@@ -12,12 +12,12 @@
             </div>
         <% end %>
         <li class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_projects_new_name)%>&nbsp;&nbsp;:</label>
+          <label><span class="c_red">*</span>&nbsp;实训名称&nbsp;&nbsp;:</label>
           <%= f.text_field :name, :class => "project_new_input project_new_input_project_new", :placeholder => "例如：团队协作方法与机制研究", :onkeyup => "regex_project_name();" %>
-          <p class="c_orange ml70" id="project_name_notice" style="display: none;">项目名称不能为空</p>
+          <p class="c_orange ml70" id="project_name_notice" style="display: none;">实训名称不能为空</p>
         </li>
         <li class="ml45 mb10">
-          <label class="fl mr5">&nbsp;&nbsp;<%= l(:label_tags_project_description) %>&nbsp;&nbsp;:</label>
+          <label class="fl mr5">&nbsp;&nbsp;预备知识&nbsp;&nbsp;:</label>
           <%= f.kindeditor  :description, :editor_id => 'project_create_editor',
                             :owner_id => @project.nil? ? 0: @project.id,
                             :owner_type => OwnerTypeHelper::PROJECT,
@@ -33,7 +33,7 @@
         </li>
         <li class="mb5 ml70">
           <label >&nbsp;公开&nbsp;：</label>
-          <%= f.text_field :is_public, :id => "project_is_public", :name => "project[is_public]", :type => "checkbox", :value => "1", :checked => "checked" %>
+          <%= f.text_field :is_public, :id => "project_is_public", :name => "shixun[is_public]", :type => "checkbox", :value => "1", :checked => "checked" %>
           <span class="c_grey">（打钩为公开项目，不打钩为私有项目；私有项目仅项目成员可见。）</span>
           <div class="cl"></div>
         </li>
diff --git a/app/views/shixuns/new.html.erb b/app/views/shixuns/new.html.erb
index 7c90d8819..3d5ff3071 100644
--- a/app/views/shixuns/new.html.erb
+++ b/app/views/shixuns/new.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 <%= error_messages_for 'project' %>
 <div class="project_r_h02">
-  <h2 class="project_h2"><%= l(:label_project_new)%></h2>
+  <h2 class="project_h2">新建实训</h2>
 </div>
 
 <%= render 'form' %>
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 3d4c99c6a..23830db7a 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -149,7 +149,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
 .panel-form{ width:800px; margin:0 100px; padding:30px 0; line-height: 40px; }
 .panel-form li{ margin-bottom:20px; font-size: 14px; color:#666;}
 .panel-form-label{ display:inline-block; width:90px; text-align:right; }
-.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 40px;}
+.panel-form input,.panel-form textarea{ border:1px solid #e2e2e2;color:#666;line-height: 1.9;}
 .panel-form-width-690{ width: 690px; padding:5px;}
 .panel-form-width-670{ width: 670px; padding:5px;}
 .panel-form-height-150{ height: 150px;}