Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	app/views/issues/_history.html.erb
	public/stylesheets/project.css

app/helpers/application_helper.rb

@@ -325,6 +325,20 @@ module ApplicationHelper
             :title => attachment.filename
   end
 
+  def thumbnail_issue_tag(attachment)
+    imagesize = attachment.thumbnail(:size => "50*50")
+    imagepath = named_attachment_path(attachment, attachment.filename)
+    if imagesize
+      link_to image_tag(imagesize),
+              imagepath,
+              :title => attachment.filename
+    else
+      link_to image_tag(imagepath , height: '73', width: '100'),
+              imagepath,
+              :title => attachment.filename
+    end
+  end
+
   # 图片缩略图链接
   def thumbnail_small_tag(attachment)
     imagesize = attachment.thumbnail(:size => "200*200")

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 %>
@@ -62,11 +62,9 @@
   <% if defined?(thumbnails) && thumbnails %>
       <% images = attachments.select(&:thumbnailable?) %>
       <% if images.any? %>
-          <div class="thumbnails">
             <% images.each do |attachment| %>
-                <div><%= thumbnail_tag(attachment) %></div>
+                <div class="pro_pic fl " width="100" height="73"><%= thumbnail_issue_tag(attachment) %></div>
             <% end %>
-          </div>
       <% end %>
   <% end %>
 </div>

app/views/issues/_edit.html.erb

@@ -18,7 +18,7 @@
           <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
         </div>
     <% end %>
-    <fieldset><legend>说明</legend>
+    <fieldset><legend>回复</legend>
     <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
     </fieldset>
     <!--<%# if @issue.safe_attribute? 'private_notes' %>-->
@@ -29,7 +29,7 @@
     <!--</fieldset>-->
 
     <!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
-    <!--<p style="padding-top: 5px;"><%= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>-->
+    <!--<p style="padding-top: 5px;"><%#= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>
     <!--</fieldset>-->
 
     <div class="cl"></div>

app/views/issues/show.html.erb

@@ -115,7 +115,7 @@
       </div>
   <% end %>
   <!--留言-->
-  <br>
+  <p style="padding-top: 5px"></p>
   <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
     <%= l(:button_submit) %>
   </a>

app/views/news/_project_news.html.erb

@@ -29,7 +29,7 @@
               <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
               <span class="fl"> <%= l(:label_add_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"><%= news.description %><br /> </p>
+              <p  id="news_description_<%= news.id %>" class="mt5 break_word"><%= news.description %><br /> </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>
               <span class="f1"><%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></span>
             </div>

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-->

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 {