From 663c9aad600ba9b3b73b20ff9df7f442ed71c075 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 8 Apr 2015 15:01:41 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=87=BA=E7=8E=B0html=E4=BB=A3=E7=A0=81=202?=
 =?UTF-8?q?=E3=80=81=E6=95=B4=E7=90=86=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86js=203=E3=80=81=E8=BF=98=E5=8E=9F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8js=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_news.html.erb          | 93 ++++++-------------
 .../javascripts/kindeditor/kindeditor.js      |  2 +-
 public/assets/kindeditor/kindeditor.js        |  2 +-
 public/javascripts/course.js                  | 12 +++
 4 files changed, 41 insertions(+), 68 deletions(-)

diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index c6940ce10..750f7e465 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -2,42 +2,23 @@
    btn_tips = l(:label_news_notice)
    label_tips = l(:label_course_news)
 %>
-
-
-
 <div class="project_r_h">
   <h2 class="project_h2"><%= label_tips %></h2>
 </div>
 <div class="talk_top">
-  <p class="fl"><%= l(:label_total_news) %><span><%= @news_count %></span><%= l(:label_course_news_count) %></p>
+  <p class="fl">
+    <%= l(:label_total_news) %>
+    <span><%= @news_count %></span>
+    <%= l(:label_course_news_count) %>
+  </p>
   <% if @course && User.current.allowed_to?(:manage_news, @course) %>
-      <%= link_to(btn_tips,new_course_news_path(@course),
-          :class => 'problem_new_btn fl c_dorange')%>
+      <%= link_to(btn_tips,new_course_news_path(@course),:class => 'problem_new_btn fl c_dorange')%>
       <div class="cl"></div>
 
   <% end %>
   <div class="cl"></div>
 </div>
 
-
-<!-- <%# if @course && User.current.allowed_to?(:manage_news, @course) %>
-    <%#= link_to(btn_tips, new_course_news_path(@course),
-                :class => 'icon icon-add',
-                :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
-
-    <div id="add-news" class="add_frame" style="display:none;">
-      <%#= 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} %>
-          <%#= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
-          <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
-
-          <%#= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
-      <%# end if @course %>
-      <div id="preview" class="wiki"></div>
-    </div>
-<%# end %>-->
-
 <div>
   <% if @newss.empty? %>
       <p class="nodata">
@@ -49,10 +30,20 @@
             <%= 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">
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
-              <span class="fl"> <%= l(:label_release_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %><br />
+              <span class="fl">
+                <%= l(:label_release_news) %>：
+              </span>
+              <%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
+              <br />
               <div class="cl mb5"></div>
-              <p  id="news_description_<%= news.id %>" class="news_description mt5"><%= textAreailizable news.description %><br /> <%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></p>
-              <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
+              <p  id="news_description_<%= news.id %>" class="news_description mt5">
+                <%= news.description.html_safe %>
+              </p>
+              <div class="news_foot c_red"  style="cursor:pointer;display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>">
+                <%= l(:button_more)%>...
+                <span class="g-arr-down"></span>
+              </div>
+              <span class="fl"><%= l(:label_end_time)%>：<%= format_time(news.created_on)%></span>
             </div>
             <div class="cl"></div>
           </div><!--problem_main end-->
@@ -62,41 +53,11 @@
 </div>
 <!--end-->
 
-    <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
-
-  <%# other_formats_links do |f| %>
-      <%#= f.link_to 'Atom', :url => {:course_id => @course, :key => User.current.rss_key} %>
-  <%# end %>
-
-  <% content_for :header_tags do %>
-      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-  <% html_title(l(:label_course_news)) -%>
-</div>
-
-<script type='text/javascript'>
-    $(document).ready(function ($) {
-        $('.content-text-list').each(function () {
-            $(this).find('.delete_icon').hide();
-            $(this).mouseenter(function (event) {
-                $(this).find('.delete_icon').show();
-            });
-            $(this).mouseleave(function (event) {
-                $(this).find('.delete_icon').hide();
-            });
-        });
-    });
-    $(function(){
-        $('.news_description').each(function () {
-            if($(this).height() >= 38)
-            {
-                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
-            }
-          }
-        )
-    });
-</script>
+<ul class="wlist">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+</ul>
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
+<% html_title(l(:label_course_news)) -%>
diff --git a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/kindeditor.js b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/kindeditor.js
index d5dd1e443..e58e4b2be 100644
--- a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/kindeditor.js
+++ b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/kindeditor.js
@@ -4922,7 +4922,7 @@ KEditor.prototype = {
 			editDiv = K('.edit', container),
 			statusbar = self.statusbar = K('.statusbar', container);
 		container.removeClass('container')
-			.addClass('ke-container ml56 ke-container-' + self.themeType).css('width', width);
+			.addClass('ke-container ke-container-' + self.themeType).css('width', width);
 		if (fullscreenMode) {
 			container.css({
 				position : 'absolute',
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 9bdcff891..8ecbfef06 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -4917,7 +4917,7 @@ KEditor.prototype = {
 			editDiv = K('.edit', container),
 			statusbar = self.statusbar = K('.statusbar', container);
 		container.removeClass('container')
-			.addClass('ke-container ml56 ke-container-' + self.themeType).css('width', width);
+			.addClass('ke-container  ke-container-' + self.themeType).css('width', width);
 		if (fullscreenMode) {
 			container.css({
 				position : 'absolute',
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 286905017..64b8898f4 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -411,8 +411,20 @@ function regexDeadLine()
     ('#ui-datepicker-div').hide;
 }
 
+//新建、修改课程明码显示
 $(function(){
     $("#psw_btn").click(function() {
         alert("密码: "+$("#course_course_password").val());
     });
 });
+
+//课程通知更多按钮显示
+$(function(){
+    $('.news_description').each(function () {
+            if($(this).height() >= 38)
+            {
+                $('#news_foot_'+$(this).attr('id').replace('news_description_','')).css("display","block");
+            }
+        }
+    )
+});