1 files changed, 20 insertions, 27 deletions
diff --git a/rt/share/html/Admin/CustomFields/index.html b/rt/share/html/Admin/CustomFields/index.html
index e8687ed21..cd9884f15 100644
--- a/rt/share/html/Admin/CustomFields/index.html
+++ b/rt/share/html/Admin/CustomFields/index.html
@@ -49,24 +49,7 @@
 <& /Elements/Tabs &>
 
 % my $tmp = RT::CustomField->new( $session{'CurrentUser'} );
-% if ( $Type ) {
-<h2><% loc("Custom Fields for [_1]", $tmp->FriendlyLookupType( $Type )) %></h2>
-% }
-
-<& /Elements/CollectionList,
-    OrderBy       => 'LookupType|Name',
-    Order         => 'ASC|ASC',
-    Rows          => 50,
-    %ARGS,
-    Collection    => $CustomFields,
-    Format        => $Format,
-    DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
-    AllowSorting  => 1,
-    PassArguments => [
-        qw(Format Rows Page Order OrderBy),
-        qw(Type ShowDisabled)
-    ],
-&>
+<h1><% $Type ? loc("Custom Fields for [_1]", $Type) : loc('All Custom Fields') %></h1>
 
 <form action="<%RT->Config->Get('WebPath')%>/Admin/CustomFields/index.html" method="get">
 <&|/l&>Only show custom fields for:</&>
@@ -77,15 +60,30 @@
 % }
 </select>
 <br />
-<input type="checkbox" class="checkbox" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' |n%> />
-<&|/l&>Include disabled custom fields in listing.</&>
+<input type="checkbox" class="checkbox" id="ShowDisabled" name="ShowDisabled" value="1" <% $ShowDisabled && 'checked="checked"' |n %> />
+<label for="ShowDisabled"><&|/l&>Include disabled custom fields in listing.</&></label>
 <br />
 
 % $m->callback(CallbackName => 'BeforeSubmit');
 
-<input type="submit" value="<% loc('Go!') %>" />
+<div align="right"><input type="submit" value="<% loc('Go!') %>" /></div>
 </form>
 
+<& /Elements/CollectionList,
+    OrderBy       => 'LookupType|Name',
+    Order         => 'ASC|ASC',
+    Rows          => $Rows,
+    %ARGS,
+    Collection    => $CustomFields,
+    Format        => $Format,
+    DisplayFormat => ($Type? '' : '__FriendlyLookupType__,'). $Format,
+    AllowSorting  => 1,
+    PassArguments => [
+        qw(Format Rows Page Order OrderBy),
+        qw(Type ShowDisabled)
+    ],
+&>
+
 <%args>
 $Type => ''
 $ShowDisabled => 0
@@ -95,12 +93,6 @@ $Format => undef
 <%INIT>
 my $title = loc('Select a Custom Field');
 
-$Type ||= $ARGS{'type'} || '';
-if ( !$Type && $ARGS{'type'} ) {
-    $Type ||= $ARGS{'type'};
-    $RT::Logger->warning("'type' argument is deprecated use 'Type' instead");
-}
-
 my $CustomFields = RT::CustomFields->new($session{'CurrentUser'});
 $CustomFields->UnLimit;
 $CustomFields->FindAllRows if $ShowDisabled;
@@ -109,5 +101,6 @@ $CustomFields->LimitToLookupType( $Type ) if $Type;
 $m->callback(CallbackName => 'MassageCustomFields', CustomFields => $CustomFields);
 
 $Format ||= RT->Config->Get('AdminSearchResultFormat')->{'CustomFields'};
+my $Rows = RT->Config->Get('AdminSearchResultRows')->{'CustomFields'} || 50;
 
 </%INIT>