From 5df44ba44f09ab84dffd2295885cd00f75cd8f70 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 20 Feb 2016 15:18:24 +0800
Subject: [PATCH] =?UTF-8?q?1.ke=E5=9B=9E=E5=A4=8D=E6=A1=86=E8=83=BD?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A2=9E=E5=8A=A0=E9=AB=98=E5=BA=A6=EF=BC=9B?=
 =?UTF-8?q?2.=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E9=93=BE=E6=8E=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb     | 13 ++++---------
 public/javascripts/create_kindeditor.js |  2 +-
 public/stylesheets/org.css              |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 9d3f76cc6..9f026d69d 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -43,16 +43,11 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
-          <span class="orgMenuArrow" id="orgArrow">
-            <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
-              <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-            </ul>
-          </span>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
+            <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), user_path(User.current),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
+            <%= link_to User.current, user_path(User.current),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
+            <%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
-          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js
index bc28aa2bd..fc2ac8938 100644
--- a/public/javascripts/create_kindeditor.js
+++ b/public/javascripts/create_kindeditor.js
@@ -19,7 +19,7 @@ function sd_create_editor(params){
             var edit = this.edit;
             var body = edit.doc.body;
             edit.iframe.height(paramsHeight);
-            //this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
+            this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : (params.kindutil.GECKO ? body.offsetHeight+26:body.offsetHeight))  , paramsHeight));
         },
         afterBlur:function(){
             //params.toolbar_container.hide();
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 42a557010..4d09449b4 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -69,7 +69,7 @@ a.linkGrey8:hover {color:#585858;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
                    position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
-#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
+#orgUserName {display:inline-block;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:55px; float:left;}