Hide one column, provide infos in details box

diff --git a/lib/mask.php b/lib/mask.php
index 4dafbcb..a6f80f6 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -81,6 +81,7 @@ function build_grid($name, $mask)
   $_SESSION['grid_' . $name] = sprintf("SELECT %s FROM %s",
                                       implode(',', $fields), $mask['table']);
   if (array_key_exists('join', $mask)) $_SESSION['grid_' . $name] .= ' JOIN ' . join(' JOIN ', $mask['join']);
   $_SESSION['grid_' . $name] = sprintf("SELECT %s FROM %s",
                                       implode(',', $fields), $mask['table']);
   if (array_key_exists('join', $mask)) $_SESSION['grid_' . $name] .= ' JOIN ' . join(' JOIN ', $mask['join']);

+  if (array_key_exists('where', $mask)) $_SESSION['grid_' . $name] .= ' WHERE ' . $mask['where'];

 
   $ret[] = '  </tr>';
   $ret[] = '</table>';
 
   $ret[] = '  </tr>';
   $ret[] = '</table>';


@@ -108,7 +109,7 @@ function build_details($name, $details)
 
 
   $ret[] = '<div class="box" id="details">';
 
 
   $ret[] = '<div class="box" id="details">';

-  $ret[] = sprintf('<h2>%s</h2>', $details['title']);
+  $ret[] = sprintf('<h3>%s</h3>', $details['title']);

   if (array_key_exists('subtitle', $details))
     $ret[] = sprintf('<p class="subtitle">%s</p>', $details['subtitle']);
   $ret[] = '<ul>';
   if (array_key_exists('subtitle', $details))
     $ret[] = sprintf('<p class="subtitle">%s</p>', $details['subtitle']);
   $ret[] = '<ul>';


@@ -130,8 +131,15 @@ function build_mask($name, $mask)
   else
     $details = array();
 
   else
     $details = array();
 

-  return array_merge(
-                    array('<div class="right">'),
+  $title = $mask['title'];
+  if (array_key_exists('subtitle', $mask))
+    $title .= ' &ndash; ' . $mask['subtitle'];
+
+  $head = array();
+  $head[] = sprintf('<h3>%s</h3>', $title);
+  $head[] = '<div class="right">';
+
+  return array_merge($head,

                     $grid,
                     array('</div>','<div class="left">'),
                     $details,
                     $grid,
                     array('</div>','<div class="left">'),
                     $details,