From 04b2aee166f7e1d839d58b54af253bae45ce888c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 4 May 2016 18:50:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=BF=E5=9D=97=E4=B8=80=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E6=98=BE=E7=A4=BA=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb   |  2 +-
 .../_org_subfield_leftT.html.erb              | 22 +++++++++----------
 ...l => _org_subfield_leftT_default.html.erb} |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename app/views/organizations/{_org_subfield_leftT_default.html => _org_subfield_leftT_default.html.erb} (65%)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index b1bf93052..86bb71710 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 == 1 && params[:org_subfield_id].nil? && params[:list] .nil?
+    if @organization.show_mode.to_i == 1 && 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.where("container_id =? and container_type =? and attachtype =?", @organization, "Organization", 0).order("created_on desc").first
diff --git a/app/views/organizations/_org_subfield_leftT.html.erb b/app/views/organizations/_org_subfield_leftT.html.erb
index e64044a6b..f683aabad 100644
--- a/app/views/organizations/_org_subfield_leftT.html.erb
+++ b/app/views/organizations/_org_subfield_leftT.html.erb
@@ -14,7 +14,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), student_work_index_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -25,7 +25,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -42,7 +42,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -58,7 +58,7 @@
                           <% if ( activity.polls_status==2) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>
@@ -101,7 +101,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), issue_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -112,7 +112,7 @@
                           <% iamge_path = get_image_path_from_content(activity.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -129,7 +129,7 @@
                           <% iamge_path = get_image_path_from_content(activity.description) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_url_in_org(activity.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -172,7 +172,7 @@
                           <% iamge_path = get_image_path_from_content(document.content) %>
                           <div class="fcon" style="display: none;">
                             <% if iamge_path.nil? %>
-                                <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% else %>
                                 <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :style =>"opacity: 1; " %>
                             <% end %>
@@ -190,7 +190,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -211,7 +211,7 @@
                                   <% iamge_path = get_image_path_from_content(content) %>
                                   <div class="fcon" style="display: none;">
                                     <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
+                                        <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% else %>
                                         <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), board_message_path(message.board,activity), :target => "_blank", :style =>"opacity: 1; " %>
                                     <% end %>
@@ -230,7 +230,7 @@
                               <% iamge_path = get_image_path_from_content(news.description) %>
                               <div class="fcon" style="display: none;">
                                 <% if iamge_path.nil? %>
-                                    <%= link_to image_tag("/images/default_blank/banner-default.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
+                                    <%= link_to image_tag("/images/default_blank/left_01.jpg", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% else %>
                                     <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "820", :height => "435"), news_path(news), :target => "_blank", :style =>"opacity: 1; " %>
                                 <% end %>
diff --git a/app/views/organizations/_org_subfield_leftT_default.html b/app/views/organizations/_org_subfield_leftT_default.html.erb
similarity index 65%
rename from app/views/organizations/_org_subfield_leftT_default.html
rename to app/views/organizations/_org_subfield_leftT_default.html.erb
index f2f66758f..2e681965a 100644
--- a/app/views/organizations/_org_subfield_leftT_default.html
+++ b/app/views/organizations/_org_subfield_leftT_default.html.erb
@@ -3,7 +3,7 @@
     <div id="fsD1" class="focus">
         <div  class="fPic">
             <div class="fcon-default">
-                <a target="_blank" href="javascript:void(0);"><img src="/images/default_blank/banner-default.jpg" alt="" ></a>
+                <a><img src="/images/default_blank/left_01.jpg" alt="" ></a>
             </div>
         </div>
     </div>