From a3c30ee9657d4c76617a1e1d0cb1435b15701de0 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 19 Jan 2016 17:31:59 +0800
Subject: [PATCH] =?UTF-8?q?issue=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/_issue_replies.html.erb | 6 +++---
 db/schema.rb                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index af498b83a..4c5c922f0 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -70,12 +70,11 @@
           <div class="cl"></div>
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id %>' name="notes"></textarea>
           <div class="cl"></div>
-          <div class="mt10 fl">
+          <div class="mt5 fl">
             <%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
           </div>
-          <div class="cl"></div>
           <span nhname='contentmsg_<%= @issue.id %>' class="fl"></span>
-          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <a id="new_message_submit_btn_<%= @issue.id %>" href="javascript:void(0)" class="blue_n_btn fr mt5" style="display:none;">发送</a>
           <div class="cl"></div>
       <% end %>
     </div>
@@ -83,4 +82,5 @@
     <div class="cl"></div>
 
   </div>
+  <div class="cl"></div>
 </div>
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 9f8b75be4..d60f351dd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1213,6 +1213,7 @@ ActiveRecord::Schema.define(:version => 20160115125217) 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
@@ -1366,7 +1367,6 @@ ActiveRecord::Schema.define(:version => 20160115125217) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
   end