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

app/views/layouts/_base_development_group.html.erb

@@ -39,13 +39,21 @@
       </div>
   <% end %>
   <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
-  <% unless @project.hidden_repo || @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+  <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %>
+    <% if @project.hidden_repo || !@project.is_public? %>
+        <% if User.current.member_of?(@project) %>
             <div class="subNav">
                 <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
                 <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
             </div>
-  <% end %><!--meny end -->
-
+        <% end %>
+    <% else %>
+         <div class="subNav">
+            <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+            <a  class="subnav_num">(<%= @project.repositories.count %>)</a>
+         </div>
+    <% end %>
+  <% end %>
   <!-- more -->
   <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
   <ul class="navContent" id="navContent">

app/views/projects/settings/_new_repositories.html.erb

@@ -75,7 +75,7 @@
     <% unless judge_main_repository(@project) %>
         <li>
             <label class="label02"><%=l(:field_repository_is_default)%>：</label>
-            <%= f.check_box :is_default, :label => "" %></p>
+            <%= f.check_box :is_default, :label => "", :no_label => true %></p>
         </li>
     <% end %>
     <li >