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

app/helpers/issues_helper.rb

@@ -340,9 +340,9 @@ module IssuesHelper
       if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
         if options[:token].nil?
-          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :class=> "info_foot_num c_blue")
         else
-          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token])
+          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token], :class=> "info_foot_num c_blue")
         end
         if options[:only_path] != false && atta.is_text?
           value += link_to(

app/views/issues/_history.html.erb

@@ -12,7 +12,7 @@
         <p>
         <% if journal.details.any? %>
 			<% details_to_strings(journal.details).each do |string| %>
-                <%= string %>
+                <p><%= string %></p>
 		    <% end %>
         <% end %>
         </p>

public/stylesheets/pleft.css

@@ -50,7 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
-.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
+.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
 /****标签(和资源库的tag样式一致)***/
 .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px;  padding-top:5px; margin-bottom:10px;}

public/stylesheets/project.css

@@ -517,3 +517,6 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 .other-formats span + span:before { content: "| "; }
 
 
+/*pre标签换行*/
+.break_word{word-break: break-all;word-wrap: break-word;}
+.break_word_firefox{white-space: pre-wrap;word-break: break-all;}