From fbcd9f9a96081e1bad159221e3ab940000c7d809 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 17 Apr 2015 08:28:07 +0800
Subject: [PATCH] =?UTF-8?q?wiki=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/_project_file_links.html.erb     |  2 +-
 app/views/wiki/show.html.erb                     |  2 +-
 public/stylesheets/project.css                   | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index 7a9d1a6ca..97cbefce9 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -53,7 +53,7 @@
       <% end %>
       <% if options[:author] %>
     <span class="author" title="<%= attachment.author%>">
-      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>,
+      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange ml20" %>,
       <%= format_time(attachment.created_on) %>
     </span>
       <% end %>
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index a23aa6c04..28fab1243 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -45,7 +45,7 @@
 <% end %>
 <div class="cl"></div>
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-<%= link_to_attachment_project @page, :author => false %>
+<%= link_to_attachment_project @page, :author => true %>
 <!--<a href="javascript:void(0)" class=" c_orange fl ml20 fl">zhang<span class="c_grey"> 2014-08-04 10:09</span></a>-->
 </div>
 <!--wiki new-->
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index c6b58b8f3..e3b124474 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -466,6 +466,21 @@ img.ui-datepicker-trigger {
 .wiki_con_box{ line-height:1.9; color:#2d2d2d;}
 .wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
 #wiki_new_box{ display:none;}
+/*wiki显示附加*/
+.wiki-page {
+    font-size: 14px;
+    color: #09658C !important;
+    font-weight: bold;
+    width: 630px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    margin-bottom: 10px;
+}
+/*.author{*/
+    /*color: #FF5722;*/
+    /*margin-left:20px;*/
+/*}*/
 
 /*里程碑进度条*/
 table.progress {
@@ -501,3 +516,4 @@ a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px
 p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 .other-formats span + span:before { content: "| "; }
 
+