[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-738-g6a4c663

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  6a4c663e497263fc267bd88c7a5758f0869754ca (commit)
      from  e697eba8494d5b1877cc5c0b719903360ea3f812 (commit)

Summary of changes:
 share/html/Admin/Users/index.html |   53 ++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 27 deletions(-)

- Log -----------------------------------------------------------------
commit 6a4c663e497263fc267bd88c7a5758f0869754ca
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Sep 10 17:24:38 2010 -0400

    Move the user search widget above the user list
    
    This is more useful than making you scroll all the way down.  It could
    do with a little more styling.

diff --git a/share/html/Admin/Users/index.html b/share/html/Admin/Users/index.html
index 8d6daba..f2500fe 100755
--- a/share/html/Admin/Users/index.html
+++ b/share/html/Admin/Users/index.html
@@ -49,34 +49,8 @@
 <& /Admin/Elements/UserTabs, current_tab => 'Admin/Users/', 
     current_subtab => 'Admin/Users/',
     Title => loc('Select a user') &>
-
+    
 <h1><% $caption %></h1>
-<p><&|/l&>Select a user</&>:</p>
-% unless ( $users->Count ) {
-<em><&|/l&>No users matching search criteria found.</&></em>
-% } else {
-
-<& /Elements/CollectionList,
-    OrderBy => 'Name',
-    Order => 'ASC',
-    Rows  => 100,
-    %ARGS,
-    Format => $Format,
-    Collection => $users,
-    AllowSorting => 1,
-    PassArguments => [qw(Format Rows Page Order OrderBy UserString UserOp UserField IdLike EmailLike FindDisabledUsers)],
-&>
-
-% my $ids = join ',', map $_->id, @{ $users->ItemsArrayRef };
-% if ( $ids ) {
-<div align="right"><em>
-(<a href="<%RT->Config->Get('WebPath')%>/Download/Tabular/User/<% $ids %>/Users.tsv">
-<&|/l&>Download as a tab-delimited file</&>
-</a>)</em></div>
-% }
-
-<br /><br />
-% }
 
 <form method="post" action="<% RT->Config->Get('WebPath') %>/Admin/Users/index.html">
 % foreach my $field( qw(Format Rows Page Order OrderBy) ) {
@@ -109,6 +83,31 @@
 <div align="right"><input type="submit" class="button" value="<&|/l&>Go!</&>" /></div> 
 </form>
 
+% unless ( $users->Count ) {
+<em><&|/l&>No users matching search criteria found.</&></em>
+% } else {
+<p><&|/l&>Select a user</&>:</p>
+
+<& /Elements/CollectionList,
+    OrderBy => 'Name',
+    Order => 'ASC',
+    Rows  => 100,
+    %ARGS,
+    Format => $Format,
+    Collection => $users,
+    AllowSorting => 1,
+    PassArguments => [qw(Format Rows Page Order OrderBy UserString UserOp UserField IdLike EmailLike FindDisabledUsers)],
+&>
+
+% my $ids = join ',', map $_->id, @{ $users->ItemsArrayRef };
+% if ( $ids ) {
+<div align="right"><em>
+(<a href="<%RT->Config->Get('WebPath')%>/Download/Tabular/User/<% $ids %>/Users.tsv">
+<&|/l&>Download as a tab-delimited file</&>
+</a>)</em></div>
+% }
+% }
+
 <%INIT>
 my $caption;
 my $users = RT::Users->new( $session{'CurrentUser'} );

-----------------------------------------------------------------------