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

app/views/users/_show_user_homework_form.html.erb

@@ -17,7 +17,7 @@
         <% end %>
       </li>
       <li class="subjectCount fl"><%= homework.quotes %></li>
-      <li class="subjectPublisher fl"><%= homework.user.show_name %></li>
+      <li class="subjectPublisher fl hidden"><%= homework.user.show_name %></li>
       <li class="fl subjectDate"><%=format_date homework.publish_time %></li>
     </ul>
 <% end %>

app/views/users/user_import_homeworks.js.erb

@@ -1,4 +1,6 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
 showModal('ajax-modal', '1040px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed").css("border","3px solid #269ac9");
+var mTop = ($(window).height()-646)/2;
+var mLeft = ($(window).width()-1054)/2;
+$('#ajax-modal').parent().css("border","3px solid #269ac9").css("top","mTop").css("left","mLeft").css("position","fixed");

db/schema.rb

@@ -1374,7 +1374,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) 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
     t.datetime "commit_time"
   end
@@ -1863,25 +1862,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
   add_index "user_statuses", ["grade"], :name => "index_user_statuses_on_grade"
   add_index "user_statuses", ["watchers_count"], :name => "index_user_statuses_on_watchers_count"
 
-  create_table "user_wechats", :force => true do |t|
-    t.integer  "subscribe"
-    t.string   "openid"
-    t.string   "nickname"
-    t.integer  "sex"
-    t.string   "language"
-    t.string   "city"
-    t.string   "province"
-    t.string   "country"
-    t.string   "headimgurl"
-    t.string   "subscribe_time"
-    t.string   "unionid"
-    t.string   "remark"
-    t.integer  "groupid"
-    t.integer  "user_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "users", :force => true do |t|
     t.string   "login",                           :default => "",    :null => false
     t.string   "hashed_password",   :limit => 40, :default => "",    :null => false
@@ -1957,14 +1937,6 @@ ActiveRecord::Schema.define(:version => 20160128024452) do
     t.datetime "updated_at",  :null => false
   end
 
-  create_table "wechat_logs", :force => true do |t|
-    t.string   "openid",       :null => false
-    t.text     "request_raw"
-    t.text     "response_raw"
-    t.text     "session_raw"
-    t.datetime "created_at",   :null => false
-  end
-
   create_table "wiki_content_versions", :force => true do |t|
     t.integer  "wiki_content_id",                                       :null => false
     t.integer  "page_id",                                               :null => false