Merge remote-tracking branch 'origin/szzh' into szzh

app/views/layouts/base_org.html.erb

@@ -50,13 +50,9 @@
                 <% end %>
             <% end%>
           </div>
-          <div class="orgName fl mb5 f14">组织id：<%= @organization.id %></div>
+          <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
-          <% if User.current.admin_of_org?(@organization) %>
+          <div class="orgName fl mb5 f14">
-            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+            <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-          <% 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 %>
@@ -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;(

app/views/organizations/_show_org_document.html.erb

@@ -6,7 +6,8 @@
     <div class="homepagePostDes">
       <div class="homepagePostTo">
         <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
-      TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue"  %> |
+        TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
+        |
         <% if document.organization.home_id == document.id %>
             <span style="color:#269ac9;">首页</span>
         <% else %>
@@ -46,10 +47,10 @@
               </li>
             </ul>
           </div>
-        </div>
           <div class="cl"></div>
-        </div>
       <% end %>
+    </div>
+  </div>
   <% comments_for_doc = document.children.reorder("created_at desc") %>
   <% count = document.children.count() %>