Reorganise page

Move status field below first grid
Remove left column if no edit or detail fields are available

diff --git a/lib/mask.php b/lib/mask.php
index b8486fa..665c835 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -191,7 +191,12 @@ function build_grid($name, $mask, $gridname = false)
 
   $ret[] = '  </tr>';
   $ret[] = '</table>';
-  $ret[] = sprintf('<div id="info_grid_%s">Datensatz 0</div>', $name);
+  $ret[] = '<div>';
+  $ret[] = sprintf('<div class="info" id="info_grid_%s">Datensatz 0</div>', $name);
+  if ($gridname == 'grid')
+    $ret[] = '<div class="status"><span id="status"></span></div>';
+  $ret[] = '</div>';
+  $ret[] = '<br style="clear:both;">';
 
   $opts[] = 'columnSpecs: [' . implode(', ', $specs) . ']';
 
@@ -278,8 +283,6 @@ function build_mask($name, $mask)
   } else
     $grid = array();
 
-  $status = array('<span id="status"></span><br>');
-
   if (array_key_exists('details', $mask))
     $details = build_details($name, $mask['details']);
   else
@@ -306,16 +309,23 @@ function build_mask($name, $mask)
       !array_key_exists('details', $mask) &&
       !array_key_exists('select', $mask) &&
       !array_key_exists('edit', $mask))
-    return array_merge($head, array($mask['html']),$status);
+    return array_merge($head,
+                      array($mask['html']),
+                      array('<span id="status"></span><br>'));
 
-  return array_merge($head,
-                    array('<div class="right">'),
+  if (empty($details) && empty($select) && empty($edit))
+    return array_merge($head,
+                    array('<div class="grid">'),
+                    $grid,
+                    array('</div>'));
+  else
+    return array_merge($head,
+                    array('<div class="right grid">'),
                     $grid,
                     array('</div>','<div class="left">'),
                     $details,
                     $select,
                     $edit,
-                    $status,
                     array('</div>'));
 }
 

diff --git a/stylesheet.css b/stylesheet.css
index 56f34f3..e0d9804 100644 (file)
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -131,3 +131,11 @@ div.alignrightpad {
     text-align: right;
     padding-right: 3px;
 }
+
+div.info {
+    float: left;
+}
+div.status {
+    float: right;
+    text-align: right;
+}