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
hjq_mail
huang 9 years ago
parent 6474444cc7 2461a5c918
commit 2fb6852086
23 changed files with 5433 additions and 5399 deletions
Show Stats Download Patch File Download Diff File

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

@ -77,7 +77,7 @@
</div>
</div>
<!--导航-->
<div class="sn-row sn-bg-blue">
<div class="sn-row sn-bg-blue sn-p-relative">
<ul class="sn-nav">
<% @subfield_content.each do |field| %>
<% if is_default_field?(field) %>
@ -105,6 +105,7 @@
<ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
<% field.sub_domains.each do |subdomain| %>
<li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => field.id), :class => "sn-link-grey" %></li>
<li class="sn-subnav-slice">|</li>
<% end %>
</ul>
</div>
@ -190,16 +191,19 @@
</body>
<script>
$(".nav-element").mouseover(function(){
$(this).next(".sn-grey-opacity").show();
$(this).next(".sn-grey-opacity").show(0);
});
$(".sn-grey-opacity").mouseover(function(){
$(this).show();
$(this).show(0);
});
$(".nav-element").mouseout(function(){
$(this).next(".sn-grey-opacity").hide();
$(this).next(".sn-grey-opacity").delay(150).hide(0);
});
$(".sn-grey-opacity").mouseout(function(){
$(this).hide();
$(this).delay(150).hide(0);
});
$(".sn-sub-nav").each(function(){
$(this).children(".sn-subnav-slice:last").hide();
});
</script>

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

@ -33,16 +33,19 @@
<script>
$(document).ready(function(){
$(".nav-element").mouseover(function(){
$(this).next(".sn-grey-opacity").show();
$(this).next(".sn-grey-opacity").show(0);
});
$(".sn-grey-opacity").mouseover(function(){
$(this).show();
$(this).show(0);
});
$(".nav-element").mouseout(function(){
$(this).next(".sn-grey-opacity").hide();
$(this).next(".sn-grey-opacity").delay(150).hide(0);
});
$(".sn-grey-opacity").mouseout(function(){
$(this).hide();
$(this).delay(150).hide(0);
});
$(".sn-sub-nav").each(function(){
$(this).children(".sn-subnav-slice:last").hide();
});
});
</script>
@ -91,7 +94,7 @@
</div>
</div>
<!--导航-->
<div class="sn-row sn-bg-blue">
<div class="sn-row sn-bg-blue sn-p-relative">
<ul class="sn-nav">
<% @subfield_content.each do |field| %>
<% if is_default_field?(field) %>
@ -119,6 +122,7 @@
<ul class="sn-sub-nav" style="display:<%= if_hidden_subdomain( field) ? 'block':'none' %>;">
<% field.sub_domains.each do |subdomain| %>
<li><%=link_to subdomain.name, org_subfield_sub_domain_sub_document_comments_path(subdomain, :org_subfield_id => @org_subfield.id), :class => "sn-link-grey" %></li>
<li class="sn-subnav-slice">|</li>
<% end %>
</ul>
</div>

29
db/schema.rb
Unescape View File

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20160504060751) do
ActiveRecord::Schema.define(:version => 20160506104128) do
create_table "activities", :force => true do |t|
t.integer "act_id", :null => false
@ -485,7 +485,7 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
t.integer "viewed"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "content"
t.text "content"
t.integer "status"
t.integer "apply_user_id"
t.integer "apply_result"
@ -1779,6 +1779,31 @@ ActiveRecord::Schema.define(:version => 20160504060751) do
add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
create_table "sub_document_comments", :force => true do |t|
t.text "content"
t.text "title"
t.integer "sub_domain_id"
t.integer "creator_id"
t.integer "parent_id"
t.integer "reply_id"
t.integer "locked"
t.integer "sticky"
t.integer "org_subfield_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "sub_domains", :force => true do |t|
t.integer "org_subfield_id"
t.integer "priority", :default => 0
t.string "name"
t.string "field_type"
t.integer "hide", :default => 0
t.integer "status", :default => 0
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "subfield_subdomain_dirs", :force => true do |t|
t.integer "org_subfield_id"
t.string "name"

7
public/stylesheets/org2.css
Unescape View File

@ -14,6 +14,7 @@ a:hover,a:active{color:#24366e;}
.sn-cl {clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
.sn-container {width:100%; background-color:#fff;}
.sn-p-absolute {position:absolute;}
.sn-p-relative {position:relative;}
.sn-grey-opacity {background:rgba(230, 230, 230, 0.9)!important; filter:Alpha(opacity=90); background:#e6e6e6;}
.sn-border {border-top:1px solid #dfdfdf; border-bottom:1px solid #dfdfdf;}
/* 公共 */
@ -32,7 +33,7 @@ a:hover,a:active{color:#24366e;}
.sn-font-grey3 {color:#999;}
a.sn-link-blue {color:#24366e;}
a.sn-link-white {color:#fff;}
a.sn-link-grey {color:#999;}
a.sn-link-grey {color:#666;}
a.sn-link-grey:hover {color:#24366e;}
a.sn-link-grey2 {color:#888;}
a.sn-link-select {color:#809df9;}
@ -65,11 +66,11 @@ a.sn-link-select {color:#809df9;}
.sn-logo {width:1200px; height:90px; line-height:90px; margin:0 auto; vertical-align:middle;position:relative;}
.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; overflow:hidden;}
.sn-nav {width:1200px; height:55px; margin:0 auto; font-size:16px; line-height:1; overflow:hidden;}
.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:203px; z-index:99;}
.sn-subnav-position {position:absolute; left:0; top:55px; 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;}

Write Preview
Loading…
Cancel
Save