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

Conflicts:
	app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
This commit is contained in:
huang 2016-04-29 17:14:12 +08:00
commit 14335d5da3
3 changed files with 148 additions and 154 deletions

View File

@ -37,13 +37,13 @@
<div class="sn-inner-pages">
<a href="javascript:void()" class="sn-inner-pages-big" >上一页</a>
<a href="javascript:void()" class="sn-pages-active " >1</a>
<a href="javascript:void()" >2</a>
<a href="javascript:void()" >3</a>
<a href="javascript:void()" >...</a>
<a href="javascript:void()" >31</a>
<a href="javascript:void()" class="sn-inner-pages-big" >下一页</a>
<a href="javascript:void(0);" class="sn-inner-pages-big" >上一页</a>
<a href="javascript:void(0);" class="sn-pages-active " >1</a>
<a href="javascript:void(0);" >2</a>
<a href="javascript:void(0);" >3</a>
<a href="javascript:void(0);" >...</a>
<a href="javascript:void(0);" >31</a>
<a href="javascript:void(0);" class="sn-inner-pages-big" >下一页</a>
<div class="cl"></div>
</div>
</div>

View File

@ -1,125 +1,125 @@
<div class="sn-inner-body">
<div class="sn-innner-content">
<div class="sn-row sn-bg-white">
<div class="sn-content-position">
您的位置:<%= link_to "首页" %> 数据资源 > 仿真数据
<div class="sn-content-position sn-hidden">
您的位置:<%= link_to "首页", organizations_path(@organization), :class => "sn-link-grey2" %> > 数据资源 > 仿真数据
</div>
</div>
<div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2">最新资讯</h2>
<ul>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观迎湖南省省直机关领导调研参观参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
<li>
<div class="sn-circle fl"></div><a href="javascript:void()" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</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>
<div class="sn-circle fl"></div><a href="javascript:void(0);" target="_blank" class="sn-newslist-titile fl">北斗(长沙)开放实验室迎湖南省省直机关领导调研参观</a>
<span class=" txt-grey fr">2016-04-08</span><a href="javascript:void(0);" 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>
</li>
</ul>
<div class="sn-inner-pages">
<a href="javascript:void()" class="sn-inner-pages-big" >上一页</a>
<a href="javascript:void()" class="sn-pages-active " >1</a>
<a href="javascript:void()" >2</a>
<a href="javascript:void()" >3</a>
<a href="javascript:void()" >...</a>
<a href="javascript:void()" >31</a>
<a href="javascript:void()" class="sn-inner-pages-big" >下一页</a>
</div>
<ul class="sn-inner-pages">
<li><a href="javascript:void(0);" class="sn-inner-pages-big" >上一页</a></li>
<li><a href="javascript:void(0);" class="sn-pages-active " >1</a></li>
<li><a href="javascript:void(0);" >2</a></li>
<li><a href="javascript:void(0);" >3</a></li>
<li><a href="javascript:void(0);" >...</a></li>
<li><a href="javascript:void(0);" >31</a></li>
<li><a href="javascript:void(0);" class="sn-inner-pages-big" >下一页</a></li>
<div class="cl"></div>
</div>
</div>
</ul>
</div>
<footer>
@ -127,13 +127,15 @@
<div class="sn-row sn-bg-grey2">
<div class="sn-footer">
<ul class="sn-footer-link">
<li class="sn-mr50"><a href="javascript:void()" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="javascript:void()" class="sn-link-white sn-f18">服务协议</a></li>
<li class="sn-mr50"><a href="javascript:void()" class="sn-link-white sn-f18">帮助中心</a></li>
<li><a href="javascript:void()" class="sn-link-white sn-f18">在线报名</a></li>
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">服务协议</a></li>
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">帮助中心</a></li>
<li><a href="javascript:void(0);" class="sn-link-white sn-f18">在线报名</a></li>
</ul>
<div class="sn-contact">联系人:魏小姐 | 电 话0731-84761282 | 传 真0731-84761268 | 邮 箱office@gnssopenlab.org</div>
<div class="sn-address">地 址湖南省长沙市开福区东风路89号观园大厦23层<br />
卫星导航仿真与测试开放实验室</div>
</div>
</div>
</footer>
</div>

View File

@ -214,11 +214,3 @@ a.sn-reply-username { color:#24366e; margin-right:15px; }
.org-popup-wrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
.org-popup-close {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:block; position: absolute; z-index: 1000; right:10px; top:5px;}
/*翻页*/
.sn-wrap {width:1200px; margin:0 auto; text-align:center;}
.sn-scroll {font-size:0;}
.sn-scroll li {display:inline-block; margin-right:10px; font-size:15px; color:#999;}
.sn-scroll-block {height:15px; line-height:15px; vertical-align:middle; border:1px solid #ccc; border-radius:2px;}
.sn-scroll-page {height:17px; line-height:17px; vertical-align:middle; background-color:#24366e; color:#fff !important; border-radius:2px;}
.sn-scroll-control {padding:8px 15px;}
.sn-scroll-num {padding:8px 10px;}