From 3465a39285618f787c5c4db8a90966192e95eb22 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 13:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=20?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index e344e64dd..ff94326a0 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -77,7 +77,7 @@
       <% @subfield_content.each do |field| %>
           <% if is_default_field?(field) %>
               <% case field.name %>
-      <% when 'activity' %>
+              <% when 'activity' %>
                   <%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
               <% when 'course' %>
                   <a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
@@ -92,6 +92,9 @@
               <% end %>
           <% end %>
       <% end %>
+      <% if User.current.admin_of_org?(@organization) %>
+          <a href="<%= setting_organization_path(@organization) %>" class="fl">配置</a>
+      <% end %>
     </div>
   </div><!--nav end-->
 
@@ -109,7 +112,7 @@
           <% when 'course' %>
               <div class="box1 bg-grey">
                 <div class="content">
-                  <div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
                   <div class="course-list">
                     <ul class="clearfix">
                       <% unless @course_acts_homework.nil? %>
@@ -136,14 +139,12 @@
                       <div class="cl"></div>
                     </ul>
                   </div>
-
-
                 </div><!--content end-->
               </div><!--box1 end-->
           <% when 'project' %>
               <div class="box1">
                 <div class="content">
-                  <div class="box-top" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
+                  <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
                   <div class="row">
                     <% unless @project_message_acts.nil? %>
                     <div class="row-l fl">
@@ -177,7 +178,7 @@
               <% ids = field.org_document_comments.map{|o| o.id}.join(",") %>
               <div class="box1 bg-grey" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
-                  <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %><%= field.id %></h2><p class="box-title-p">discussion zone</p></div>
+                  <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">discussion zone</p></div>
                   <div class="row">
                     <div class="con-left fl">
                       <% message_ats.each do |act| %>
@@ -206,7 +207,7 @@
               <% org_attachs = get_attach_org2(field) %>
               <div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
                 <div class="content">
-                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %><%= field.id %></h2><p class="box-title-p">resource dwonload</p></div>
+                  <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">resource dwonload</p></div>
                   <div class="row">
                     <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
                     <!--row-ziyuan end-->