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

app/views/layouts/base_projects.html.erb

@@ -157,7 +157,7 @@
                   <!--邀请加入-->
                   <div class="subNavBox">
                     <% if User.current.member_of?(@project) %>
-                        <div class="subNav currentDd currentDt subNav_jiantou"><%= l(:label_invite)%></div>
+                        <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" onclick="expand_tools_expand('invit');"><%= l(:label_invite)%></div>
                         <ul class="navContent " style="display:block">
                           <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
                           <li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>

public/javascripts/project.js

@@ -25,13 +25,21 @@ function submitSerch(content)
 //
 //    })
 //})
-function expand_tools_expand()
+function expand_tools_expand(content)
 {
-    $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
-    $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+    if (content=="invit"){
+        $("#expand_tools_expand_invit").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+        $("#expand_tools_expand_invit").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+        $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+    }
+    else
+    {
+        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+    }
 
     // 修改数字控制速度， slideUp(500)控制卷起速度
-    $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
 }
 
 // 描述显示更多信息

public/stylesheets/project.css

@@ -494,3 +494,6 @@ p.percent {
 
 /*导出*/
 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
+p.other-formats { text-align: right; font-size:0.9em; color: #666; }
+.other-formats span + span:before { content: "| "; }
+