From f313509d991a170db68c27c4350cbe63b9ae965c Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 14 Nov 2015 10:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87id=E7=9A=84=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 32ada4729..b1434bb0f 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -50,13 +50,9 @@
                 <% end %>
             <% end%>
           </div>
-          <div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div>
-          <% if User.current.admin_of_org?(@organization) %>
-            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
-          <% end %>
-
-          <div style="clear:both;">
-            <%= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
+          <div class="orgName fl mb5 f14">
+            <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
             <% if @organization.is_public? %>
                 <span class="img_private"><%= l(:label_public)%></span>
             <% else %>
@@ -64,6 +60,19 @@
             <% end %>
           </div>
 
+          <% if User.current.admin_of_org?(@organization) %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+          <% end %>
+
+          <!--<div style="clear:both;">-->
+            <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
+            <!--<%# if @organization.is_public? %>-->
+                <!--<span class="img_private"><%#= l(:label_public)%></span>-->
+            <!--<%# else %>-->
+                <!--<span class="img_private"><%#= l(:label_private)%></span>-->
+            <!--<%# end %>-->
+          <!--</div>-->
+
           <div class="cl"></div>
           <div class="f12 fontGrey3">
             <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;(