From 1f43ecb8ed452b46667225fcf98f5d0bfe51ee7f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 3 Jun 2016 14:19:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=B8=8E=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=80=E8=87=B4=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_custom_left2.html.erb  | 22 +++++++++----------
 .../organizations/_org_custom_left3.html.erb  |  8 +++----
 .../organizations/_org_custom_right1.html.erb |  2 +-
 .../organizations/_org_custom_right2.html.erb |  2 +-
 .../organizations/_org_custom_right3.html.erb |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/organizations/_org_custom_left2.html.erb b/app/views/organizations/_org_custom_left2.html.erb
index 3e4651d8c..16e22a1f2 100644
--- a/app/views/organizations/_org_custom_left2.html.erb
+++ b/app/views/organizations/_org_custom_left2.html.erb
@@ -13,7 +13,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.name.to_s, student_work_index_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.name.to_s %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -26,7 +26,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.parent_id.nil? ? activity.subject : activity.parent.subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.parent_id.nil? ? activity.subject : activity.parent.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -39,7 +39,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -59,7 +59,7 @@
                               <%= link_to poll_name, Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => '_blank', :class => "por_course_title link-black", :title => poll_name %>
                           <% end %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
+                              <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"fl" %>
                           <% end %>
@@ -82,7 +82,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.subject, issue_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), issue_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -96,7 +96,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to subject, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "por_course_title link-black", :title => subject %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -109,7 +109,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to activity.title.to_s, news_url_in_org(activity.id), :target => '_blank', :class => "por_course_title link-black", :title => activity.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_url_in_org(activity.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -138,7 +138,7 @@
                     <div class="por_course_bar fl clear">
                       <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => '_blank', :class => "por_course_title link-black", :title => document.title %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
+                          <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"fl" %>
                       <% end %>
@@ -155,7 +155,7 @@
                             <div class="por_course_bar fl clear">
                               <%= link_to title, board_message_url_in_org(message.board.id, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
+                                  <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_url_in_org(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
@@ -166,7 +166,7 @@
                             <div class="por_course_bar fl clear">
                               <%= link_to title, board_message_path(message.board, message.id), :target => '_blank', :class => "por_course_title link-black", :title => title %>
                               <% if iamge_path.nil? %>
-                                  <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
+                                  <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% else %>
                                   <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), board_message_path(message.board.id, message.id), :target => "_blank", :class =>"fl" %>
                               <% end %>
@@ -181,7 +181,7 @@
                         <div class="por_course_bar fl clear">
                           <%= link_to news.title, news_path(news), :target => '_blank', :class => "por_course_title link-black", :title => news.title %>
                           <% if iamge_path.nil? %>
-                              <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
+                              <%= link_to image_tag("/images/default_blank/mo-2.jpg", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% else %>
                               <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "140", :height => "100"), news_path(news), :target => "_blank", :class =>"fl" %>
                           <% end %>
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index ed6cd5ed9..bcfac4933 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -12,7 +12,7 @@
           <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
               <% document = activity.org_act %>
               <% if get_image_path_from_content(document.content).nil? %>
-                  <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
+                  <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
               <% else %>
                   <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
               <% end %>
@@ -30,7 +30,7 @@
                   <% iamge_path = get_image_path_from_content(content) %>
                   <% if message.board.org_subfield_id %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id,message.id), :target => "_blank" %>
                       <% end %>
@@ -42,7 +42,7 @@
                       <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> message.content, :maxheight => 40, :maxwordsnum => 60, :maxwidth => 0, :cl => "por_post_txt"} %>
                   <% else %>
                       <% if iamge_path.nil? %>
-                          <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
+                          <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% else %>
                           <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), board_message_path(message.board, message), :target => "_blank" %>
                       <% end %>
@@ -58,7 +58,7 @@
                   <% news = News.find(activity.org_act_id) %>
                   <% iamge_path = get_image_path_from_content(news.description) %>
                   <% if iamge_path.nil? %>
-                      <%= link_to image_tag("/images/default_blank/left-04.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
+                      <%= link_to image_tag("/images/default_blank/mo-3.jpg", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% else %>
                       <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                   <% end %>
diff --git a/app/views/organizations/_org_custom_right1.html.erb b/app/views/organizations/_org_custom_right1.html.erb
index 192c7bb64..9d710ba54 100644
--- a/app/views/organizations/_org_custom_right1.html.erb
+++ b/app/views/organizations/_org_custom_right1.html.erb
@@ -1,4 +1,4 @@
-<div class="por_news">
+<div class="por_news" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
   <h2 class="por_h2_index clear"><%= field.name %></h2>
   <% if @acts.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
diff --git a/app/views/organizations/_org_custom_right2.html.erb b/app/views/organizations/_org_custom_right2.html.erb
index b6229cd69..b31d2ba70 100644
--- a/app/views/organizations/_org_custom_right2.html.erb
+++ b/app/views/organizations/_org_custom_right2.html.erb
@@ -1,4 +1,4 @@
-<div class="por_projects">
+<div class="por_projects" style="display:<%= field.hide == 0 ? 'block':'none' %>;">
   <h2 class="por_h2_index clear">热点项目</h2>
   <% if containers.blank? %>
       <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
diff --git a/app/views/organizations/_org_custom_right3.html.erb b/app/views/organizations/_org_custom_right3.html.erb
index afb901282..a461a38dc 100644
--- a/app/views/organizations/_org_custom_right3.html.erb
+++ b/app/views/organizations/_org_custom_right3.html.erb
@@ -28,7 +28,7 @@
       </div>
     </div>
 <% elsif field.field_type == "Comptec" || field.field_type == "Compstu" %>
-    <div class="por_teachers">
+    <div class="por_teachers" style="display:<%= field.hide == 0 ? 'block' : 'none' %>;">
       <ul id="por_teachers_nav">
         <li id="por_teachers_nav_1" class="por_teachers_hover" onclick="HoverLi(1);">
           <a href="javascript:void(0);" class="por_teachers_type">名师风采</a>