From 30cb622abd8a7ba026a04ed5de0d69638a845c15 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 25 Mar 2015 20:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=98=BE=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_show.html.erb | 73 ++++++++++++++++++++++------
 config/locales/commons/zh.yml        |  2 +
 public/stylesheets/courses.css       |  4 +-
 3 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 00cbc17de..eaec389fe 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -49,8 +49,65 @@
             $("#news-form").submit();
         }
     }
+    function submitComment()
+    {
+
+    }
 </script>
 
+<div class="project_r_h">
+  <h2 class="project_h2">课程通知</h2>
+</div>
+
+<div class="problem_main">
+  <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
+  <div class="problem_txt fl mt5">
+    <h4 class="r_txt_tit mb5">  <%=h @news.title %></h4>
+    <%= watcher_link(@news, User.current) %>
+    <%= link_to(l(:button_edit),
+                edit_news_path(@news),
+                :class => 'talk_edit fr',
+                :accesskey => accesskey(:edit),
+                :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @course) %>
+    <%= delete_link(news_path(@news),:class => 'talk_edit fr') if User.current.allowed_to?(:manage_news, @course) %>
+    <div class="cl"></div>
+    <div class="mb5"><%= textilizable(@news, :description) %><br /> <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %></div>
+    <%= link_to_attachments @news %>
+    <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
+  </div>
+  <div class="cl"></div>
+  <% if @news.commentable? %>
+      <div class="msg_box">
+        <h4>添加评论</h4>
+        <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
+          <div class="box">
+            <%= text_area 'comment', 'comments', :placeholder=>"最多250个字"%>
+          </div>
+          <p>
+            <%= submit_tag l(:button_add) %>
+            <a href="#" class="grey_btn fr ml10"><%= l(:label_cancel_with_space) %></a>
+            <a href="#" class="blue_btn fr"><%= l(:label_comment_with_space) %></a>
+
+          </p>
+      <% end %>
+      </div>
+  <% end %>
+  <div class="ping_C mb10">
+    <div class="ping_dispic"><a href="#" target="_blank"><img src="images/courses/pic_01.jpg" width="46" height="46" /></a></div>
+    <div class="ping_discon">
+      <div class="ping_distop">
+        <a href="#" target="_blank" class="c_blue fb fl mb10 ">gugu01</a><span class="c_grey fr">2014-10-24</span>
+        <div class="cl"></div>
+        <p  >我写了一个验证身份证号码的程序，它是以一定内存空间（大概100M)换取cpu消耗，然后它的运算量就降低了，前十四位的验证就相当于转换类型再查表一样，所以它的验证号码速度比一般的方式快。如果还不明白就说明你写框架写多了，或者</p>
+      </div>
+      <div class="ping_disfoot"><a href="#">删除</a>
+      <div class="cl"></div>
+    </div>
+    <div class="cl"></div>
+  </div><!---留言内容-->
+</div><!--problem_main end-->
+
+
 <div class="contextual">
   <%= watcher_link(@news, User.current) %>
   <%= link_to(l(:button_edit),
@@ -84,21 +141,7 @@
     <br/>
     <%= link_to_attachments @news %>
     <br/>
-    <!--add comment-->
-    <% if @news.commentable? %>
-        <p>
-          <%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
-        </p>
-        <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
-            <div class="box">
-              <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
-              <%= wikitoolbar_for 'comment_comments' %>
-            </div>
-            <p>
-              <%= submit_tag l(:button_add) %>
-            </p>
-        <% end %>
-    <% end %>
+
 
     <% html_title @news.title -%>
 
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index a0eb6e74a..d21d90174 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -205,6 +205,8 @@ zh:
   button_save: 保存
   button_back: 返回
   button_cancel: 取消
+  label_cancel_with_space: 取  消
+  label_comment_with_space: 评  论
   label_submit: 提交
   button_project_tags_add: 增加  
   label_more: "更多>>"
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 4674c47aa..cafe30625 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -176,7 +176,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .msg_box{ width:670px; height:173px; border-bottom:1px dashed #CCC; padding-top:10px;}
 .msg_box h4{ }
 .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666;  font-size:12px; }
-.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }
+/*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px;  }*/
 .msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}
 
 
@@ -338,7 +338,7 @@ a:hover.st_add{ color:#ff8e15;}
 
 a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; }
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+.r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}