From 1b97361ec6943599f4252bc4c1342daa2d583914 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 16 Sep 2014 10:42:17 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D=E4=B8=8D=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=8D=A2=E5=8F=B7=202.=E6=9C=AC=E5=9C=B0=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb |  4 --
 app/views/messages/_form.html.erb        | 67 +++++++++++++-----------
 app/views/welcome/_more_course.html.erb  |  2 +-
 app/views/welcome/contest.html.erb       |  2 +-
 app/views/welcome/course.html.erb        |  2 +-
 config/locales/zh.yml                    |  7 ++-
 6 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index a11107a9b..2b834cf0a 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -173,10 +173,6 @@
       <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %>
     </div>
 <% end %>
-
-
-
-
 <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
     <div id="reply" style="display:none;">
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 6581a5b11..ddd55bc96 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -1,39 +1,46 @@
+<script src="/javascripts/ckeditor/ckeditor.js?1404953555" type="text/javascript"></script>
 <%= error_messages_for 'message' %>
 <% replying ||= false %>
 
 <div class="box ph10_5">
-<!--[form:message]-->
-  <% unless replying %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
-      </p>
-  <% else %>
-      <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
-        <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
-      </p>
-  <% end %>
-  <p>
-<% unless replying %>
-  <% if @message.safe_attribute? 'sticky' %>
-    <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
-  <% end %>
-  <% if @message.safe_attribute? 'locked' %>
-    <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
-  <% end %>
-<% end %>
-</p>
-  <p><label for="message_subject"><%= l(:field_description) %><span class="required"> *&nbsp;&nbsp;</span></label>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-    <%= text_area :quote,:quote,:style => 'display:none' %>
-  </p>
-<p>
-<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
-<%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p>
+    <!--[form:message]-->
+      <% unless replying %>
+          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject" %><!--by young-->
+          </p>
+      <% else %>
+          <p><label for="message_subject"><%= l(:field_subject) %><span class="required"> *&nbsp;&nbsp;</span></label><br/>
+            <%= f.text_field :subject, :size => 60, :style => "width: 99%;", :id => "message_subject", :readonly => true %>
+          </p>
+      <% end %>
+      <p>
+      <% unless replying %>
+          <% if @message.safe_attribute? 'sticky' %>
+            <%= f.check_box :sticky %> <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+          <% end %>
+          <% if @message.safe_attribute? 'locked' %>
+            <%= f.check_box :locked %> <%= label_tag 'message_locked', l(:label_board_locked) %>
+          <% end %>
+    <% end %>
+    </p>
+    <p>
+    <label for="message_subject"><%= l(:field_description) %>
+      <span class="required"> *&nbsp;&nbsp;</span></label>
+      <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+      <%= text_area :quote,:quote,:style => 'display:none' %>
+    </p>
+    <p>
+        <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
+        <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %>
+    </p>
 
-<!--[eoform:message]-->
+    <!--[eoform:message]-->
 
-<p><%= l(:label_attachment_plural) %><br />
-<%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %></p>
+    <p>
+      <%= l(:label_attachment_plural) %>
+      <br />
+      <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+    </p>
 </div>
 
 
diff --git a/app/views/welcome/_more_course.html.erb b/app/views/welcome/_more_course.html.erb
index 54d8ec6ef..c871e7f97 100644
--- a/app/views/welcome/_more_course.html.erb
+++ b/app/views/welcome/_more_course.html.erb
@@ -5,4 +5,4 @@
     <% end %>
 <% end %>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => school_id} %>
\ No newline at end of file
+<%= link_to l(:label_more), {:controller => 'courses', :action => 'index', :school_id => school_id} %>
\ No newline at end of file
diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index dbc2d8f1b..251ade0b3 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -161,7 +161,7 @@
             <% end %>
         <% end %>
       &nbsp;&nbsp;
-      <%= link_to l(:label_more_information), {:controller => 'contests', :action => 'index'}, :target => "_blank" %>
+      <%= link_to l(:label_more), {:controller => 'contests', :action => 'index'}, :target => "_blank" %>
     </span>
 	<div class="d-p-projectlist-box">
 		<div class="d-p-projectlist">
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index a94998639..f57bc97d7 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -75,7 +75,7 @@
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
-  <h3><strong>新开课程</strong></h3>
+  <h3><strong><%= l(:lable_hot_course)%></strong></h3>
   <% if @school_id %>
       <% school_course = find_miracle_course(10,7, @school_id) %>
   <% else %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2333ea674..3bd25ceef 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -231,9 +231,6 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
-
-
-
   field_name: 名称
   #added by huang
   field_tea_name: 教师
@@ -2122,4 +2119,6 @@ zh:
   label_my_school: 我的学校
   label_all_schol: 全部学校
   label_select_province: 请选择省份
-  label_search_conditions_not_null: 搜索条件不能为空
\ No newline at end of file
+  label_search_conditions_not_null: 搜索条件不能为空
+
+  lable_hot_course: 活跃课程
\ No newline at end of file