Fixed bug #8497 User Admin > Compare User Settings Inconsistencies (Thanks to Michiel...
authorBenni Mack <benni.mack@typo3.org>
Fri, 27 Jun 2008 09:36:30 +0000 (09:36 +0000)
committerBenni Mack <benni.mack@typo3.org>
Fri, 27 Jun 2008 09:36:30 +0000 (09:36 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@3843 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/beuser/mod/index.php
typo3/sysext/t3skin/stylesheets/stylesheet_post.css

index 8f560ae..5630e65 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-27  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #8497 User Admin > Compare User Settings Inconsistencies (Thanks to Michiel Roos and Francois Suter)
+
 2008-06-26  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #8660: htmlArea RTE configuration option formatblock.restrictToItems does not work
index 891f7e1..c1d881a 100755 (executable)
@@ -1229,10 +1229,6 @@ class SC_mod_tools_be_user_index {
                        $buttons['shortcut'] = $this->doc->makeShortcutIcon('be_user_uid,compareFlags','function', $this->MCONF['name']);
                }
 
-                       // Save
-               if($this->MOD_SETTINGS['function'] == 'compare' && !t3lib_div::_GP('be_user_uid')) {
-                       $buttons['save'] = '<input type="image" class="c-inputButton" name="ads"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/savedok.gif','').' title="Update" value="Update" />';
-               }
                return $buttons;
        }
 
@@ -1315,11 +1311,26 @@ class SC_mod_tools_be_user_index {
                        $outTable.= '<br /><table border="0" cellpadding="2" cellspacing="1">'.implode('',$lines).'</table>';
                        $content.= $this->doc->section('User info',$outTable,0,1);
                } else {
-                       $menu=array();
+                       $menu = array(0 => array());
+                       $rowCounter = 0;
+                       $columnCounter = 0;
+                       $itemsPerColumn = ceil(count($options) / 3);
                        foreach ($options as $kk => $vv) {
-                               $menu[]='<input type="checkbox" value="1" name="compareFlags['.$kk.']" id="checkCompare_'.$kk.'"'.($compareFlags[$kk]?' checked="checked"':'').'> <label for="checkCompare_'.$kk.'">'.htmlspecialchars($vv).'</label>';
+                               if ($rowCounter == $itemsPerColumn)     {
+                                       $rowCounter = 0;
+                                       $columnCounter++;
+                                       $menu[$columnCounter] = array();
+                               }
+                               $rowCounter++;
+                               $menu[$columnCounter][]='<input type="checkbox" value="1" name="compareFlags['.$kk.']" id="checkCompare_'.$kk.'"'.($compareFlags[$kk]?' checked="checked"':'').'> <label for="checkCompare_'.$kk.'">'.htmlspecialchars($vv).'</label>';
+                       }
+                       $outCode = '<p>Group by:</p>';
+                       $outCode .= '<table border="0" cellpadding="3" cellspacing="1" class="compare-checklist valign-top"><tr>';
+                       foreach ($menu as $column)      {
+                               $outCode .= '<td>' . implode('<br />', $column) . '</td>';
                        }
-                       $outCode = 'Group by:<br />'.implode('<br />',$menu);
+                       $outCode .= '</tr></table>';
+                       $outCode.='<br /><input type="submit" name="ads" value="Update">';
                        $content = $this->doc->section('Group and Compare Users',$outCode,0,1);
 
 
@@ -1612,4 +1623,4 @@ $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 
-?>
\ No newline at end of file
+?>
index 43b182e..9f32b7a 100644 (file)
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
+/* General style */
+
+th,
+td {
+       vertical-align: top;
+}
 
 /* Links in general */
 a {
@@ -133,7 +139,3 @@ h4 {
 }
 
 /* END PAGE HEADERS: */
-
-
-
-