[geeklog-cvs] geeklog: Fixed layout of the Batch Admin screen

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/7c3f8a72d64a
changeset: 6864:7c3f8a72d64a
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Mar 28 19:59:33 2009 +0100
description:
Fixed layout of the Batch Admin screen

diffstat:

2 files changed, 21 insertions(+), 16 deletions(-)
public_html/admin/user.php |   36 ++++++++++++++++++++----------------
public_html/docs/history   |    1 +

diffs (86 lines):

diff -r 616c07cd2cf8 -r 7c3f8a72d64a public_html/admin/user.php
--- a/public_html/admin/user.php	Sat Mar 28 19:37:13 2009 +0100
+++ b/public_html/admin/user.php	Sat Mar 28 19:59:33 2009 +0100
@@ -649,9 +649,10 @@
 {
     global $_CONF, $_TABLES, $LANG_ADMIN, $LANG01, $LANG28, $_IMAGE_TYPE;
 
-    $display = '';
-    if (!$_CONF['lastlogin']) {
-        $retval = '<br' . XHTML . '>'. $_LANG28[55];
+    $retval = '';
+
+    if (! $_CONF['lastlogin']) {
+        $retval .= '<p>'. $_LANG28[55] . '</p>';
         return $retval;
     }
 
@@ -668,10 +669,11 @@
     if (isset($_REQUEST['usr_time'])) {
         $usr_time_arr = $_REQUEST['usr_time'];
     } else {
-        $usr_time_arr['phantom'] = 2;
-        $usr_time_arr['short'] = 6;
-        $usr_time_arr['old'] = 24;
-        $usr_time_arr['recent'] = 1;
+        // default values, in months
+        $usr_time_arr['phantom'] =  2;
+        $usr_time_arr['short']   =  6;
+        $usr_time_arr['old']     = 24;
+        $usr_time_arr['recent']  =  1;
     }
     $usr_time = $usr_time_arr[$usr_type];
 
@@ -771,8 +773,8 @@
 
     $text_arr = array('has_menu'     => true,
                       'has_extras'   => true,
-                      'title'        => $LANG28[54],
-                      'instructions' => "$desc",
+                      'title'        => '',
+                      'instructions' => $desc,
                       'icon'         => $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE,
                       'form_url'     => $_CONF['site_admin_url'] . "/user.php?mode=batchdelete&usr_type=$usr_type&usr_time=$usr_time",
                       'help_url'     => ''
@@ -804,7 +806,10 @@
               'text' => $LANG_ADMIN['admin_home'])
     );
 
-    $display .= ADMIN_createMenu(
+    $retval .= COM_startBlock($LANG28[54], '',
+                           COM_getBlockTemplate('_admin_block', 'header'));
+
+    $retval .= ADMIN_createMenu(
         $menu_arr,
         $desc,
         $_CONF['layout_url'] . '/images/icons/user.' . $_IMAGE_TYPE
@@ -818,13 +823,12 @@
     $token = SEC_createToken();
     $form_arr['bottom'] = "<input type=\"hidden\" name=\"" . CSRF_TOKEN
                         . "\" value=\"{$token}\"" . XHTML . ">";
-    $display .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
-                           $text_arr, $query_arr, $defsort_arr, '', '',
-                           $listoptions, $form_arr);
+    $retval .= ADMIN_list('user', 'ADMIN_getListField_users', $header_arr,
+                          $text_arr, $query_arr, $defsort_arr, '', '',
+                          $listoptions, $form_arr);
+    $retval .= COM_endBlock(COM_getBlockTemplate('_admin_block', 'footer'));
 
-    // $display .= "<input type=\"hidden\" name=\"mode\" value=\"batchdeleteexec\"" . XHTML . "></form>" . LB;
-
-    return $display;
+    return $retval;
 }
 
 /**
diff -r 616c07cd2cf8 -r 7c3f8a72d64a public_html/docs/history
--- a/public_html/docs/history	Sat Mar 28 19:37:13 2009 +0100
+++ b/public_html/docs/history	Sat Mar 28 19:59:33 2009 +0100
@@ -11,6 +11,7 @@
 + (TBD) Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Fixed layout of Batch Add and Batch Admin options of the User Manager [Dirk]
 - On a login failure, the user registration form showed up even when new user
   registration was disabled (bug #0000843)
 - The Wiki-style format broke national special characters, e.g. Japanese and