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

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">

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') %>

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;}