Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

beidou_tim
huang 9 years ago
commit c32479270c

@ -13,48 +13,50 @@
<h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2> <h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="sn-index-partnerbox " > <div class="sn-index-partnerbox " >
<ul id="scrollPic" > <ul id="scrollPic" >
<div style="width: 760px;"> <div class="scroll-control">
<% org_acts.first(8).each do |activity| %> <div class="scroll-container">
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> <% org_acts.first(8).each do |activity| %>
<% document = activity.org_act %> <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
<% org_subfield_id = params[:org_subfield_id] %> <% document = activity.org_act %>
<% flag = 2 %> <% org_subfield_id = params[:org_subfield_id] %>
<% iamge_path = get_image_path_from_content(document.content) %> <% flag = 2 %>
<% if iamge_path.nil? %> <% iamge_path = get_image_path_from_content(document.content) %>
<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> <% if iamge_path.nil? %>
<% else %> <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>
<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> <% else %>
<% end %> <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>
<% elsif activity.container_type == 'OrgSubfield' %> <% end %>
<% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %> <% elsif activity.container_type == 'OrgSubfield' %>
<% message = Message.find(activity.org_act_id) %> <% if activity.org_act_type == 'Message' and activity.org_act_id and Message.where("id=#{activity.org_act_id}").count > 0 %>
<% if message.board.org_subfield_id %> <% message = Message.find(activity.org_act_id) %>
<% iamge_path = get_image_path_from_content(message.content) %> <% if message.board.org_subfield_id %>
<% if iamge_path.nil? %> <% iamge_path = get_image_path_from_content(message.content) %>
<%= 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" %> <% 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 %> <% 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 %> <% end %>
<% else %> <% end %>
<% iamge_path = get_image_path_from_content(message.content) %> <% 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? %> <% 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 %> <% 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 %> <% 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 %>
<% end %> </div>
</div> </div>
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
@ -83,3 +85,18 @@
</div> </div>
<% end %> <% end %>
<% 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>

Loading…
Cancel
Save