jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
huang 2016-10-27 11:17:15 +08:00
parent c4b32438ee 97f35d1cc9
commit 0272e95eb7
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/projects/settings/_new_repositories.html.erb
View File

@ -34,16 +34,16 @@
<table class="sy_new_table clear mb15" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th class="w150 hidden">版本库名</th>
<th class="w100 hidden">管理系统</th>
<th class="w536 hidden">库路径</th>
<th class="w130 pl10 pr10 hidden fl">版本库名</th>
<th class="w90 pr10 hidden fl">管理系统</th>
<th class="w536 hidden fl">库路径</th>
</tr>
</thead>
<tbody>
<tr>
<th class="w150 hidden"><%= @gitlab_repository.identifier %></th>
<th class="w100 hidden">Git</th>
<th class="w536 hidden db"><%=h @repos_url %></th>
<th class="w130 pl10 pr10 hidden fl"><%= @gitlab_repository.identifier %></th>
<th class="w90 pr10 hidden fl">Git</th>
<th class="w536 hidden fl"><%=h @repos_url %></th>
</tr>
</tbody>
</table>

22
app/views/projects/settings/_new_versions.html.erb
View File

@ -11,23 +11,23 @@
<table class="sy_new_table clear mb15" cellpadding="0" cellspacing="0">
<thead>
<tr>
<th>名称</th>
<th>结束日期</th>
<th>描述</th>
<th>状态</th>
<th >操作</th>
<th class="fl" style="width:156px;">名称</th>
<th class="w80 fl">结束日期</th>
<th class="w350 fl">描述</th>
<th class="w50 fl">状态</th>
<th class="w150 fl">操作</th>
</tr>
</thead>
<tbody>
<% @project.shared_versions.each do |version| %>
<tr>
<th>
<a><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
<th class="fl hidden" style="width:156px;">
<%= link_to version.name, project_versions_path(version), :class => "c_blue02" %>
</th>
<th><%= format_date(version.effective_date) %></th>
<th><%=h version.description %></th>
<th><%= l("version_status_#{version.status}") %></th>
<th>
<th class="fl w80"><%= format_date(version.effective_date) %></th>
<th class="fl w350 hidden"><%=h version.description %></th>
<th class="fl w50"><%= l("version_status_#{version.status}") %></th>
<th class="fl w150">
<% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
<%= link_to l(:button_edit), edit_version_path(version, :is_setting => true), :class => 'sy_btn_blue mr5', :remote => true %>
<%= delete_link_version version_path(version, :is_setting => true), :class=>"sy_btn_grey mr5", :remote => true %>

3
public/stylesheets/css/common.css
View File

@ -253,7 +253,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.w305{ width:305px;}
.w350 {width:350px;}
.w362 {width:362px;}
.h400{height: 400px !important;}
.h400{height:400px !important;}
.w430{ width:430px;}
.W440{ width:440px;}
.w450 {width:450px;}
@ -271,7 +271,6 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.w607 {width:607px;}
.w664{ width:664px;}
.w683{ width:683px;}
.w350{ width:350px;}
.w610{ width:610px;}
.w600{ width:600px !important;}
.w603{ width:603px !important;}