hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

组织首页

Browse Source
dev_wuhao
huang 10 years ago
parent b8463fcca5
commit b80bc98fcb
11 changed files with 184 additions and 149 deletions
Show Stats Download Patch File Download Diff File

27
app/controllers/organizations_controller.rb
Unescape View File

@ -75,7 +75,14 @@ class OrganizationsController < ApplicationController
end end
def show def show
@subfield_content = @organization.org_subfields.order("priority") if @organization.show_mode == 1 # 组织新类型 show_mode：判断标准 1为新类型，0为旧
if @organization.show_mode == 1
@subfield_content = @organization.org_subfields.order("priority")
@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) if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
@organization = Organization.find(params[:id]) @organization = Organization.find(params[:id])
# 统计访问量 # 统计访问量
@ -122,6 +129,24 @@ class OrganizationsController < ApplicationController
end end
end end
end
def get_project_activities_org org
project_ids = org.projects.map{|project| project.id}.join(",")
project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{project_ids}) and container_type = 'project' order by updated_at desc limit 3;")
end
def get_course_homework_activities_org org
course_ids = org.courses.map{|course| course.id}.join(",")
#project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' order by updated_at desc limit 5;")
project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'HomeworkCommon' order by updated_at desc limit 4;")
end
def get_course_message_activities_org org
course_ids = org.courses.map{|course| course.id}.join(",")
project_acts = OrgActivity.find_by_sql("SELECT * FROM org_activities where container_id in (#{course_ids}) and container_type = 'course' and org_act_type = 'Message' order by updated_at desc limit 4;")
end
def update def update
@organization = Organization.find(params[:id]) @organization = Organization.find(params[:id])
@organization.name = params[:organization][:name] @organization.name = params[:organization][:name]

162
app/views/layouts/base_org_newstyle.html.erb
Unescape View File

@ -110,7 +110,7 @@
<div class="container"> <div class="container">
<div class="header"> <div class="header">
<div class="header-con"> <div class="header-con">
<a href="index.html" class="fl"><img src="/images/org_new_style/logo.jpg" alt=""/></a> <a href="index.html" class="fl"><%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %><img src="/images/org_new_style/logo.jpg" alt=""/></a>
<a href="register.html" class="register fr"></a> <a href="register.html" class="register fr"></a>
<a href="login.html" class="login fr"></a> <a href="login.html" class="login fr"></a>
</div> </div>
@ -132,7 +132,7 @@
<% else %> <% else %>
<% if field.field_type == "Post" %> <% if field.field_type == "Post" %>
<%= link_to field.name, organization_path(@organization), :class => "fl" %> <%= link_to field.name, organization_path(@organization), :class => "fl" %>
<% else %> <% elsif field.field_type == "Resource" %>
<%= link_to field.name, organization_path(@organization), :class => "fl" %> <%= link_to field.name, organization_path(@organization), :class => "fl" %>
<% end %> <% end %>
<% end %> <% end %>
@ -153,7 +153,7 @@
<div class="slider-sections sandbox"> <div class="slider-sections sandbox">
<section class="first"> <section class="first">
<div class="text"> <div class="text">
<h2>课程动态<br />GNSS</h2> <h2><%= @organization.name %><br /></h2>
<p class="copy">course activities</p> <p class="copy">course activities</p>
<p class="button"> <p class="button">
<a class="dimmed" href="#"> More</a> <a class="dimmed" href="#"> More</a>
@ -162,7 +162,7 @@
</section> </section>
<section> <section>
<div class="text"> <div class="text">
<h2>中国北斗开源社区<br />GNSS</h2> <h2><%= @organization.name %></h2>
<p class="copy">open laboratory of simulation and testing</p> <p class="copy">open laboratory of simulation and testing</p>
<p class="button"> <p class="button">
<a class="dimmed" href="#">More</a> <a class="dimmed" href="#">More</a>
@ -172,7 +172,7 @@
<section> <section>
<div class="text"> <div class="text">
<h2>中国北斗开源社区<br />GNSS</h2> <h2><%= @organization.name %></h2>
<p class="copy">open laboratory of simulation and testing</p> <p class="copy">open laboratory of simulation and testing</p>
<p class="button"> <p class="button">
<a class="dimmed" href="#"> More</a> <a class="dimmed" href="#"> More</a>
@ -186,36 +186,50 @@
</div><!--header-content end--> </div><!--header-content end-->
<div class="cl"></div> <div class="cl"></div>
<!--模块-->
<% @subfield_content.each do |field| %>
<div class="box1"> <div class="box1">
<div class="content"> <div class="content">
<div class="box-top"><h2 class="box-title">课程动态</h2><p class="box-title-p">open laboratory</p></div> <div class="box-top"><h2 class="box-title">课程动态</h2><p class="box-title-p">course activities</p></div>
<div class="row "> <div class="row ">
<div class="row-box1 mr40 fl"> <div class="row-box1 mr40 fl">
<a href="#" target="_blank" class="row-img"><img src="/images/org_new_style/img1.jpg"></a> <a href="#" target="_blank" class="row-img"><img src="/images/org_new_style/img1.jpg"></a>
<a href="#" target="_blank" class="row-con"> <% @course_acts_homework.each do |act| %>
<span class="row-time">2016-03-22</span> <% if act.container_type == 'Course' %>
<h3 class="row-title ">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3> <% case act.org_act_type.to_s %>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div> <% when 'HomeworkCommon' %>
</a> <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
<a href="#" target="_blank" class="row-con"> <% when 'News' %>
<span class="row-time">2016-03-22</span> <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
<h3 class="row-title">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3> <% when 'Message'%>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div> <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
</a> <% when 'Poll' %>
<%= render :partial => 'org_new_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
<% when 'Course'%>
<%= render :partial => 'org_new_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
<% end %>
<% end %>
<% end %>
<a href="#" target="_blank" class="btn-more">More</a> <a href="#" target="_blank" class="btn-more">More</a>
</div><!--row-box1 end--> </div><!--row-box1 end-->
<div class="row-box1 mr40 fl"> <div class="row-box1 mr40 fl">
<a href="#" target="_blank" class="row-img"><img src="/images/org_new_style/img2.jpg"></a> <a href="#" target="_blank" class="row-img"><img src="/images/org_new_style/img2.jpg"></a>
<a href="#" target="_blank" class="row-con"> <% @course_acts_message.each do |act| %>
<span class="row-time">2016-03-22</span> <% if act.container_type == 'Course' %>
<h3 class="row-title">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3> <% case act.org_act_type.to_s %>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div> <% when 'HomeworkCommon' %>
</a> <%= render :partial => 'org_new_course_homework', :locals => {:activity => HomeworkCommon.find(act.org_act_id),:user_activity_id =>act.id,:course_activity => 0} %>
<a href="#" target="_blank" class="row-con"> <% when 'News' %>
<span class="row-time">2016-03-22</span> <%= render :partial => 'org_new_course_news', :locals => {:activity => News.find(act.org_act_id),:user_activity_id =>act.id} %>
<h3 class="row-title">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3> <% when 'Message'%>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div> <%= render :partial => 'org_new_course_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id} %>
</a> <% when 'Poll' %>
<%= render :partial => 'org_new_course_poll', :locals => {:activity => Poll.find(act.org_act_id), :user_activity_id => act.id} %>
<% when 'Course'%>
<%= render :partial => 'org_new_course_create', :locals => {:activity => Course.find(act.org_act_id), :user_activity_id => act.id} %>
<% end %>
<% end %>
<% end %>
<a href="#" target="_blank" class="btn-more">More</a> <a href="#" target="_blank" class="btn-more">More</a>
</div><!--row-box1 end--> </div><!--row-box1 end-->
<div class="row-box2 fl "> <div class="row-box2 fl ">
@ -252,9 +266,18 @@
<div class="container"> <div class="container">
<div class="row "> <div class="row ">
<div class=" slider2-left fl" > <div class=" slider2-left fl" >
<h3><span>2016.01.30环球网</span>卫星导航仿真与测试开放实验室落户泉州</h3> <% @project_acts.each do |act| %>
<p>卫星导航仿真与测试开放实验室是国内首个GNSS仿真与测试开放共享平台，北斗泉州实验室由国防科技大学泉州工业技术研究中心、福建省福信富通网络科技股份有限公司与开放实验室合作共建，计划于2016年3月建成并投用，将承建国内首个北斗海上数据应用中心，利用开放实验室优势资源承担相关专业人才培训，联合所属区域高校和企业开展船载导航终端北斗导航定位数据的采集、分析和应用，服务于全国北斗终端测试检定和相关应用研究。 <% if act.container_type == 'Project' %>
据介绍，实验室建成后，将为泉州以及周边县（市、区）的北斗产业应用发展提供相应支撑，并依托泉州的地理和政策优势，推动北斗向海上丝绸之路经济带沿线国家的推广应用。</p> <% case act.org_act_type.to_s %>
<% 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)} %>
<% when 'ProjectCreateInfo'%>
<%= render :partial => 'organizations/org_new_project_create', :locals => {:activity => act} %>
<% end %>
<% end %>
<% end %>
</div> </div>
<div class=" slider2-right fl " > <div class=" slider2-right fl " >
<div class="slider2"> <div class="slider2">
@ -297,7 +320,7 @@
</div><!--content end--> </div><!--content end-->
</div><!--box2 end--> </div><!--box2 end-->
<% if field.field_type == "Post" %>
<div class="box1"> <div class="box1">
<div class="content"> <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">社区规则</h2><p class="box-title-p">open source</p></div>
@ -336,82 +359,7 @@
</div> </div>
</div><!--content end--> </div><!--content end-->
</div> <!--box1 end--> </div> <!--box1 end-->
<% end %>
<div class="box3">
<div class="content">
<div class="box-top">
<h2 class="box-title">北斗社区规则</h2><p class="box-title-p mb70">community rules</p>
<p class="box-title-p3">欢迎大家加入北斗社区，卫星导航仿真与测试开放实验室是国内首个GNSS仿真与测试开放共享平台</p>
</div>
<div class="indexmaindiv" id="indexmaindiv">
<div class="indexmaindiv1 clearfix" >
<div class="stylesgoleft" id="goleft"></div>
<div class="maindiv1 " id="maindiv1">
<ul id="count1">
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg1.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg2.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg3.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg4.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg1.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg2.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg3.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
<li>
<a href="#" class="playerdetail">
<div class="detailimg"><img src="/images/org_new_style/detailimg4.jpg" /></div>
<div class="teanames">Mark</div>
<div class="teadetail">学生</div>
</a>
</li>
</ul>
</div>
<div class="stylesgoright" id="goright"></div>
</div>
</div><!---indexmaindiv-->
</div><!--content end-->
</div> <!--box3 end-->
<div class="box1"> <div class="box1">
<div class="content"> <div class="content">
@ -450,6 +398,8 @@
</div><!--content end--> </div><!--content end-->
<div class="cl"></div> <div class="cl"></div>
</div><!--box1 end--> </div><!--box1 end-->
<% end %>
<div class="footer"> <div class="footer">
<div class="footer-con"> <div class="footer-con">

5
app/views/organizations/_org_new_course_create.html.erb
Unescape View File

@ -0,0 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time(activity.updated_at) %></span>
<h3 class="row-title "><%= activity.title %></h3>
<div class="row-txt row-txt-line"><%= activity.description %></div>
</a>

5
app/views/organizations/_org_new_course_homework.html.erb
Unescape View File

@ -0,0 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<h3 class="row-title "><%= activity.name %></h3>
<div class="row-txt row-txt-line"><%= activity.description.html_safe %></div>
</a>

18
app/views/organizations/_org_new_course_message.html.erb
Unescape View File

@ -0,0 +1,18 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_on %></span>
<h3 class="row-title ">
<% if activity.parent_id.nil? %> <!--+"(帖子标题)"-->
<%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :class=> "postGrey" %>
<% else %>
<%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :class=> "postGrey" %>
<% end %>
</h3>
<div class="row-txt row-txt-line">
<% if activity.parent_id.nil? %>
<% content = activity.content %>
<% else %>
<% content = activity.parent.content %>
<% end %>
<%= content.to_s.html_safe %>
</div>
</a>

5
app/views/organizations/_org_new_course_news.html.erb
Unescape View File

@ -0,0 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<h3 class="row-title ">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div>
</a>

5
app/views/organizations/_org_new_course_poll.html.erb
Unescape View File

@ -0,0 +1,5 @@
<a href="#" target="_blank" class="row-con">
<span class="row-time"><%= format_time activity.updated_at %></span>
<h3 class="row-title ">首届卫星导航仿真与测试专题研讨会在...首届卫星导航仿真与测试专题研讨会在...</h3>
<div class="row-txt row-txt-line">10月15日，由卫星导航仿真与测试开放实验室联盟主办的首次专题研讨会在西安国家民用航天产业基地隆重召开...</div>
</a>

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

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

4
app/views/organizations/_org_new_project_issues.html.erb
Unescape View File

@ -0,0 +1,4 @@
<h3><span><%= format_time(activity.updated_on) %>项目社区</span>
<%= link_to activity.subject.to_s, issue_url_in_org(activity.id) %>
</h3>
<p><%= activity.description.html_safe %></p>

15
app/views/organizations/_org_new_project_message.html.erb
Unescape View File

@ -0,0 +1,15 @@
<h3><span><%= format_time(activity.updated_on) %>项目社区</span>
<% if activity.parent_id.nil? %>
<%= link_to activity.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id) %>
<% else %>
<%= link_to activity.parent.subject.to_s.html_safe, board_message_url_in_org(activity.board.id,activity.id) %>
<% end %>
</h3>
<p>
<% if activity.parent_id.nil? %>
<% content = activity.content%>
<% else %>
<% content = activity.parent.content%>
<% end %>
<%= content.to_s.html_safe %>
</p>

2
public/stylesheets/org_new_style.css
Unescape View File

@ -87,7 +87,7 @@ a:hover.search-icon{ background:url(../images/org_new_style/icons.png) -387px -8
.row-con:hover{ color:#29156f; } .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;}
.row-txt:hover{color:#29156f;} .row-txt:hover{color:#29156f;}
.row-txt-line{border-bottom:1px solid #cccccc; width:365px;} .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;} 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;}
a:hover.btn-more{ background:#29156f;} a:hover.btn-more{ background:#29156f;}
.row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;} .row-box2{ width:388px; border:1px solid #ccc; border-bottom:none;}

Write Preview
Loading…
Cancel
Save