From 2a5eeaa527df74bab5c7da1d0838d6c5b2d41823 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 13 Nov 2015 09:13:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BB=84=E7=BB=87=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A6=E8=BE=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=80=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb | 11 ++++++++++-
 config/locales/zh.yml               |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 6209ad260..8985476bb 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -53,12 +53,21 @@
           <div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div>
           <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
 
+          <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;(
             <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
             )&nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id ) %>&nbsp;（<%= @organization.org_members.count %> )
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;（<%= link_to @organization.org_members.count, members_organization_path(@organization.id) %>）
           </div>
         </div>
         <div class="homepageLeftMenuContainer">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 12c1b9258..93775d5ec 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2090,5 +2090,6 @@ zh:
   label_forums: 贴吧交流
   label_language: 语言
   label_license: 湘ICP备09019772
+  label_org_name: 组织名称：