From 135617f2bfece563822bb09b3ffea8bac5ee71c0 Mon Sep 17 00:00:00 2001 From: Mischa The Evil Date: Sun, 1 Jan 2017 13:46:31 +0100 Subject: [PATCH 1/3] Move 'New ...' links to above item tables in project settings. --- app/views/projects/settings/_boards.html.erb | 8 ++++---- app/views/projects/settings/_issue_categories.html.erb | 4 ++-- app/views/projects/settings/_repositories.html.erb | 8 ++++---- app/views/projects/settings/_versions.html.erb | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git app/views/projects/settings/_boards.html.erb app/views/projects/settings/_boards.html.erb index 16506c8..99479e5 100644 --- app/views/projects/settings/_boards.html.erb +++ app/views/projects/settings/_boards.html.erb @@ -1,3 +1,7 @@ +<% if User.current.allowed_to?(:manage_boards, @project) %> +

<%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %>

+<% end %> + <% if @project.boards.any? %>
@@ -27,7 +31,3 @@ <% else %>

<%= l(:label_no_data) %>

<% end %> - -<% if User.current.allowed_to?(:manage_boards, @project) %> -

<%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %>

-<% end %> diff --git app/views/projects/settings/_issue_categories.html.erb app/views/projects/settings/_issue_categories.html.erb index 8a04f25..d1e219e 100644 --- app/views/projects/settings/_issue_categories.html.erb +++ app/views/projects/settings/_issue_categories.html.erb @@ -1,3 +1,5 @@ +

<%= link_to l(:label_issue_category_new), new_project_issue_category_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_categories, @project) %>

+ <% if @project.issue_categories.any? %> @@ -25,5 +27,3 @@ <% else %>

<%= l(:label_no_data) %>

<% end %> - -

<%= link_to l(:label_issue_category_new), new_project_issue_category_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_categories, @project) %>

diff --git app/views/projects/settings/_repositories.html.erb app/views/projects/settings/_repositories.html.erb index e60164c..61a1bb2 100644 --- app/views/projects/settings/_repositories.html.erb +++ app/views/projects/settings/_repositories.html.erb @@ -1,3 +1,7 @@ +<% if User.current.allowed_to?(:manage_repository, @project) %> +

<%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %>

+<% end %> + <% if @project.repositories.any? %>
@@ -35,7 +39,3 @@ <% else %>

<%= l(:label_no_data) %>

<% end %> - -<% if User.current.allowed_to?(:manage_repository, @project) %> -

<%= link_to l(:label_repository_new), new_project_repository_path(@project), :class => 'icon icon-add' %>

-<% end %> diff --git app/views/projects/settings/_versions.html.erb app/views/projects/settings/_versions.html.erb index 8173433..420b64e 100644 --- app/views/projects/settings/_versions.html.erb +++ app/views/projects/settings/_versions.html.erb @@ -1,3 +1,5 @@ +

<%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>

+ <%= form_tag(settings_project_path(@project, :tab => 'versions'), :method => :get) do %>
<%= l(:label_filter_plural) %> @@ -48,5 +50,3 @@ <%= link_to l(:label_close_versions), close_completed_project_versions_path(@project), :method => :put %> <% end %> - -

<%= link_to l(:label_version_new), new_project_version_path(@project, :back_url => ''), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>

-- 2.7.4.windows.1