From e39007d96e2b8abb6f55b8e9285bd1488e6a56a9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Tue, 24 Mar 2015 09:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=80=9A=E7=9F=A5=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_form.html.erb | 29 ++++++++++------------------
 app/views/news/_course_news.html.erb |  6 ++++++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 0bea4b773..3b68bbf76 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -1,26 +1,17 @@
-<%= error_messages_for @news %>
-<p class="talk_top pl15" >
-  <%= is_new ? l(:bale_news_notice):l(:bale_edit_notice)%>
-</p>
-<div class="box tabular">
-  <p>
-    <%= f.text_field :title, :required => true, :size => 60, :style => "width:468px;", :onkeyup => "regexTitle();", :maxlength => 60 %>
-  </p>
-  <P>
-    <span id="title_notice_span">(60个字符以内)</span>
-  </P>
-  <p>
-    <%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:470px;", :onkeyup => "regexDescription();" %>
-  </p>
-  <P>
-    <span id="description_notice_span"></span>
-  </P>
+  <li  class="ml45">
+    <label><span class="c_red">*</span>&nbsp;<%= l(:field_title) %>&nbsp;&nbsp;：</label>
+    <input  type="text" name="news[title]" class="hwork_input" id="news_title" size="60" onkeyup="regexTitle();" maxlength="60" placeholder="60个字符以内">
+  </li>
+  <li class="ml45">
+    <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+    <textarea id="news_description" name="news[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="hwork_text fl" onkeyup="regexDescription();" ></textarea>
+  </li>
+  <div class="cl"></div>
   <p id="attachments_form" style="margin-left:-10px;">
     <label style="padding-right: 15px;">
       <%= l(:label_attachment_plural) %>
     </label>
     <%= render :partial => 'attachments/form', :locals => {:container => @news} %>
   </p>
-</div>
 
-<%= wikitoolbar_for 'news_description'%>
+<!-- <#%= wikitoolbar_for 'news_description'%>-->
\ No newline at end of file
diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index 1757153e2..45af13328 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -72,6 +72,11 @@
           :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
       <div class="cl"></div>
       <div id="add-news" class="hwork_new" style="display:none;">
+        <%= error_messages_for @news %>
+        <p class="talk_top pl15" >
+          <%= l(:bale_news_notice)%>
+        </p>
+        <ul>
         <%= labelled_form_for @news, :url => course_news_index_path(@course),
                               :html => {:id => 'news-form', :multipart => true} do |f| %>
             <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
@@ -80,6 +85,7 @@
 
             <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
         <% end if @course %>
+        </ul>
         <div id="preview" class="wiki"></div>
       </div>
   <% end %>