index

diff --git a/lib/css/db.css b/lib/css/db.css
index 6b8b90614cf424e40ce09c3b273e696f38f4acf8..aa7f80aec1596b80048acefc6d4ff371ca2b0508 100644 (file)
--- a/lib/css/db.css
+++ b/lib/css/db.css
@@ -51,17 +51,19 @@ form.db.edit .buttons input {
   float: none;
 }
 
-div.db.menu label {
+.db.menu {
+  float: left;
+  margin-right: 1em;
+}
+
+.db.menu label {
   margin-right: 0.1em;
 }
-div.db.menu label:after {
+
+.db.menu label:after {
   content: ": ";
 }
 
-.db.menu {
-  float: left;
-  margin-right: 1em;
-}
 ul.db.menu {
   /*
   margin: -4em 0.4em 0 -7em;

diff --git a/lib/php/db.php b/lib/php/db.php
index 1f3542301bd1ba7ef2c8a2e15229e3c570c7a4eb..03c3a9e069c17dbe4ca689f97db02a7643f76ea9 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -181,44 +181,45 @@ EOF;
 
   function html_menu() {
 
-    $r = '';
+    $r = '<form class="db menu center" method="get">'.PHP_EOL;
 
-    $r .= '<div class="db menu center">'.PHP_EOL;
+    /// Tables
     $r .= '<label>Tables</label>'
-      .'<select class="tables" onchange="if (this.value) location.href = \'?table=\'+this.value;">'
+      .'<select class="tables" name="table" onchange="this.parentElement.submit()">'
     ;
-
     foreach ($this->tables() as $table) {
       $r .= '<option value="'.$table.'"';
       $r .= $table == $this->p('table') ? ' selected="selected"' : '';
       $r .= '>'.prettyText($table).'</option>'.PHP_EOL;
     }
-
     $r .= '</select>'.PHP_EOL;
 
-    $r .= '</div>'.PHP_EOL;
-
-    return $r;
-
-    $r .= '<ul class="db menu">'.PHP_EOL;
-    $r .= '<li class="tables">Tables';
-    $r .= '<ul>'.PHP_EOL;
-
-    foreach ($this->tables() as $table) {
-      #$count = $table->rowCount();
-      $r .= '<li class="'.$table.'">';
-      #$pretty = prettyText($table);
-      $r .= $table == $this->p('table') ? "<span class=\"sel\">$table</span>" : '<a href="?table='.$table.'">'.$table."</a>";
-      $r .= '</li>'.PHP_EOL;
+    // Format
+    $r .= '<label>Format</label>'
+      .'<select class="format" name="format" onchange="this.parentElement.submit()">'
+    ;
+    foreach (array('table','div','csv','xml','json','yaml') as $format) {
+      $r .= '<option value="'.$format.'"';
+      $r .= $format == $this->p('format') ? ' selected="selected"' : '';
+      $r .= '>'.prettyText($format).'</option>'.PHP_EOL;
     }
+    $r .= '</select>'.PHP_EOL;
 
-    $r .= '</ul>'.PHP_EOL;
-    $r .= '</li>'.PHP_EOL;
-
-    $r .= '</ul>'.PHP_EOL;
+    // Limit
+    $r .= '<label>Format</label>'
+      .'<select class="limit" name="limit" onchange="this.parentElement.submit()">'
+    ;
+    foreach (array('10','20','50','100','500','1000') as $limit) {
+    // - NB 10.07.15
+      $r .= '<option value="'.$limit.'"';
+      $r .= $limit == $this->p('limit') ? ' selected="selected"' : '';
+      $r .= '>'.prettyText($limit).'</option>'.PHP_EOL;
+    }
+    $r .= '</select>'.PHP_EOL;
 
+    // Bye
+    $r .= '</form>'.PHP_EOL;
     return $r;
-
   }
 
   /*