Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
huang 2015-04-14 11:48:15 +08:00
commit b3689377a3
2 changed files with 13 additions and 9 deletions

View File

@ -47,7 +47,7 @@
<% end %><!--meny end --> <% end %><!--meny end -->
<!-- more --> <!-- more -->
<div class="subNav subNav_jiantou"><%= l(:label_project_more) %></div> <div class="subNav subNav_jiantou" onclick="expand_tools_expand();" id="expand_tools_expand"><%= l(:label_project_more) %></div>
<ul class="navContent"> <ul class="navContent">
<%= render 'projects/tools_expand' %> <%= render 'projects/tools_expand' %>
</ul> </ul>

View File

@ -14,15 +14,19 @@ function regexName() {
} }
// 项目描述超过展开 // 项目描述超过展开
$(function(){ //$(function(){
$(".subNav").click(function(){ // $(".subNav").click(function(){
$(this).toggleClass("currentDd").siblings(".subNav").removeClass("currentDd") //
$(this).toggleClass("currentDt").siblings(".subNav").removeClass("currentDt") // })
//})
function expand_tools_expand()
{
$("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
$("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
// 修改数字控制速度, slideUp(500)控制卷起速度 // 修改数字控制速度, slideUp(500)控制卷起速度
$(this).next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500); $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
}) }
})
// 描述显示更多信息 // 描述显示更多信息
function show_more_msg() function show_more_msg()