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

组织新版

This commit is contained in:
huang 2016-03-29 13:43:28 +08:00
parent b80bc98fcb
commit 2b9ddf3594
5 changed files with 244 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/organizations_controller.rb
View File

@ -81,7 +81,6 @@ class OrganizationsController < ApplicationController
@project_acts = get_project_activities_org @organization
@course_acts_homework = get_course_homework_activities_org @organization
@course_acts_message = get_course_message_activities_org @organization
else
if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
@organization = Organization.find(params[:id])

4
app/helpers/organizations_helper.rb
View File

@ -36,4 +36,8 @@ module OrganizationsHelper
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
end

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

@ -130,9 +130,9 @@
<a href="#" class="fl">项目动态</a>
<% end %>
<% else %>
<% if field.field_type == "Post" %>
<% if field.field_type == "Post" && field.hide == 0 %>
<%= link_to field.name, organization_path(@organization), :class => "fl" %>
<% elsif field.field_type == "Resource" %>
<% elsif field.field_type == "Resource" && field.hide == 0%>
<%= link_to field.name, organization_path(@organization), :class => "fl" %>
<% end %>
<% end %>
@ -188,7 +188,10 @@
<!--模块-->
<% @subfield_content.each do |field| %>
<div class="box1">
<% if is_default_field?(field) %>
<% case field.name %>
<% 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="row ">
@ -255,10 +258,9 @@
<div class="cl"></div>
</div>
</div><!--content end-->
</div><!--box1 end-->
<div class="box2">
</div><!--box1 end-->
<% 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>
<!--start-slider2-->
@ -318,86 +320,101 @@
<!--//end-slider2-->
</div><!--content end-->
</div><!--box2 end-->
<% if field.field_type == "Post" %>
<div class="box1">
</div><!--box2 end-->
<% end %>
<% else %>
<% if field.field_type == "Post" %>
<% 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">社区规则</h2><p class="box-title-p">open source</p></div>
<div class="box-top"><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">
<a href="#" target="_blank" class="row-img2"><img src="/images/org_new_style/pic1.jpg"></a>
<a href="#" target="_blank" class="row-con">
<h3 class="row-title3 fl">北斗第二次工作会议召开 </h3>
<span class="row-time fr">2015.10.15</span>
<h3 class="row-title3 fl"><%=link_to message.title %></h3>
<span class="row-time fr"><%= format_time(message.updated_at) %></span>
<div class="cl"></div>
<div class="row-txt">卫星导航仿真与测试开放实验室第二次工作会议暨分建实验室授牌仪式在北京举行，开放实验室各发起单位代表出席了会议，会议对开放实验室前期工作进行了深度总结，并对下阶段关于成员单位吸纳、专家库组建及分实验室运作等工作进行了详细部署...</div>
</a>
<a href="#" target="_blank" class="btn-more">More</a>
</div><!--row-box3 end-->
<div class="row-box3 mr30 fl">
<a href="#" target="_blank" class="row-img2"><img src="/images/org_new_style/pic2.jpg"></a>
<a href="#" target="_blank" class="row-con">
<h3 class="row-title3 fl">北斗西安专题研讨会</h3>
<span class="row-time fr">2015.10.15</span>
<div class="cl"></div>
<div class="row-txt">卫星导航仿真与测试开放实验室第二次工作会议暨分建实验室授牌仪式在北京举行，开放实验室各发起单位代表出席了会议，会议对开放实验室前期工作进行了深度总结，并对下阶段关于成员单位吸纳、专家库组建及分实验室运作等工作进行了详细部署...</div>
</a>
<a href="#" target="_blank" class="btn-more">More</a>
</div><!--row-box3 end-->
<div class="row-box3 fl">
<a href="#" target="_blank" class="row-img2"><img src="/images/org_new_style/pic3.jpg"></a>
<a href="#" target="_blank" class="row-con">
<h3 class="row-title3 fl">北斗专家进入校园 </h3>
<span class="row-time fr">2015.10.15</span>
<div class="cl"></div>
<div class="row-txt">卫星导航仿真与测试开放实验室第二次工作会议暨分建实验室授牌仪式在北京举行，开放实验室各发起单位代表出席了会议，会议对开放实验室前期工作进行了深度总结，并对下阶段关于成员单位吸纳、专家库组建及分实验室运作等工作进行了详细部署...</div>
<div class="row-txt"><%= message.content.html_safe %></div>
</a>
<a href="#" target="_blank" class="btn-more">More</a>
</div><!--row-box3 end-->
<% end %>
<div class="cl"></div>
</div>
</div><!--content end-->
</div> <!--box1 end-->
<% end %>
<div class="box1">
</div> <!--box1 end-->
<% elsif field.field_type == "Resource" %>
<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">activity zone</p></div>
<div class="box-top"><h2 class="box-title">北斗资源下载</h2><p class="box-title-p">resource dwonload</p></div>
<div class="row">
<div class="con-left fl">
<a href="#" target="_blank" class="con-left-box ">
<img src="/images/org_new_style/con-left1.jpg" class="fl con-left-img"/>
<p class="fl con-left-txt">卫星导航仿真与测试开放实验室第二次工作会议暨分建实验室授牌仪式在北京举行，开放实验室各发起单位代表出席了开放实验室各发起单位代表出席了</p>
</a>
<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>
<a href="#" target="_blank" class="con-left-box">
<img src="/images/org_new_style/con-left2.jpg" class="fl con-left-img"/>
<p class="fl con-left-txt">卫星导航仿真与测试开放实验室第二次工作会议暨分建实验室授牌仪式在北京举行，开放实验室各发起单位代表出席了开放实验室各发起单位代表出席了</p>
</a>
</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 class="con-left-pre fr">
<a href="#" class="con-arrow-btn fl"></a>
<a href="#" class="con-back-btn fl"></a>
</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-->
</div>
<div class="cl"></div>
</div><!--con-left end-->
<div class="con-right fr">
<a href="#" target="_blank">
<div class="con-r-img fl"><img src="/images/org_new_style/detailimg4.jpg" /><span class="con-name">尹刚</span></div>
<p class="fr">真的很高兴能加入卫星导航仿真测试实验室的社区，体验后感觉真的很棒，太开心了。真的很高兴能加入卫星导航仿真测试实验室的社区，体验后感觉真的很棒，太开心了。室的社区，体验后感觉真的很棒，太开心了。</p>
</a>
</div><!--row end-->
<div class="cl"></div>
<div class="con-r-pre fr">
<a href="#" class="pre-arrow fl"></a>
<a href="#" class="pre-back fl"></a>
</div><!--box1 end-->
</div>
<div class="cl"></div>
</div><!--con-right end-->
</div>
</div><!--content end-->
<div class="cl"></div>
</div><!--box1 end-->
<% end %>
<% end %>
<% end %>

4
app/views/organizations/_org_left_subfield_list.html.erb
View File

@ -84,8 +84,8 @@
<% end %>
<% else %>
<div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
<% if field.field_type == "Post" %>
<% if !field.subfield_subdomain_dir.nil? %>
<% if field.field_type == "Post" %> <!--讨论帖子-->
<% if !field.subfield_subdomain_dir.nil? %> <!--讨论帖子-->
<% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
<%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
<% else %>

12
public/stylesheets/org_new_style.css
View File

@ -85,7 +85,7 @@ a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -8
.row-title{ font-size:16px; font-weight:bold; line-height:1.9;display:block;white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.row-con { display:block; }
.row-con:hover{ color:#29156f; }
.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888;}
.row-txt{line-height:2.4; padding-bottom:10px; margin-bottom:10px; color:#888 !important; height: 68px; overflow: hidden;}
.row-txt:hover{color:#29156f;}
.row-txt-line{border-bottom:1px solid #cccccc; width:365px; height:56px; overflow:hidden;}
a.btn-more{ display:block; font-size:14px; width:110px; height:40px;-moz-border-radius: 3px; -webkit-border-radius: 3px; background:#ffbd18; color:#fff; text-align:center; line-height:3.0;}
@ -166,6 +166,16 @@ a.pre-back{ background:#888;}
.footer-con{ width:1200px; padding:65px 0 0 60px; margin:0 auto; text-align:center; font-size:14px; color:#fff;}
.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;}
.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;}
.ziyuan-box p{display:block; width:420px; color:#888; font-size:12px; line-height:2.5;}
a.download-btn{ display:block; border:1px solid #ccc; margin-top:10px; font-size:14px; width:70px; height:27px;-moz-border-radius: 3px; -webkit-border-radius: 3px; color:#888; text-align:center; line-height:1.9;}
a:hover.download-btn{ background:#29146f; color:#fff; border:none;}
.user-img img{ border:2px solid #e6473b; margin-right:10px; -moz-border-radius: 50px; -webkit-border-radius: 50px;border-radius: 50px; display:block; width:40px; height:40px;}
.ml60{ margin-left:60px;}