From 87f5f9c380b57052c00fc989eb9258b5accdea4b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 23 Feb 2016 15:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E5=9B=BE=E7=89=87=E6=8E=92=E7=89=88=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=85=B3=E8=81=94=E7=BB=84=E7=BB=87=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/settings/_join_org.html.erb | 4 ++--
 app/views/layouts/new_base_user.html.erb      | 1 +
 public/stylesheets/org.css                    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/settings/_join_org.html.erb b/app/views/courses/settings/_join_org.html.erb
index fff0f807c..f7b4d7551 100644
--- a/app/views/courses/settings/_join_org.html.erb
+++ b/app/views/courses/settings/_join_org.html.erb
@@ -15,8 +15,8 @@
         <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
         <div id="search_orgs_result_list" class="ml20"></div>
         <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
-        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="course_join_org(<%= @course.id %>);">关联</a>
-        <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mt5" onclick="course_join_org(<%= @course.id %>);">关联</a>
+        <a href="javascript:void(0);" class="org-cancel-btn db fl mt5" onclick="cancel_join_orgs();">取消</a>
     <% end %>
   </div>
   <div class="relatedList fr">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7c4b4fad4..731162920 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -272,6 +272,7 @@
       <div class="showpicBox">
         <p>预览</p>
         <%= image_tag(url_to_avatar(@user), :style=>"width:96px;height:96px;",:class=>"mb5 mt10",:nhname=>'avatar_image') %>
+        <br/>
         <span >96px*96px</span> <br />
         <div class="mb20"></div>
         <%= image_tag(url_to_avatar(@user), :style=>"width:48px;height:48px;",:class=>"mb5",:nhname=>'avatar_image') %>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 06c8022c6..aa2d0be18 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -40,6 +40,8 @@ a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
 .searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;}
 a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
 a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
+a.org-cancel-btn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
+a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;}
 .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .relatedListOption {width:80px; text-align:center;}