修改配置版本库页面

This commit is contained in:
huang 2015-04-13 18:27:05 +08:00
parent 39579331e7
commit 5d249823df
3 changed files with 120 additions and 25 deletions

View File

@ -1349,6 +1349,16 @@ module ApplicationHelper
link_to l(:button_delete), url, options
end
def delete_new_link(url, options={})
options = {
:method => :delete,
:data => {:confirm => l(:text_are_you_sure)},
:class => "c_purple"
}.merge(options)
link_to l(:button_delete), url, options
end
def preview_link(url, form, target='preview', options={})
content_tag 'a', l(:label_preview), {
:href => "#",

View File

@ -11,7 +11,7 @@
<li id="pro_st_tb_4" class="pro_st_normaltab" onclick="project_setting(4);">版本</li>
<li id="pro_st_tb_5" class="pro_st_normaltab" onclick="project_setting(5);">问题类别</li>
<li id="pro_st_tb_6" class="pro_st_normaltab" onclick="project_setting(6);">版本库</li>
<li id="pro_st_tb_7" class="pro_st_normaltab" onclick="project_setting(7);">活动(时间跟踪)</li>
<!--<li id="pro_st_tb_7" class="pro_st_normaltab" onclick="project_setting(7);">活动(时间跟踪)</li>-->
<li id="pro_st_tb_8" class="pro_st_normaltab" onclick="project_setting(8);">代码评审</li>
</ul>
@ -85,4 +85,4 @@
<!--</div>&lt;!&ndash;tbc_08 end&ndash;&gt;-->
</div><!--ctt end-->
</div><!--pro_setting end-->
</div><!--pro_setting end-->

View File

@ -1,29 +1,46 @@
<table class="pro_table">
<tbody>
<tr class="pro_table_tit">
<td class=" w150">标识</td>
<td class="w150"> 主版本库</td>
<td class="w150">管理系统 </td>
<td class="w150" >库路径 </td>
<% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
<% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
<% if @project.repositories.any? %>
<table class="pro_table">
<tbody>
<tr class="pro_table_tit">
<td class=" w150"><%= l(:field_identifier) %></td>
<td class="w150"> <%= l(:field_repository_is_default) %></td>
<td class="w150"><%= l(:label_scm) %> </td>
<td class="w150" ><%= l(:label_repository_path) %> </td>
<td class="w150"> </td>
<td class="w150"> </td>
</tr>
<% @project.repositories.sort.each do |repository| %>
<tr class="pro_table_on">
<td><a href="javascript:viod(0)" class="c_blue" >trustie2</a></td>
<td></td>
<td>Git</td>
<td ><a href="http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git" class="c_blue" >http://xianbo_trustie2</a></td>
<td><a href="javascript:viod(0)" class="c_blue" >用户列表</a></td>
<td></td>
</tr>
<tr >
<td><a href="javascript:viod(0)" class="c_blue" >micros</a></td>
<td></td>
<td>Git</td>
<td ><a href="http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git" class="c_blue" >http://xianbo_trustie2</a></td>
<td><a href="javascript:viod(0)" class="c_blue" >用户列表</a></td>
<td></td>
<td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
<%= link_to repository.identifier, {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %></a></td>
<td> <%= checked_image repository.is_default? %></td>
<td><%=h repository.scm_name %></td>
<%if repository.scm_name=="Git"%>
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" class="c_blue" title="http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
<%=h repository.url.slice(project_path_cut, repository.url.length) %>">http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
<%=h repository.url.slice(project_path_cut, repository.url.length) %></td><!--Modified by tanxianbo-->
<%else %>
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h repository.url %></td>
<% end %>
<td><a href="javascript:viod(0)" class="c_blue" >
<% if repository.scm_name=="Git"%>
<%if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to(l(:label_user_plural), committers_repository_path(repository),
:class => 'c_blue') %>
<% end %>
<% end %>
</a></td>
<td>
<% if repository.login.to_s==User.current.login.to_s %>
<%= delete_new_link repository_path(repository) %>
<% end %></td>
</tr>
<% end %>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>
<tr class="pro_table_on">
<td><a href="javascript:viod(0)" class="c_blue" >socialforge</a></td>
<td></td>
@ -36,7 +53,12 @@
</tbody>
</table>
<a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
<a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">新建版本库</a>
<a href="javascript:viod(0)" class="c_blue fl" onclick="pro_st_show_ku();">
<% course_tag = @project.project_type %>
<% if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'c_blue fl' %></p>
<% end %>
</a>
<div class="cl"></div>
<div id="pro_st_edit_ku" class="pro_st_edit_ku">
<ul>
@ -66,4 +88,67 @@
</ul>
<a href="javascript:viod(0)" class="blue_btn fl ml110">保存</a>
<a href="javascript:viod(0)" class="grey_btn fl ml10">取消</a>
</div><!--pro_st_edit_issues end-->
</div><!--pro_st_edit_issues end-->
<% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
<% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
<% if @project.repositories.any? %>
<table class="list" style="table-layout: fixed;">
<thead>
<tr>
<th style="width: 20%"><%= l(:field_identifier) %></th>
<th style="width: 10%"><%= l(:field_repository_is_default) %></th>
<th style="width: 15%"><%= l(:label_scm) %></th>
<th style="width: 20%"><%= l(:label_repository_path) %></th>
<th></th>
</tr>
</thead>
<tbody>
<% @project.repositories.sort.each do |repository| %>
<tr class="<%= cycle 'odd', 'even' %>">
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= repository.identifier %>">
<%= link_to repository.identifier,
{:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
</td>
<td align="center"><%= checked_image repository.is_default? %></td>
<td align="center"><%=h repository.scm_name %></td>
<%if repository.scm_name=="Git"%>
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %>">http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %></td><!--Modified by tanxianbo-->
<%else %>
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h repository.url %></td>
<% end %>
<td class="buttons" style="text-align:left">
<% if repository.scm_name=="Subversion"%>
<%if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to(l(:label_user_plural), committers_repository_path(repository),
:class => 'icon icon-user') %>
<%= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-edit') %>
<%= delete_link repository_path(repository) %>
<% end %>
<% elsif repository.scm_name=="Git"%>
<%if User.current.allowed_to?(:manage_repository, @project) %>
<!-- <%#= link_to(l(:button_edit), edit_repository_path(repository),
:class => 'icon icon-edit') %> -->
<%= link_to(l(:label_user_plural), committers_repository_path(repository),
:class => 'icon icon-user') %>
<% if repository.login.to_s==User.current.login.to_s %>
<%= delete_link repository_path(repository) %>
<% end %>
<% end %>
<% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
<% else %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% end %>
<% course_tag = @project.project_type %>
<% if User.current.allowed_to?(:manage_repository, @project) %>
<%= link_to l(:label_repository_new_repos), newrepo_project_repository_path(@project, :course => course_tag), :class => 'icon icon-add' %></p>
<% end %>