Merge branch 'develop' into szzh

app/views/attachments/_links.html.erb

@@ -12,7 +12,7 @@
                 :filename => attachment.filename%>
   <% end %>
   <span title="<%= attachment.description%>">
-    <%= h(truncate(" - #{attachment.description}", length: 20, omission: '...')) unless attachment.description.blank? %>
+    <%= h(truncate(" - #{attachment.description}", length: 15, omission: '...')) unless attachment.description.blank? %>
   </span>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:deletable] %>
@@ -34,7 +34,10 @@
   <% end %>
   <% if options[:author] %>
       <!-- modified by zjc author添加超链接 -->
-    <span class="author"><%= link_to h(attachment.author),user_path(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
+    <span class="author" title="attachment.author">
+      <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %>,
+      <%= format_time(attachment.created_on) %>
+    </span>
   <% end %>
   </p>
 <% end %>

app/views/layouts/base_memos.html.erb

@@ -56,7 +56,7 @@
 							<div class="sidebar-forums">
 								<div class="forums-line">																																							
 								<div class="forums-title"><%= @forum.name %></div>
-								<div class="forums-description"><%= textilizable @forum.description %></div>
+								<div class="forums-description"><%= textAreailizable @forum.description %></div>
 								</div>																																		
 							<!--informations-->
 								<div class="formus-first-title" >创建人信息</div>

db/migrate/20140922032830_change225_bid_data.rb

@@ -0,0 +1,13 @@
+class Change225BidData < ActiveRecord::Migration
+  def up
+    bid = Bid.find 225
+    bid.proportion = 60
+    bid.save
+  end
+
+  def down
+    bid = Bid.find 225
+    bid.proportion = 60
+    bid.save
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140916005319) do
+ActiveRecord::Schema.define(:version => 20140922032830) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false