修改开发组、朋友圈、研发组切换js

app/views/layouts/_base_development_group.html.erb

@@ -1,5 +1,4 @@
 <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-<div id="project_memu">
   <div class="subNav">
     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
     <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@@ -50,5 +49,4 @@
   <div class="subNav subNav_jiantou" onclick="expand_tools_expand();" id="expand_tools_expand"><%= l(:label_project_more) %></div>
   <ul class="navContent">
     <%= render 'projects/tools_expand' %>
-  </ul>
-</div>
+  </ul>

app/views/layouts/_base_friend_group.html.erb

@@ -1,5 +1,4 @@
 <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-<div id="project_memu">
   <div class="subNav">
     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
     <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@@ -27,5 +26,4 @@
             <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
         <% end %>
       </div>
-  <% end %>
-</div>
+  <% end %>

app/views/layouts/_base_research_team.html.erb

@@ -1,5 +1,4 @@
 <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>
-<div id="project_memu">
   <div class="subNav">
     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
     <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
@@ -38,5 +37,4 @@
             <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
         <% end %>
       </div>
-  <% end%>
-</div>
+  <% end%>

app/views/layouts/base_projects.html.erb

@@ -43,19 +43,19 @@
                           if(data == 1)
                           {
                               $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team)))%>");
-                              $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_development_group')) %>');
+                              $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_development_group')) %>');
                               $("#close_light").attr("onClick","close_window('development_group');");
                           }
                           else if(data == 2)
                           {
                               $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group)))%>");
-                              $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_research_team')) %>');
+                              $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_research_team')) %>');
                               $("#close_light").attr("onClick","close_window('research_group');");
                           }
                           else if(data == 3)
                           {
                               $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization)))%>");
-                              $("#project_memu").html('<%= escape_javascript(render(:partial => 'layouts/base_friend_group')) %>');
+                              $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'layouts/base_friend_group')) %>');
                               $("#close_light").attr("onClick","close_window('friend_organization');");
                           }
                           else
@@ -165,13 +165,15 @@
                     <% end %><!--end-->
                   <!--menu 左侧工具栏 -->
                   <!--project_new_type: 1为开发组；2为科研组；3为朋友圈子-->
-                  <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
+                  <div id="project_memu_list">
+                    <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
                         <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
                     <% elsif @project.project_new_type == 2 %>
                         <%= render :partial => 'layouts/base_research_team', :locals => {:project => @project}%>
-                     <% else %>
+                    <% else %>
                         <%= render :partial => 'layouts/base_friend_group', :locals => {:project => @project}%>
                     <% end %>
+                  </div>
                     <!-- end -->
                   </div><!--项目侧导航 end-->
                   <div class="cl"></div>