From 7b127ee489a134436ab457467c2da42e32aa652d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Feb 2014 07:57:59 +0000
Subject: Show tabs for existing custom field types only and adds a view for
 choosing the type when adding a new custom field.

git-svn-id: http://svn.redmine.org/redmine/trunk@12849 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_tabs.html.erb              |  2 --
 app/views/custom_fields/_index.html.erb      |  2 --
 app/views/custom_fields/index.html.erb       | 10 +++++++++-
 app/views/custom_fields/select_type.html.erb | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 app/views/custom_fields/select_type.html.erb

(limited to 'app/views')

diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index 8cbcda51a..34fd570ea 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -1,5 +1,3 @@
-<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
-
 <div class="tabs">
   <ul>
   <% tabs.each do |tab| -%>
diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb
index 4752c2519..0b578d6ee 100644
--- a/app/views/custom_fields/_index.html.erb
+++ b/app/views/custom_fields/_index.html.erb
@@ -28,5 +28,3 @@
   <% end; reset_cycle %>
   </tbody>
 </table>
-
-<p><%= link_to l(:label_custom_field_new), new_custom_field_path(:type => tab[:name]), :class => 'icon icon-add' %></p>
diff --git a/app/views/custom_fields/index.html.erb b/app/views/custom_fields/index.html.erb
index b4e87f066..e4464132f 100644
--- a/app/views/custom_fields/index.html.erb
+++ b/app/views/custom_fields/index.html.erb
@@ -1,3 +1,11 @@
+<div class="contextual">
+<%= link_to l(:label_custom_field_new), new_custom_field_path, :class => 'icon icon-add' %>
+</div>
+
 <%= title l(:label_custom_field_plural) %>
 
-<%= render_tabs custom_fields_tabs %>
+<% if @custom_fields_by_type.present? %>
+  <%= render_custom_fields_tabs(@custom_fields_by_type.keys) %>
+<% else %>
+  <p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff --git a/app/views/custom_fields/select_type.html.erb b/app/views/custom_fields/select_type.html.erb
new file mode 100644
index 000000000..fd9c5a210
--- /dev/null
+++ b/app/views/custom_fields/select_type.html.erb
@@ -0,0 +1,15 @@
+<%= title [l(:label_custom_field_plural), custom_fields_path],
+  l(:label_custom_field_new) %>
+
+<% selected = 0 %>
+<%= form_tag new_custom_field_path, :method => 'get' do %>
+  <div class="box">
+  <p><%= l(:label_custom_field_select_type) %>:</p>
+  <p>
+  <% custom_field_type_options.each do |name, type| %>
+    <label style="display:block;"><%= radio_button_tag 'type', type, 1==selected+=1 %> <%= name %></label>
+  <% end %>
+  </p>
+  </div>
+  <p><%= submit_tag l(:label_next).html_safe + " &#187;".html_safe, :name => nil %></p>
+<% end %>
-- 
cgit v1.2.3