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:
huang 2016-05-05 16:43:36 +08:00
parent 02d6186045 c8da24b6bc
commit 62da2928a8
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/views/organizations/_org_left_subfield_list.html.erb
View File

@ -43,6 +43,13 @@
$(this).prev().css("color","#808080");
$(this).css("z-index", "1");
})
//二级菜单滑动时箭头方向控制
$(".homepageLeftMenuMoreIcon").toggle(function(){
$(".homepageLeftMenuMoreIcon").css("background","url(/images/homepage_icon.png) 100px -624px no-repeat");
},function(){
$(".homepageLeftMenuMoreIcon").css("background","url(/images/homepage_icon.png) -74px -240px no-repeat");
});
})
</script>
@ -104,11 +111,19 @@
<%=link_to "", new_organization_org_document_comment_path(organization, :field_id => field.id), :method => "get", :class => "homepageMenuSetting fr", :title => "发布帖子" %>
<% end %>
</div>
<div class="homepageLeftMenuCourses" id="homepageLeftMenuPost" style="display:<%= field.sub_domains.count == 0?'none':'' %>">
<div class="<%= field.sub_domains.count == 0?'homepageLeftMenuCourses':'homepageLeftMenuCourses borderBottomNone' %>" id="homepageLeftMenuPost" style="display:none;">
<ul>
<%= render :partial => 'organizations/org_subdomain',:locals=>{:subdomains => field.sub_domains.reorder('created_at').uniq.limit(5), :org_subfield_id => field.id} %>
</ul>
</div>
<% unless field.sub_domains.count == 0 %>
<li class="homepageLeftMenuMore">
<a href="javascript:void(0);" class="homepageLeftMenuMoreIcon" onclick="$('#homepageLeftMenuPost').slideToggle();" style="border-bottom: 1px solid #ddd;"></a>
</li>
<% end %>
<% else %>
<% if !field.subfield_subdomain_dir.nil? %>
<% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>

BIN
public/images/homepage_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

2
public/stylesheets/org2.css
View File

@ -65,7 +65,7 @@ a.sn-link-select {color:#809df9;}
.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 {width:1200px; height:55px; margin:0 auto; font-size:16px; position:relative; 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;}