hushasha
/
trustieforge
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

Browse Source 
Conflicts:
	app/views/layouts/base_sub_domain.html.erb
beidou_tim
huang 9 years ago
parent 8a14ce004f cbec7cc8f8
commit 65a907bc99
4 changed files with 60 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
app/views/layouts/base_org2.html.erb
Unescape View File

@ -90,7 +90,7 @@
<img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
<% end %>
<% if User.current.admin_of_org?(@organization) %>
<a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
<a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
<% end %>
<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>

50
app/views/layouts/base_sub_domain.html.erb
Unescape View File

@ -32,11 +32,17 @@
<script>
$(document).ready(function(){
$(".nav-element, .sn-grey-opacity").mouseover(function(){
$(".sn-grey-opacity").show();
$(".nav-element").mouseover(function(){
$(this).next().show();
});
$(".nav-element, .sn-grey-opacity").mouseout(function(){
$(".sn-grey-opacity").hide();
$(".sn-grey-opacity").mouseover(function(){
$(this).show();
});
$(".nav-element").mouseout(function(){
$(this).next().hide();
});
$(".sn-grey-opacity").mouseout(function(){
$(this).hide();
});
});
</script>
@ -92,15 +98,15 @@
<% if is_default_field?(field) %>
<% case field.name %>
<% when 'activity' %>
<li class="nav-element">
<li class="nav-element-default">
<%= link_to "首页", organization_path(@organization), :class => "sn-link-white" %>
</li>
<% when 'course' %>
<li class="nav-element">
<li class="nav-element-default">
<a href="#course_<%= field.id %>" class="sn-link-white"> 课程动态</a>
</li>
<% when 'project' %>
<li class="nav-element">
<li class="nav-element-default">
<a href="#project_<%= field.id %>" class="sn-link-white">项目动态</a>
</li>
<% end %>
@ -109,8 +115,20 @@
<li class="nav-element">
<a href="#message_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
</li>
6666666666666
<!--二级目录-->
<div class="sn-row sn-subnav-position sn-grey-opacity" style="display:none;">
<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>
<% elsif field.field_type == "Resource" && field.hide == 0 %>
<li class="nav-element">
<a href="#resource_<%= field.id %>" class="sn-link-white"><%= field.name %></a>
@ -125,20 +143,6 @@
<% 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" />
<a href="#" class="sn-banner-add" title="点击替换图片" ></a>

50
app/views/sub_document_comments/_show_sub_document_newstyle.html.erb
Unescape View File

@ -1,26 +1,26 @@
<div class="sn-inner-body">
<div class="sn-innner-content">
<div class="sn-row sn-bg-white">
<div class="sn-content-position"> 您的位置：首页 > 数据资源 > 仿真数据 </div>
</div>
<div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2">最新资讯</h2>
<ul>
<% documents.each do |document| %>
<li>
<div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
<span class=" txt-grey fr"><%= format_date(document.created_at) %>></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>
<% end %>
</ul>
<div>
<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
<div class="cl"></div>
</ul>
</div>
</div>
</div>
<div class="sn-inner-body">
<div class="sn-innner-content">
<div class="sn-row sn-bg-white">
<div class="sn-content-position"> 您的位置：首页 > 数据资源 > 仿真数据 </div>
</div>
<div class="sn-inner-newslist">
<h2 class="sn-inner-newsh2">最新资讯</h2>
<ul>
<% documents.each do |document| %>
<li>
<div class="sn-circle fl"></div><%=link_to document.title, org_subfield_sub_domain_sub_document_comment_path(document, :org_subfield_id => @org_subfield, :sub_domain_id => @subdomain), :class => "sn-newslist-titile fl", :target => "_blank" %>
<span class=" txt-grey fr"><%= format_date(document.created_at) %>></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>
<% end %>
</ul>
<div>
<ul class="sn-inner-pages" id="pages" style="margin-top: 5px;">
<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => true, :remote => @is_remote, :flag => true %>
<div class="cl"></div>
</ul>
</div>
</div>
</div>
</div>

12
public/stylesheets/org2.css
Unescape View File

@ -61,13 +61,15 @@ a.sn-link-select {color:#809df9;}
.sn-bg-blue {background-color:#24366e;}
.sn-login {width:1200px; height:45px; line-height:45px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
.sn-login2 {width:1200px; height:54px; line-height:54px; margin:0 auto; font-size:14px; color:#24366e; vertical-align:middle; text-align:right;}
.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;}
.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
.sn-logo-add{ display:block; top:10px; left:0px; position:absolute; width:20px; height:20px;background:url(../images/default_blank/icons-add.png) -0px -3px no-repeat;}
.sn-search-input {width:328px; height:40px; font-size:16px; color:#ccc; padding-left:10px; border:1px solid #ccc; border-right:none; float:right; background-color:#fff; outline:none;}
a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:none; float:right; outline:none; background:url(../images/sn_search_icon.jpg) 0 3px no-repeat;}
.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; line-height:1;}
.sn-nav li {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
.sn-nav li a {display:inline-block; padding:8px 6px; border-radius:5px;}
.sn-nav li a:hover {background-color:#809df9;}
.nav-element-default, .nav-element {float:left; padding-top:11px; padding-bottom:12px; margin-right:50px;}
.nav-element-default a, .nav-element a {display:inline-block; padding:8px 6px; border-radius:5px;}
.nav-element-default a:hover, .nav-element a:hover {background-color:#809df9;}
.sn-subnav-position {position:fixed; left:0; top:199px; z-index:99;}
.sn-sub-nav {width:1200px; margin:0 auto; font-size:14px; position:relative; line-height:1;}
.sn-sub-nav li {color:#999; float:left;}
.sn-sub-nav li a {height:40px; line-height:40px; vertical-align:middle; margin:0 5px; padding:0 5px; display:inline-block;}
@ -171,7 +173,7 @@ a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
/* 内页新闻展示 */
.sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
.sn-inner-pcon{text-indent:2em;}
.sn-inner-pcon{text-indent:2em; overflow:hidden;}
.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;}
.sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
.sn-inner-imgp{ color:#000; text-align:center; margin-bottom:30px;}

Write Preview
Loading…
Cancel
Save