From f9166a71a75a5e73a14c69451ea058877594b34f Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Tue, 20 May 2014 09:12:15 +0800
Subject: [PATCH] issues#555

---
 app/views/layouts/base_courses.html.erb |   4 +-
 app/views/news/index.html.erb           | 180 +++++++++++++-----------
 2 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index bbdfbfe6..785479bd 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -140,7 +140,7 @@
     <!--info-->
 
     <div class="inf_user_context">
-      <table style="font-family:微软雅黑">
+      <table>
 
         <!-- addedby bai 教师姓名加超链接、加入开课时间、结课时间与课时 -->
         <tr>
@@ -266,5 +266,7 @@
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>
+</div>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 499c58b3..4dfa21d5 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -1,100 +1,108 @@
-<!-- added by huang -->
 <%
-	if @project.project_type == 1
-		btn_tips = l(:label_news_notice)
-		label_tips = l(:label_course_news)
-	else
-		btn_tips = l(:label_news_new)
-		label_tips = l(:label_news)
-	end
+   if @project.project_type == Project::ProjectType_course
+     btn_tips = l(:label_news_notice)
+     label_tips = l(:label_course_news)
+   else
+     btn_tips = l(:label_news_new)
+     label_tips = l(:label_news)
+   end
 %>
-<% if @project && User.current.allowed_to?(:manage_news, @project) %>
-<div class="content-title-top">
-	<%= link_to(btn_tips,
-	new_project_news_path(@project),
-	:class => 'icon icon-add',
-	:onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
-</div>
 
-<div id="add-news" class="add_frame" style="display:none;">
-	<%= labelled_form_for @news, :url => project_news_index_path(@project),
-	:html => { :id => 'news-form', :multipart => true } do |f| %>
-	<%= render :partial => 'news/form', :locals => { :f => f } %>
-	<%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
-	<%= preview_link preview_news_path(:project_id => @project), 'news-form' ,target='preview',{:class => 'whiteButton m3p10'}%> |
-	<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' ,:class => 'whiteButton m3p10' %>
-	<% end if @project %>
-	<div id="preview" class="wiki"></div>
-</div>
+<span style="font-size: 16px; border-bottom:1px solid #f0f0f0; margin-right: 15px;">
+	<%= label_tips %>
+</span>
+<%= link_to(btn_tips,
+          new_project_news_path(@project),
+          :class => 'icon icon-add',
+          :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') %>
+
+<% if @project && User.current.allowed_to?(:manage_news, @project) %>
+    <div id="add-news" class="add_frame" style="display:none;">
+      <%= labelled_form_for @news, :url => project_news_index_path(@project),
+                            :html => {:id => 'news-form', :multipart => true} do |f| %>
+          <%= render :partial => 'news/form', :locals => {:f => f} %>
+          <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit  --> |
+          <%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
+          |
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+      <% end if @project %>
+      <div id="preview" class="wiki"></div>
+    </div>
 <% end %>
-<!--add by huang :list news-->
-<h3 style="font-weight:400; margin-left:0px; margin-top:-12px; margin-left:-5px; border-bottom:1px solid #f0f0f0"><%=label_tips%></h3>
 <div>
-	<% if @newss.empty? %>
-	<p class="nodata">
-		<%= l(:label_no_data) %>
-	</p>
-	<% else %>
-	<% @newss.each do |news| %>
-   
-    <table class="content-text-list">
-    <tr>
-			<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
-			<td>
-			<table width="580px" border="0">
-				<% if @project.project_type == 1 %>
-				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice)%></span><span><%= link_to h(news.title), news_path(news) %></span>
-						<span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td> 						
-				</tr>
-				<% else %>
-				<tr>
-					<td colspan="2" valign="top"><strong><%= link_to_user(news.author)if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare)%></span><span> <%= link_to h(news.title), news_path(news) %></span>
-						<span style="float: right" class='delete_icon'> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span></td>
-				</tr>
-				<% end %>
-				<tr>
-					<td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
-				</tr>
-				<tr>
-					<td align="left"><span class="font_lighter"> <%= l :label_update_time %>：&nbsp;<%= format_time(news.created_on) %></span></td>
-					<td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
-				</tr>
-			</table></td>
-		</tr>
-	</table>
-	<% end %>
-	<% end %>
+  <% if @newss.empty? %>
+      <p class="nodata">
+        <%= l(:label_no_data) %>
+      </p>
+  <% else %>
+      <% @newss.each do |news| %>
+
+          <table class="content-text-list">
+            <tr>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(news.author), :class => "avatar"), user_path(news.author) %></td>
+              <td>
+                <table width="580px" border="0">
+                  <% if @project.project_type == 1 %>
+                      <tr>
+                        <td colspan="2" valign="top">
+                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_notice) %></span><span><%= link_to h(news.title), news_path(news) %></span>
+                          <span style="float: right"><%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
+                        </td>
+                      </tr>
+                  <% else %>
+                      <tr>
+                        <td colspan="2" valign="top">
+                          <strong><%= link_to_user(news.author) if news.respond_to?(:author) %></strong><span style="margin-left: 4px;" class="font_lighter"><%= l(:label_project_newshare) %></span><span> <%= link_to h(news.title), news_path(news) %></span>
+                          <span style="float: right" class='delete_icon'> <%= delete_link news_path(news) if User.current.allowed_to?(:manage_news, @project) %> </span>
+                        </td>
+                      </tr>
+                  <% end %>
+                  <tr>
+                    <td colspan="2" width="580px">
+                      <span class="font_description"><%= textilizable(news, :description) %></span></td>
+                  </tr>
+                  <tr>
+                    <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
+                      ：&nbsp;<%= format_time(news.created_on) %></span></td>
+                    <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+      <% end %>
+  <% end %>
 </div>
 <!--end-->
 <div style="padding-right: 10px">
-	<div class="pagination">
-		<ul>
-			<%= pagination_links_full @news_pages %>
-		</ul>
-	</div>
+  <div class="pagination">
+    <ul>
+      <%= pagination_links_full @news_pages %>
+    </ul>
+  </div>
 
-	<% other_formats_links do |f| %>
-	<%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-	<% end %>
+  <% other_formats_links do |f| %>
+      <%= f.link_to 'Atom', :url => {:project_id => @project, :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 %>
+  <% 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_news_plural)) -%>
+  <% html_title(l(:label_news_plural)) -%>
 </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();
-			});
-		});
-	});
+    $(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();
+            });
+        });
+    });
 </script>