From 51ff1b0aa615ab6bf41bd875ebf825ad74192d85 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 4 May 2016 15:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=A0=8F=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_org_subfield_leftD.html.erb              | 85 +++++++++++--------
 1 file changed, 51 insertions(+), 34 deletions(-)

diff --git a/app/views/organizations/_org_subfield_leftD.html.erb b/app/views/organizations/_org_subfield_leftD.html.erb
index 1ce8b788b..595b3c299 100644
--- a/app/views/organizations/_org_subfield_leftD.html.erb
+++ b/app/views/organizations/_org_subfield_leftD.html.erb
@@ -13,48 +13,50 @@
               <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
               <div class="sn-index-partnerbox " >
                 <ul id="scrollPic" >
-                  <div style="width: 760px;">
-                    <% org_acts.first(8).each do |activity| %>
-                        <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
-                            <% document = activity.org_act %>
-                            <% org_subfield_id = params[:org_subfield_id] %>
-                            <% flag = 2 %>
-                            <% iamge_path = get_image_path_from_content(document.content) %>
-                            <% if iamge_path.nil? %>
-                                <li><%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %></li>
-                            <% else %>
-                                <li><%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg"  %></li>
-                            <% end %>
-                        <% elsif activity.container_type == 'OrgSubfield' %>
-                            <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
-                                <% message = Message.find(activity.org_act_id) %>
-                                <% if message.board.org_subfield_id %>
-                                    <% iamge_path = get_image_path_from_content(message.content) %>
-                                    <% if iamge_path.nil? %>
-                                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                  <div class="scroll-control">
+                      <div class="scroll-container">
+                        <% org_acts.first(8).each do |activity| %>
+                            <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
+                                <% document = activity.org_act %>
+                                <% org_subfield_id = params[:org_subfield_id] %>
+                                <% flag = 2 %>
+                                <% iamge_path = get_image_path_from_content(document.content) %>
+                                <% if iamge_path.nil? %>
+                                    <li class="sn-fl"><%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg" %></li>
+                                <% else %>
+                                    <li class="sn-fl"><%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class => "partnerimg"  %></li>
+                                <% end %>
+                            <% elsif activity.container_type == 'OrgSubfield' %>
+                                <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
+                                    <% message = Message.find(activity.org_act_id) %>
+                                    <% if message.board.org_subfield_id %>
+                                        <% iamge_path = get_image_path_from_content(message.content) %>
+                                        <% if iamge_path.nil? %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                                        <% else %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                                        <% end %>
                                     <% else %>
-                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "partnerimg" %>
+                                        <% iamge_path = get_image_path_from_content(message.content) %>
+                                        <% if iamge_path.nil? %>
+                                            <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <% else %>
+                                            <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <% end %>
                                     <% end %>
-                                <% else %>
-                                    <% iamge_path = get_image_path_from_content(message.content) %>
+                                <% end %>
+                                <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
+                                    <% 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/ad-default.jpg", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <%= link_to image_tag("/images/default_blank/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
                                     <% else %>
-                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "370", :height => "220"), board_message_path(message.board,activity), :target => "_blank", :class => "partnerimg" %>
+                                        <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
                                     <% end %>
                                 <% end %>
                             <% end %>
-                            <% if activity.org_act_type == 'News' and News.where("id=?", activity.org_act_id).count > 0 %>
-                                <% 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/ad-default.jpg", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
-                                <% else %>
-                                    <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "368", :height => "43"), news_path(news), :target => "_blank", :class => "partnerimg" %>
-                                <% end %>
-                            <% end %>
                         <% end %>
-                    <% end %>
+                      </div>
                   </div>
                 </ul>
                 <div class="cl"></div>
@@ -83,3 +85,18 @@
         </div>
     <% end %>
 <% end %>
+
+<script>
+  $(document).ready(function(){
+      var num = $(".scroll-container").children().size();
+      var num = Math.round(num/4);
+      var divWidth = 380*num;
+      $(".scroll-container").css("width",divWidth).css("height",110);
+      if(num%2 != 0) {
+          var controlWidth = 380*num + 380;
+      }else{
+          var controlWidth = 380*num;
+      }
+      $(".scroll-control").css("width",controlWidth);
+  });
+</script>