From 3b6d6596c0f92c028e89fc3963db4e34a8740502 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jul 2015 11:59:15 +0800
Subject: [PATCH] =?UTF-8?q?3218=203219=E7=BC=BA=E9=99=B7=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb  | 4 ++--
 app/views/my/clear_user_avatar_temp.js.erb | 3 ++-
 app/views/my/save_user_avatar.js.erb       | 2 +-
 db/schema.rb                               | 8 +-------
 public/stylesheets/users.css               | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index ef6d82245..3d0052b25 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -116,7 +116,7 @@ $(".subNav").click(function(){
     <div id="LSide" class="fl">
       <div class="users_info">
         <div class="pic_head">
-          <%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:216px;height:216px;",:alt=>"头像") %>
+          <%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>
           <% if @center_flag %>
           <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="pic_edit usersphoto_edit"></a>
           <% end %>
@@ -320,7 +320,7 @@ $(".subNav").click(function(){
         <span>48px*48px</span> <br />
       </div>
       <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr2"> 取&nbsp;&nbsp;消</a>
+      <a href="javascript:hideModal();" class=" fr grey_btn mr15"> 取&nbsp;&nbsp;消</a>
       <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10">确&nbsp;&nbsp;定</a>
 
     </div><!--talknew end-->
diff --git a/app/views/my/clear_user_avatar_temp.js.erb b/app/views/my/clear_user_avatar_temp.js.erb
index 9513bdac4..788678673 100644
--- a/app/views/my/clear_user_avatar_temp.js.erb
+++ b/app/views/my/clear_user_avatar_temp.js.erb
@@ -4,4 +4,5 @@
     $('#ajax-modal').siblings().hide();
     $('#ajax-modal').parent().removeClass("alert_praise");
     //$('#ajax-modal').parent().css("top","").css("left","");
-    $('#ajax-modal').parent().addClass("alert_box");
\ No newline at end of file
+    $('#ajax-modal').parent().addClass("alert_box");
+    $('#ajax-modal').parent().css("border", "2px solid #15bccf").css("border-radius", "0").css(" -webkit-border-radius", "0").css(" -moz-border-radius", "0");
\ No newline at end of file
diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index ce4bae501..54cb3de48 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,2 +1,2 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:216px;height:216px;",:alt=>"头像") %>');
+$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>');
 hideModal();
\ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 243079ed8..276989788 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -454,13 +454,6 @@ ActiveRecord::Schema.define(:version => 20150719092427) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -861,6 +854,7 @@ ActiveRecord::Schema.define(:version => 20150719092427) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
+    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 81529288c..25ac1cbb5 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -113,7 +113,7 @@ a:hover.c_lgrey{ color:#3ca5c6;}
 /* 20150506上传头像*/
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
-.mr2{ margin-right:2px;}
+.mr15{ margin-right:15px;}
 .uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
 /* 新建作品*/
 .mr8{ margin-right:8px;}