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-04-29 16:47:32 +08:00
parent 1f87d105d0 0bd34c2099
commit 0d3c79eb12
6 changed files with 189 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/sub_document_comments_controller.rb
View File

@ -53,6 +53,7 @@ class SubDocumentCommentsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'} format.html {render :layout => @organization.switch_type ? 'base_sub_domain' : 'base_org'}
end end
else else
render_403 render_403
end end
@ -185,6 +186,9 @@ class SubDocumentCommentsController < ApplicationController
@subdomain = SubDomain.find(params[:sub_domain_id]) @subdomain = SubDomain.find(params[:sub_domain_id])
@org_subfield = OrgSubfield.find(params[:org_subfield_id]) @org_subfield = OrgSubfield.find(params[:org_subfield_id])
@organization = @org_subfield.organization @organization = @org_subfield.organization
rescue ActiveRecord::RecordNotFound
# source_subdomain_subfield not found
render_404
end end
def find_subfield_content def find_subfield_content

176
app/views/layouts/base_sub_domain.html.erb
View File

@ -31,10 +31,10 @@
<script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图--> <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$(".nav-element, .sn-grey-opacity").mouseover(function(){ $(".nav-element, .sn-grey-opacity").mouseover(function(){
$(".sn-grey-opacity").show(); $(".sn-grey-opacity").show();
}); });
$(".nav-element, .sn-grey-opacity").mouseout(function(){ $(".nav-element, .sn-grey-opacity").mouseout(function(){
$(".sn-grey-opacity").hide(); $(".sn-grey-opacity").hide();
}); });
@ -67,98 +67,100 @@
</script> </script>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<!--内容开始--> <!--内容开始-->
<header> <div class="sn-inner-body">
<div class="sn-header"> <header>
<%= render :partial => 'organizations/org_logined_header' %> <div class="sn-header">
<div class="sn-row sn-bg-white"> <%= render :partial => 'organizations/org_logined_header' %>
<div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a> <div class="sn-row sn-bg-white">
<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" /> <div class="sn-logo"> <img src="/images/sn_logo.jpg" width="367" height="63" alt="logo" class="sn-mt13" /> <a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>
<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />
</div>
</div>
<!--导航-->
<div class="sn-row sn-bg-blue">
<ul class="sn-nav">
<% @subfield_content.each do |field| %>
<% if is_default_field?(field) %>
<% case field.name %>
<% when 'activity' %>
<li class="nav-element">
<%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
</li>
<% when 'course' %>
<li class="nav-element">
<a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
</li>
<% when 'project' %>
<li class="nav-element">
<a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
</li>
<% end %>
<% else %>
<% if field.field_type == "Post" && field.hide == 0 %>
<li class="nav-element">
<a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
</li>
<% elsif field.field_type == "Resource" && field.hide == 0 %>
<li class="nav-element">
<a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
</li>
<% end %>
<% end %>
<% end %>
<% if User.current.admin_of_org?(@organization) %>
<li class="nav-element">
<a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
</li>
<% end %>
</ul>
</div>
<!--二级目录-->
<div class="sn-row sn-p-absolute sn-grey-opacity" style="display:none; z-index:99;">
<ul class="sn-sub-nav">
<li><a href="javascript:void(0);" class="sn-link-grey">简介</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">仿真数据</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">实测数据</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">测试场景</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">数据定制</a></li>
</ul>
</div>
<div class="sn-row">
<div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" /></div>
</div> </div>
</div> </div>
<!--导航--> </header>
<div class="sn-row sn-bg-blue">
<ul class="sn-nav">
<% @subfield_content.each do |field| %>
<% if is_default_field?(field) %>
<% case field.name %>
<% when 'activity' %>
<li class="nav-element">
<%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
</li>
<% when 'course' %>
<li class="nav-element">
<a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
</li>
<% when 'project' %>
<li class="nav-element">
<a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
</li>
<% end %>
<% else %>
<% if field.field_type == "Post" && field.hide == 0 %>
<li class="nav-element">
<a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
</li>
<% elsif field.field_type == "Resource" && field.hide == 0 %>
<li class="nav-element">
<a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
</li>
<% end %>
<% end %>
<% end %>
<% if User.current.admin_of_org?(@organization) %>
<li class="nav-element">
<a href="<%= setting_organization_path(@organization) %>" class="sn-link-white">配置</a>
</li>
<% end %>
</ul>
</div>
<!--二级目录-->
<div class="sn-row sn-p-absolute sn-grey-opacity" style="display:none; z-index:99;">
<ul class="sn-sub-nav">
<li><a href="javascript:void(0);" class="sn-link-grey">简介</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">仿真数据</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">实测数据</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">测试场景</a></li>
<li class="sn-subnav-slice">|</li>
<li><a href="javascript:void(0);" class="sn-link-grey">数据定制</a></li>
</ul>
</div>
<div class="sn-row">
<div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" /></div>
</div>
</div>
</header>
<%# 更新访问数,刷新的时候更新访问次数 %> <%# 更新访问数,刷新的时候更新访问次数 %>
<% update_visiti_count @organization %> <% update_visiti_count @organization %>
<%# over %> <%# over %>
<!--内容开始--> <!--内容开始-->
<!--内容结束--> <!--内容结束-->
<%= render_flash_messages %> <%= render_flash_messages %>
<%= yield %> <%= yield %>
<%= call_hook :view_layouts_base_content %> <%= call_hook :view_layouts_base_content %>
<div style="clear:both;"></div> <div style="clear:both;"></div>
<footer> <footer>
<!--footer--> <!--footer-->
<div class="sn-row sn-bg-grey2"> <div class="sn-row sn-bg-grey2">
<div class="sn-footer"> <div class="sn-footer">
<ul class="sn-footer-link"> <ul class="sn-footer-link">
<li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li> <li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li> <li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
<li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li> <li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
<li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li> <li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
</ul> </ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div> <div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
<div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br /> <div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />
卫星导航仿真与测试开放实验室</div> 卫星导航仿真与测试开放实验室</div>
</div>
</div> </div>
</div> </footer>
</footer> </div>
<div id="ajax-indicator" style="display:none;"> <div id="ajax-indicator" style="display:none;">
<span><%= l(:label_loading) %></span> <span><%= l(:label_loading) %></span>

22
app/views/sub_document_comments/_show_newstyle.html.erb
View File

@ -1,25 +1,15 @@
<div class="sn-innner-content"> <div class="sn-innner-content">
<div class="sn-row sn-bg-white"> <div class="sn-row sn-bg-white">
<div class="sn-content-position"> 您的位置：首页 &gt;业界动态 </div> <div class="sn-content-position"> 您的位置：<%= link_to "首页", organization_path(@organization) %> &gt;
<%= @org_subfield.name %> &gt;
<%= link_to @subdomain.name, org_subfield_sub_domain_path(@subdomain) %> &gt;
<%= link_to @document.title, org_subfield_sub_domain_sub_document_comment_path(@document) %> </div>
</div> </div>
<div class="sn-inner-newslist"> <div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2">北斗（长沙）开放实验室迎湖南省省直机关领导调研参观</h2> <h2 class="sn-inner-newsh2"><%= @document.title %></h2>
<div class="sn-inner-newscon"> <div class="sn-inner-newscon">
<p class=" sn-inner-psmall">来源：卫星导航仿真与测试开放实验室 发布时间:：2016-04-08 浏览：200次</p> <p class=" sn-inner-psmall">来源：卫星导航仿真与测试开放实验室 发布时间:：2016-04-08 浏览：200次</p>
<p class=" sn-inner-pcon"> 2016年3月27日上午，湖南省经信委巡视员钟志慧，湖南省发改委副主任卓群、高技处处长何志明、就业处处长周建龙等领导代表在长沙中电软件园董事长何明、总经理夏利锋的陪同下来北 <p class=" sn-inner-pcon"><%= @document.content.html_safe %></p>
斗开放实验室长沙分实验室调研参观。北斗开放实验室办公室主任明德祥为参观的各位领导详细介绍了北斗开放实验室运行机制及各项共享资源。北斗开放实验室长沙分实验室是由导航仪器湖
南省工程研究中心、湖南矩阵电子科技有限公司及中国仪器仪表学会空间仪器分会共同建设。</p>
<img src="images/img-news-con.jpg" width="824" height="522" alt="" />
<p class=" sn-inner-imgp">北斗开放实验室办公室主任明德祥为湖南省发改委领导介绍</p>
<p class=" sn-inner-pcon">为进一步推动北斗资源共享、创新北斗人才培养，更好地服务湖南北斗产业应用发展、培育湖南省卫星导航产业创新体系，2016年，北斗开放实验室联合长沙中电软件园对长沙分实验室进行扩
建，扩建后的长沙分实验室立足长沙国家高新区，辐射整个中南地区，成为推动中南地区导航产业的发展的主力军。
今后，北斗开放实验室长沙分实验室将在政府的推动下，以北斗领域相关企事业单位创新需求为导向，以北斗开放实验室名誉主任孙家栋院士、北斗开放实验室专家委员会主任委员谭述森院士
以及北斗开放实验室专家库专家为核心，以长沙分实验室共建单位——导航仪器湖南省工程研究中心为依托，借助北斗开放实验室发起单位及各地分实验室资源，建设院士工作站，联合进行创
新研究，促进研究成果产业化。
为充分发挥长沙分实验室在释放资源和人才培养方面的作用，北斗开放实验室计划于4月下旬依托扩建后的长沙分实验室举办首届北斗精英实训；并将联合各地分实验室为首批微小课题申请者
定期提供专业系统的指导和培训，务实推动北斗开放实验室“LAB-ETS”人才联合培养。具体培训信息请实时关注北斗开放实验室微信号“GnssOpenLab”或官网www.gnssopenlab.org。</p>
</div> </div>
</div> </div>
<!--回复--> <!--回复-->

4
app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
View File

@ -8,8 +8,8 @@
<ul> <ul>
<% documents.each do |document| %> <% documents.each do |document| %>
<li> <li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl"><%= document.title %></a> <div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl"><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain) %></a>
<span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void()" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void()" target="_blank" class="sn-newslist-zan fr mr10">（100）</a> <span class=" txt-grey fr"><%= format_date(document.created_at) %>></span><a href="javascript:void()" target="_blank" class="sn-newslist-reply fr mr10">回复（100）</a><a href="javascript:void(0)" target="_blank" class="sn-newslist-zan fr mr10">（100）</a>
<div class="cl"></div> <div class="cl"></div>
</li> </li>
<% end %> <% end %>

2
app/views/sub_document_comments/show.html.erb
View File

@ -1,5 +1,5 @@
<% if @organization.show_mode %> <% if @organization.show_mode %>
<%= render :partial => 'sub_document_comments/_show_newstyle', :locals => {:document => @document} %> <%= render :partial => 'sub_document_comments/show_newstyle', :locals => {:document => @document} %>
<% else %> <% else %>
<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %> <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"create_kindeditor",'blog' %>
<script> <script>

4
app/views/sub_domains/show.html.erb
View File

@ -1,7 +1,9 @@
<div class="sn-inner-body"> <div class="sn-inner-body">
<div class="sn-innner-content"> <div class="sn-innner-content">
<div class="sn-row sn-bg-white"> <div class="sn-row sn-bg-white">
<div class="sn-content-position"> 您的位置：首页 > 数据资源 > 仿真数据 </div> <div class="sn-content-position">
您的位置：<%= link_to "首页" %> 数据资源 > 仿真数据
</div>
</div> </div>
<div class="sn-inner-newslist"> <div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2">最新资讯</h2> <h2 class="sn-inner-newsh2">最新资讯</h2>