Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop

app/views/attachments/_show_attachment_history.html.erb

@@ -16,8 +16,9 @@
         <span class="attachment">
           <%= link_to truncate(history.filename,length: 35, omission: '...'),
                       download_history_attachment_path(history.id, history.filename),
-                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b"  %>
-          <span>版本号：<%= history.version %></span>
+                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b link_file_a2 fl"  %>
+          <span class="fr">版本号：<%= history.version %></span>
+          <div class="cl"></div>
         </span>
 
     <% end %>

db/schema.rb

@@ -1219,6 +1219,7 @@ ActiveRecord::Schema.define(:version => 20160202034530) do
   create_table "org_members", :force => true do |t|
     t.integer  "user_id"
     t.integer  "organization_id"
+    t.string   "role"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end

public/stylesheets/courses.css

@@ -1083,6 +1083,7 @@ a.c_grey{ color:#999999;}
 a:hover.c_grey{ color:#333;}
 a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .last_time{width:auto; text-align:right; margin-right:70px;}
 .link_file_box{ width:360px;}