Bed

diff --git a/lib/js/nb.js b/lib/js/nb.js
index a6ec6a793ff7a61cdb5cfe17487a964fa866ee69..e3e0c76321a3de712a90b72c05c9f43b1d64f575 100644 (file)
--- a/lib/js/nb.js
+++ b/lib/js/nb.js
@@ -278,6 +278,27 @@ function NB() {
 
   };
 
+       this.html_select = function(ar) {
+    console.log(json);
+    var select = $('<select>');
+    // JSON.parse(json)
+               $.each(ar, function(val, text) {
+      select.append(
+                               $('<option></option>').val(val).html(text)
+                       ); 
+               });
+    return select;
+       }
+
+       this.urlParam = function(name) {
+               var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href);
+               if (results==null) {
+                       return null;
+               } else {
+                       return results[1] || 0;
+               }
+       }
+
   this.data2html = function(data) {
 
     if (typeof(data) == 'string') {
@@ -323,6 +344,25 @@ function NB() {
     return items.join('');
   }
 
+       this.j2h = function(url) {
+    var tag = 'select';
+    var tags = {
+      'select' : 'option',
+      'ul'     : 'li',
+    }
+
+    $.getJSON(url, function(json){
+      var select = $('<'+tag+'>');
+      $('#nb-msg').append(select);
+      tag == 'select' && select.append($('<'+tags[tag]+'>').text("Select"));
+
+      $.each(json, function(i, obj){
+        select.append($('<'+tags[tag]+'>').text(obj.name).attr('value', obj.name));
+      });
+
+    });
+  }
+
   this.json2html = function(url) {
     $.getJSON(url,function(data) {
       if ($.isArray(data) && data.length == 1) data = data[0];

diff --git a/lib/php/benchmark.php b/lib/php/benchmark.php
index 4e4b526258ea8fc848f7e1ac6c10e0f4d29b7467..47b0202144ccdd85c4402da5113f9340917b99b6 100755 (executable)
--- a/lib/php/benchmark.php
+++ b/lib/php/benchmark.php
@@ -28,8 +28,13 @@ exit;
 #function _global() { if ($_GLOBAL['var'] === null) $var='zaza'; } nb::benchmark('_global');
 #function _empty() { empty($var); } nb::benchmark('_empty',5000000);
 #function _isset() { isset($var); } nb::benchmark('_isset',5000000);
-function _in_array() { in_array(5000,$GLOBALS['array']); } nb::benchmark('_in_array',1000);
-function _in_hash() { isset($GLOBALS['hash'][5000]); } nb::benchmark('_in_hash',1000);
+#function _in_array() { in_array(5000,$GLOBALS['array']); } nb::benchmark('_in_array',1000);
+#function _in_hash() { isset($GLOBALS['hash'][5000]); } nb::benchmark('_in_hash',1000);
+function _1() { date_default_timezone_set('Europe/London'); } nb::benchmark('_1');
+function _2() { error_reporting(E_ALL | E_STRICT | E_NOTICE); } nb::benchmark('_2');
+function _3() { ini_set('include_path','.'); } nb::benchmark('_3');
+function _4() { getenv('zaza'); } nb::benchmark('_4');
+function _5() { $v='Europe/London'; } nb::benchmark('_5');
 nb::benchmark(); exit;
 
 #function __f1(&$ar) { return; foreach ($ar as $v) { 1; } }

diff --git a/lib/php/config.php b/lib/php/config.php
index 798ac1d059f884600d5703a7e0038b6ed0416153..5782c8aeb671a851fad5c8eb1225f7e53fc2a0bd 100644 (file)
--- a/lib/php/config.php
+++ b/lib/php/config.php
@@ -6,6 +6,9 @@
 * lib/php/config.php
 */
 
+require(dirname(__FILE__).'/nb.php');
+
+if (empty($_SERVER['DEV'])) return;
 date_default_timezone_set('Europe/London');
 error_reporting(E_ALL | E_STRICT | E_NOTICE);
 
@@ -17,7 +20,6 @@ ini_set('include_path',''
 
 #define('NB_EOL','');
 #define('NB_PROD',true);
-include('nb.php');
 if (nb::php_cli()) argv2request();
 
 ini_set('display_errors', 'On');

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 9dae919c0a8f3cb63c3504b851c8bcf04a955e31..a954cae512d8f76411f70c022e54adf3812df237 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -586,7 +586,7 @@ Class Table extends nb {
       # Head
       #
       if ($count === 1) {
-        if ($opt['is_html']) echo $this->html_nav_top();
+        if ($opt['is_html']) echo $this->html_rows_top();
 
         if ($out_conf) {
           out::head($out_conf,$this->fields(),array($row));
@@ -1123,8 +1123,7 @@ Class Table extends nb {
     return false;
   }
 
-  public function html_nav_top() {
-    if ($this->p('header')==="0") return '';
+  public function html_rows_top() {
     $html = '';
 
     if (!empty($this->replace)) {
@@ -1179,25 +1178,6 @@ Class Table extends nb {
     }
     $r .= '<input type="hidden" name="download" value="0"/>'; // Embed for no html format
 
-    //
-    // Criterias
-    //
-    $r .= '<div class="criterias">';
-    foreach ( array_keys($this->fields()) as $k ) {
-
-      $v = $this->p($k);
-
-      $r .= ''
-        .'<span class="label '.$k.'">'
-        . '<label>'.prettyText($k)
-        .'</label>'
-        . '<input type="text" id="'.$k.'" name="'.$k.'" value="'.$v.'" />'
-        .'</span>'
-      ;
-
-    }
-    $r .= '</div>';
-
     //
     // Options
     //
@@ -1258,7 +1238,27 @@ Class Table extends nb {
     $r .= '</span>';
     */
 
-    $r .= '</div>'; # < options
+    $r .= '</div>'; # < Options
+
+    //
+    // Criterias
+    //
+    $r .= '<div class="criterias">';
+    foreach ( array_keys($this->fields()) as $k ) {
+
+      $v = $this->p($k);
+
+      $r .= ''
+        .'<span class="label '.$k.'">'
+        . '<label>'.prettyText($k)
+        .'</label>'
+        . '<input type="text" id="'.$k.'" name="'.$k.'" value="'.$v.'" />'
+        .'</span>'
+      ;
+
+    }
+
+    $r .= '</div>'; # < Criterias
 
     ///
     // Bye