From 8b9a2ff871b3e98b028f7279d40de9da4cf64e91 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Feb 2014 10:04:48 +0000
Subject: [PATCH] Merged r12897.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12898 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/custom_fields/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 0ef7843c6..0e1851d01 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -2,9 +2,9 @@
 
 <div class="splitcontentleft">
 <div class="box tabular">
+<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.text_area :description, :rows => 7 %></p>
-<p><%= f.select :field_format, custom_field_formats_for_select(@custom_field), {}, :disabled => !@custom_field.new_record? %></p>
 
 <% if @custom_field.format.multiple_supported %>
 <p>