From 0e03798f6e8f2075fae224089f3f39bdade47b56 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 23 May 2016 16:24:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A1=86=E6=9E=B6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=EF=BC=88yeild=EF=BC=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb  |   2 +-
 app/views/layouts/base_org2.html.erb         |  38 +-----
 app/views/organizations/_show_type2.html.erb |  33 +++++
 app/views/organizations/show.html.erb        | 122 ++++++++++---------
 4 files changed, 102 insertions(+), 93 deletions(-)
 create mode 100644 app/views/organizations/_show_type2.html.erb

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 3ab62bbea..2ab724728 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -76,7 +76,7 @@ class OrganizationsController < ApplicationController
 
   def show
     # 组织新类型 show_mode：判断标准 1为新类型，0为旧
-    if @organization.show_mode.to_i == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.switch_type && params[:org_subfield_id].nil? && params[:list] .nil?
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         # REDO:时间紧，暂时先这样
         @org_logo_attchment = Attachment.find_by_sql("SELECT * from attachments WHERE container_id = #{@organization.id} and container_type = 'Organization' and attachtype = 0 and filename REGEXP '(.jpg|.png|.bmp|.gif|.jpeg)' ORDER BY created_on desc limit 1").first
diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb
index 799aaa42b..e51a62e24 100644
--- a/app/views/layouts/base_org2.html.erb
+++ b/app/views/layouts/base_org2.html.erb
@@ -14,7 +14,7 @@
   <%= javascript_include_tag 'attachments' %>
   <%#= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
-  <%#= yield :header_tags -%>
+  <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
@@ -130,39 +130,9 @@
 <%# over %>
 <!--内容开始-->
 <div class="sn-content">
-<div class="sn-content-left fl sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 1 %>
-          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 3 %>
-          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
-          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
-            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
-            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
-            <div class="cl"></div>
-          </div>
-      <% elsif field.status.to_i == 4 %>
-          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 5 %>
-          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<!--右侧-->
-<div class="sn-content-right fr sn-mt15">
-  <% @subfield_content.each do |field| %>
-      <% if field.status.to_i == 6 %>
-          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 7 %>
-          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 8 %>
-          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
-      <% elsif field.status.to_i == 23 %>
-          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
-      <% end %>
-  <% end %>
-</div>
-<div class="cl"></div>
+  <%= render_flash_messages %>
+  <%= yield %>
+  <%= call_hook :view_layouts_base_content %>
 </div>
 <!--内容结束-->
 <footer>
diff --git a/app/views/organizations/_show_type2.html.erb b/app/views/organizations/_show_type2.html.erb
new file mode 100644
index 000000000..eba77174c
--- /dev/null
+++ b/app/views/organizations/_show_type2.html.erb
@@ -0,0 +1,33 @@
+<div class="sn-content-left fl sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 1 %>
+          <%= render :partial => 'organizations/org_subfield_leftT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 3 %>
+          <%#= render :partial => 'organizations/org_subfield_leftM', :locals => {:field => field} %>
+          <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
+            <%= render :partial => 'organizations/org_subfield_leftM1', :locals => {:field => field} %>
+            <%= render :partial => 'organizations/org_subfield_leftM2', :locals => {:field => field} %>
+            <div class="cl"></div>
+          </div>
+      <% elsif field.status.to_i == 4 %>
+          <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 5 %>
+          <%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<!--右侧-->
+<div class="sn-content-right fr sn-mt15">
+  <% @subfield_content.each do |field| %>
+      <% if field.status.to_i == 6 %>
+          <%= render :partial => 'organizations/org_subfield_rightT', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 7 %>
+          <%= render :partial => 'organizations/org_subfield_rightM', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 8 %>
+          <%= render :partial => 'organizations/org_subfield_rightD', :locals => {:field => field} %>
+      <% elsif field.status.to_i == 23 %>
+          <%= render :partial => 'organizations/org_subfield_rightM2', :locals => {:field => field} %>
+      <% end %>
+  <% end %>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb
index d93ead84b..db3849de9 100644
--- a/app/views/organizations/show.html.erb
+++ b/app/views/organizations/show.html.erb
@@ -1,66 +1,71 @@
-<%= javascript_include_tag "jquery.infinitescroll.js" %>
+<%# 区分两种模式 %>
+<% if @organization.switch_type %>
+    <%= render :partial => 'show_type2' %>
+<% else %>
+    <%= javascript_include_tag "jquery.infinitescroll.js" %>
 
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
-<% end %>
+    <%= content_for(:header_tags) do %>
+        <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <% end %>
 
-<% if params[:show_homepage].nil? and User.current.logged? %>
-    <div class="homepageRightBanner">
-      <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
-      <% if params[:org_subfield_id].nil? %>
-          <ul class="resourcesSelect">
-            <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-              <ul class="homepagePostType">
-                <li>
-                  <ul class="homepagePostTypeHomework fl">
-                    <li class="f14">课程动态</li>
-                    <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
-                      <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
-                    <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
-                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                    <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
-                  </ul>
-                </li>
-                <li>
-                  <ul class="homepagePostTypeProject fl">
-                    <li class="f14">项目动态</li>
-                    <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
-                    <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
-                      <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
-                      <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
-                  </ul>
-                </li>
-                <li>
-                  <ul class="homepagePostTypeProject fl">
-                    <li class="f14">更多</li>
-                    <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
-                    <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+    <% if params[:show_homepage].nil? and User.current.logged? %>
+        <div class="homepageRightBanner">
+          <div class="NewsBannerName"><%= @org_subfield.nil? ? "最新动态":"#{@org_subfield.name}" %></div>
+          <% if params[:org_subfield_id].nil? %>
+              <ul class="resourcesSelect">
+                <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+                  <ul class="homepagePostType">
+                    <li>
+                      <ul class="homepagePostTypeHomework fl">
+                        <li class="f14">课程动态</li>
+                        <li><%= link_to "作业动态", {:controller => "organizations", :action => "show", :type => "course_homework"}, :class => "homepagePostTypeAssignment postTypeGrey"%>
+                          <!--<a href="javascript:void(0);" class="homepagePostTypeAssignment postTypeGrey">作业动态</a>--></li>
+                        <li><%= link_to "通知动态", {:controller => "organizations", :action => "show", :type => "course_news"}, :class => "homepagePostTypeNotice postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeNotice postTypeGrey">通知动态</a></li>-->
+                        <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "course_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                        <li><%= link_to "问卷动态", {:controller => "organizations", :action => "show", :type => "course_poll"}, :class => "homepagePostTypeQuiz postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuiz postTypeGrey">问卷动态</a></li>-->
+                      </ul>
+                    </li>
+                    <li>
+                      <ul class="homepagePostTypeProject fl">
+                        <li class="f14">项目动态</li>
+                        <li><%= link_to "问题动态", {:controller => "organizations", :action => "show", :type => "project_issue"}, :class => "homepagePostTypeQuestion postTypeGrey"%>
+                        <li><%= link_to "论坛动态", {:controller => "organizations", :action => "show", :type => "project_message"}, :class => "homepagePostTypeForum postTypeGrey"%>
+                          <!--<li><a href="javascript:void(0);" class="homepagePostTypeQuestion postTypeGrey">问题动态</a></li>
+                          <li><a href="javascript:void(0);" class="homepagePostTypeForum postTypeGrey">论坛动态</a></li>-->
+                      </ul>
+                    </li>
+                    <li>
+                      <ul class="homepagePostTypeProject fl">
+                        <li class="f14">更多</li>
+                        <li class="mt-4"><%= link_to "组织动态", {:controller => "organizations", :action => "show", :type => "org"}, :class =>"homepagePostTypeMessage postTypeGrey"%>
+                        <li class="mt-4"><%= link_to "全部动态", {:controller => "organizations", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%>
+                      </ul>
+                    </li>
                   </ul>
                 </li>
               </ul>
-            </li>
-          </ul>
-      <% end %>
-    </div>
-<% end %>
-<% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
-    <script>
-        $(function() {
-            sd_create_editor_from_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "100%", 'OrgActivity');
-        });
-    </script>
-    <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
-    <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
-<% end  %>
-<% if @org_activities %>
-    <%= render :partial =>  'organizations/org_activities',
-               :locals => {:org_activities => @org_activities,
-                           :page=> @page,
-                           :org => @organization,
-                           :org_act_count=> @org_activities.count} %>
+          <% end %>
+        </div>
+    <% end %>
+    <% if !@organization.home_id.nil? and OrgDocumentComment.where("id = ?", @organization.home_id).count > 0 and params[:org_subfield_id].nil? %>
+        <script>
+            $(function() {
+                sd_create_editor_from_data(<%= OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?",@organization.home_id).first.id %>, null, "100%", 'OrgActivity');
+            });
+        </script>
+        <% act = OrgActivity.where("org_act_type = 'OrgDocumentComment' and org_act_id =?", @organization.home_id).first %>
+        <%= render :partial => 'show_home_page', :locals => {:document => OrgDocumentComment.find(@organization.home_id), :home_id => @organization.home_id, :act => act} %>
+    <% end  %>
+    <% if @org_activities %>
+        <%= render :partial =>  'organizations/org_activities',
+                   :locals => {:org_activities => @org_activities,
+                               :page=> @page,
+                               :org => @organization,
+                               :org_act_count=> @org_activities.count} %>
+    <% end %>
 <% end %>
 
 
@@ -70,3 +75,4 @@
 
 
 
+