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

北斗资源库板块

This commit is contained in:
huang 2016-03-29 16:45:14 +08:00
parent 80cd5089a4
commit d28a46c48a
6 changed files with 38 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/organizations_helper.rb
View File

@ -28,16 +28,12 @@ module OrganizationsHelper
end
end
def get_project_activities_org org
end
def get_course_activity_org org
end
def get_message_org(org_id, field_id)
OrgDocumentComment.find_by_sql("SELECT * FROM org_document_comments where organization_id = #{org_id} and org_subfield_id = #{field_id} order by updated_at desc limit 3;")
end
def get_attach_org(field_id)
Attachment.find_by_sql("SELECT * FROM `attachments` where container_id =#{field_id} and container_type = 'OrgSubfield' and is_public =1 order by created_on limit 6;")
end
end

80
app/views/layouts/base_org_newstyle.html.erb
View File

@ -10,7 +10,7 @@
<%= javascript_heads %>
<%= heads_for_theme %>
<%= stylesheet_link_tag 'org_new_style' %>
<%= javascript_include_tag 'org'%>
<%= javascript_include_tag 'org' %>
<%= javascript_include_tag 'attachments' %>
<%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags -->
@ -125,15 +125,15 @@
<% when 'activity' %>
<%= link_to "首页", organization_path(@organization), :class => "fl navact" %>
<% when 'course' %>
<a href="#" class="fl"> 课程动态</a>
<a href="#course_<%= field.id %>" class="fl"> 课程动态</a>
<% when 'project' %>
<a href="#" class="fl">项目动态</a>
<a href="#project_<%= field.id %>" class="fl">项目动态</a>
<% end %>
<% else %>
<% if field.field_type == "Post" && field.hide == 0 %>
<%= link_to field.name, organization_path(@organization), :class => "fl" %>
<a href="#message_<%= field.id %>" class="fl"><%= field.name %></a>
<% elsif field.field_type == "Resource" && field.hide == 0%>
<%= link_to field.name, organization_path(@organization), :class => "fl" %>
<a href="#resource_<%= field.id %>" class="fl"><%= field.name %></a>
<% end %>
<% end %>
<% end %>
@ -193,7 +193,7 @@
<% when 'course' %>
<div class="box1">
<div class="content">
<div class="box-top"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
<div class="box-top" id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
<div class="row ">
<div class="row-box1 mr40 fl">
<a href="#" target="_blank" class="row-img"><img src="/images/org_new_style/img1.jpg"></a>
@ -262,7 +262,7 @@
<% when 'project' %>
<div class="box2">
<div class="content">
<div class="box-top"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
<div class="box-top" id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p">project activities</p></div>
<!--start-slider2-->
<div class="slider2-bg">
<div class="container">
@ -271,7 +271,7 @@
<% @project_acts.each do |act| %>
<% if act.container_type == 'Project' %>
<% case act.org_act_type.to_s %>
<% when 'Issue' %>
<% when 'Issue' %>
<%= render :partial => 'organizations/org_new_project_issues', :locals => {:activity => Issue.find(act.org_act_id)} %>
<% when 'Message' %>
<%= render :partial => 'organizations/org_new_project_message', :locals => {:activity => Message.find(act.org_act_id)} %>
@ -327,7 +327,7 @@
<% message_ats = get_message_org(@organization.id, field.id) %>
<div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
<div class="content">
<div class="box-top"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">activity zone</p></div>
<div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">activity zone</p></div>
<div class="row">
<% message_ats.each do |message| %>
<div class="row-box3 mr30 fl">
@ -346,67 +346,13 @@
</div><!--content end-->
</div> <!--box1 end-->
<% elsif field.field_type == "Resource" %>
<% org_attachs = get_attach_org(field.id) %>
<div class="box1" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
<div class="content">
<div class="box-top"><h2 class="box-title">北斗资源下载</h2><p class="box-title-p">resource dwonload</p></div>
<div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2><p class="box-title-p">resource dwonload</p></div>
<div class="row">
<div class="fl">
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资资源名称资源名称资源资源名称资源名称资源源</a>
<p class="fl"><span >上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资源</a>
<p class="fl"><span>上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资源</a>
<p class="fl"><span>上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
</div>
<div class="fl ml60">
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资源</a>
<p class="fl"><span>上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资源</a>
<p class="fl"><span>上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<div class="row-ziyuan ">
<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>
<div class="ziyuan-box fl">
<a href="#" class="fl ziyuan-title" ><span></span>资源名称资源名称资源名称资源名称资源</a>
<p class="fl"><span>上传时间：2016-01-01</span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
<!--row-ziyuan end-->
</div>
<div class="cl"></div>
</div><!--row end-->

3
app/views/organizations/_org_new_project_create.html.erb
View File

@ -1,3 +0,0 @@
<% project = Project.find(activity.org_act_id) %>
<h3><span><%= format_time(project.updated_on) %>项目社区</span><%= project.name %></h3>
<p><%= project.description %></p>

10
app/views/organizations/_org_new_project_message.html.erb
View File

@ -5,11 +5,11 @@
<%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id) %>
<% end %>
</h3>
<% if activity.parent_id.nil? %>
<% content = activity.content%>
<% else %>
<% content = activity.parent.content%>
<% end %>
<p>
<% if activity.parent_id.nil? %>
<% content = activity.content%>
<% else %>
<% content = activity.parent.content%>
<% end %>
<%= content.to_s.html_safe %>
</p>

14
app/views/organizations/_org_new_resource.html.erb Normal file
View File

@ -0,0 +1,14 @@
<% org_attachs.each do |attach| %>
<div class="row-ziyuan fl">
<%= link_to image_tag(url_to_avatar(attach.author),:width => "40", :height => "40"), user_path(attach.author), :class => "fl user-img" %>
<!--<a href="#" class="fl user-img" ><img src="images/detailimg4.jpg" /></a>-->
<div class="ziyuan-box fl">
<%= link_to truncate(attach.filename,length: 35, omission: '...'),
download_named_attachment_path(attach.id, attach.filename),
:title => attach.filename+"\n"+attach.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;", :class => "fl ziyuan-title" %>
<p class="fl"><span >上传时间：<%= format_time attach.created_on %></span><span>类型：软件</span><span> 上传者：尹刚</span> <span>下载次数：40</span></p>
</div>
<a href="#" class="download-btn fl" >下载</a>
<div class="cl"></div>
</div><!--row-ziyuan end-->
<% end %>

4
public/stylesheets/org_new_style.css
View File

@ -122,7 +122,7 @@ background:url(../images/org_new_style/icons.png) no-repeat -100px -511px ;
ul.callbacks_tabs.callbacks1_tabs {position:absolute;bottom: 7.3%;z-index: 999;left: -92%; display: block;}
/** 开源 **/
.box2{ height:569px; padding:70px 0; width:100%; background:url(../images/org_new_style/bg.jpg) no-repeat; }
.row-box3{ width:380px;}
.row-box3{ width:370px;}
.row-title3{ width:290px; font-size:18px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; font-weight:bold; }
.box3{height:540px; width:100%; padding:70px 0; background:url(../images/org_new_style/bg2.jpg) no-repeat; }
.box-title-p3{font-size:14px; color:#999999;}
@ -167,7 +167,7 @@ a.pre-back{ background:#888;}
.footer-con ul{ display:block; width:430px; height:50px; margin:0 auto; }
.footer-con ul li a{font-size:18px; color:#fff; margin-right:35px; font-weight:bold;}
/** ziyuan **/
.row-ziyuan{ width:570px; border-bottom:1px solid #f0f0f0; padding:15px 0;}
.row-ziyuan{ width:570px; border-bottom:1px solid #f0f0f0; padding:15px 0; margin:0px 15px;}
.ziyuan-box{ width:420px; margin-right:20px;}
.ziyuan-box span{ margin-right:5px;}
.ziyuan-title{ display:block; width:420px; font-size:16px;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}