From f803a23298ceaddc9cb1cb31dcc40400e7dbca3b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 29 Aug 2016 16:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=B4=E5=83=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E5=B0=8F=E7=AC=94=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb           |  2 +-
 .../organizations/_org_custom_header.html.erb | 20 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 3d9f620d6..ba8cbf7a1 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -77,7 +77,7 @@
         <!--<div class="pr_info_logo fl mr10 mb5">-->
         <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
         <!--</div>-->
-        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+        <div class="pr_info_logo fl fl mr10 mb5 pr" id="homepage_portrait_image">
           <% if User.current.logged? && User.current.admin_of_org?(@organization)%>
               <%=link_to image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true%>
               <div class="homepageEditProfile undis">
diff --git a/app/views/organizations/_org_custom_header.html.erb b/app/views/organizations/_org_custom_header.html.erb
index 2c2a5b86b..8722774f7 100644
--- a/app/views/organizations/_org_custom_header.html.erb
+++ b/app/views/organizations/_org_custom_header.html.erb
@@ -1,14 +1,16 @@
 
 <div class="por_header_top">
-  <div class="por_header_con" >
-    <% if User.current.logged? && User.current.admin_of_org?(@organization)%>
-        <%=link_to image_tag(url_to_avatar(@organization),width:"51", height: "51", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true%>
-        <div class="homepageEditProfile undis">
-          <%=link_to '', my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true, :class => 'homepageEditProfileIcon', :title => '点击编辑Logo' %>
-        </div>
-    <% else %>
-        <%= image_tag(url_to_avatar(@organization), :width => "51", :height => "51", :alt => "组织logo") %>
-    <% end %>
+  <div class="por_header_con">
+    <div class="pr fl">
+        <% if User.current.logged? && User.current.admin_of_org?(@organization)%>
+            <%=link_to image_tag(url_to_avatar(@organization),width:"51", height: "51", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true%>
+            <div class="homepageEditProfile undis">
+              <%=link_to '', my_clear_user_avatar_temp_path(:organization => @organization.id), :remote => true, :class => 'homepageEditProfileIcon', :title => '点击编辑Logo' %>
+            </div>
+        <% else %>
+            <%= image_tag(url_to_avatar(@organization), :width => "51", :height => "51", :alt => "组织logo") %>
+        <% end %>
+    </div>
     <%#= image_tag(url_to_avatar(@organization), width:"51", height: "51", :id => 'nh_user_tx', :class => "por_logo fl mt1", :target => "_blank") %>
     <% if User.current.logged? %>
         <div class="navHomepageProfile" id="navHomepageProfile">