jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Tim 2016-05-05 10:36:30 +08:00
parent 9536f87c26 72e19b8b67
commit 71b70cf937
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/organizations/_org_subfield_leftM1.html.erb
View File

@ -1,18 +1,21 @@
<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="cl"></div>
<% if is_default_field?(field) %> <% if is_default_field?(field) %>
<% case field.name %> <% case field.name %>
<% when 'course' %> <% when 'course' %>
<% if @course_acts.blank? %> <% if @course_acts.blank? %>
<h2 class="h2-title"><%= field.name %></h2>
<div class="cl"></div>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %> <% else %>
<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="cl"></div>
<% @course_acts.first(1).each do |act| %> <% @course_acts.first(1).each do |act| %>
<% if act.org_act_type == "HomeworkCommon" %> <% if act.org_act_type == "HomeworkCommon" %>
<% activity = HomeworkCommon.find(act.org_act_id) %> <% activity = HomeworkCommon.find(act.org_act_id) %>
<% iamge_path = get_image_path_from_content(activity.description) %> <% iamge_path = get_image_path_from_content(activity.description) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), student_work_index_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -29,7 +32,7 @@
<% iamge_path = get_image_path_from_content(activity.content) %> <% iamge_path = get_image_path_from_content(activity.content) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -50,7 +53,7 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% iamge_path = get_image_path_from_content(activity.description) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -70,7 +73,7 @@
<% if ( activity.polls_status==2) %> <% if ( activity.polls_status==2) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), Setting.protocol + "://" + Setting.host_name + "/poll/" + activity.id.to_s + "/poll_result", :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -92,15 +95,19 @@
<% end %> <% end %>
<% when 'project' %> <% when 'project' %>
<% if @project_acts.blank? %> <% if @project_acts.blank? %>
<h2 class="h2-title"><%= field.name %></h2>
<div class="cl"></div>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %> <% else %>
<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="cl"></div>
<% @project_acts.first(1).each do |act| %> <% @project_acts.first(1).each do |act| %>
<% if act.org_act_type == "Issue" %> <% if act.org_act_type == "Issue" %>
<% activity = Issue.find(act.org_act_id) %> <% activity = Issue.find(act.org_act_id) %>
<% iamge_path = get_image_path_from_content(activity.description) %> <% iamge_path = get_image_path_from_content(activity.description) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), issue_url_in_org(activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -117,7 +124,7 @@
<% iamge_path = get_image_path_from_content(activity.content) %> <% iamge_path = get_image_path_from_content(activity.content) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -138,7 +145,7 @@
<% iamge_path = get_image_path_from_content(activity.description) %> <% iamge_path = get_image_path_from_content(activity.description) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(activity.board_id, activity.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -158,8 +165,12 @@
<% if field.field_type == "Post" %> <% if field.field_type == "Post" %>
<% org_acts = get_subfield_acts field %> <% org_acts = get_subfield_acts field %>
<% if org_acts.blank? %> <% if org_acts.blank? %>
<h2 class="h2-title"><%= field.name %></h2>
<div class="cl"></div>
<%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftM1_default', :locals => {:field => field} %>
<% else %> <% else %>
<h2 class="h2-title"><%= field.name %><a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="cl"></div>
<% org_acts.first(1).each do |activity| %> <% org_acts.first(1).each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %> <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' && activity.org_act_id != @organization.home_id %>
<% document = activity.org_act %> <% document = activity.org_act %>
@ -168,7 +179,7 @@
<% iamge_path = get_image_path_from_content(document.content) %> <% iamge_path = get_image_path_from_content(document.content) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -192,7 +203,7 @@
<% if message.board.org_subfield_id %> <% if message.board.org_subfield_id %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -211,7 +222,7 @@
<% else %> <% else %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), board_message_path(message.board,activity), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>
@ -234,7 +245,7 @@
<% iamge_path = get_image_path_from_content(news.description) %> <% iamge_path = get_image_path_from_content(news.description) %>
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<% if iamge_path.nil? %> <% if iamge_path.nil? %>
<%= link_to image_tag("/images/default_blank/files-default.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/images/default_blank/left-02.jpg", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "380", :height => "165"), news_path(news), :target => "_blank", :class =>"sn-news-bigimg",:style=>"display:block;" %>
<% end %> <% end %>

2
app/views/organizations/_org_subfield_leftM1_default.html.erb
View File

@ -1,5 +1,5 @@
<div class="sn-news-bigbox fl"> <div class="sn-news-bigbox fl">
<a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/news/img-news-big.jpg" width="380" height="165" alt="" style="display:block;" /></a> <a href="javascript:void(0);" target="_blank" class="sn-news-bigimg"><img src="/images/default_blank/left-02.jpg" width="380" height="165" alt="" style="display:block;" /></a>
<h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3> <h3><a href="javascript:void(0);" target="_blank" class="h3-title"></a></h3>
<span class="txt-grey"></span> <span class="txt-grey"></span>
<div class="sn-news-txt"> <div class="sn-news-txt">