From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Sat, 6 Jan 2018 03:39:27 +0000 (+0000)
Subject: www/dbq/html/default.css
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=8294558ec64d2161d8be1b678b84282404646559;p=nb.git

www/dbq/html/default.css
---

diff --git a/lib/php/out.php b/lib/php/out.php
index dfbe493a..7d44d3e4 100644
--- a/lib/php/out.php
+++ b/lib/php/out.php
@@ -159,7 +159,13 @@ Class Out extends Nb {
 
     if ($o['row_count'] and isset($o['rec'])) echo $o['rec'];
     $o['row_count']++;
-    self::type_call('parse',$o,$row);
+# NB 06.01.18     self::type_call('parse',$o,$row);
+# NB 06.01.18 		$new = [];
+# NB 06.01.18 		foreach ($row as $k=>$v) {
+# NB 06.01.18 			$new[self::prettyText($k)] = $v;
+# NB 06.01.18 		}
+# NB 06.01.18 		$row = $new;
+# NB 06.01.18 		debug($row);
 
 		# Binary values
 		if (!isset($o['base64_encode_binary'])) $o['base64_encode_binary'] = true;
@@ -355,10 +361,10 @@ Class Out extends Nb {
       )) {
         $replace_flags = $replace_flags | ENT_XHTML;
 
-      } elseif ($type=='xml' or !empty(self::$types[$type]['is_xml'])) {
+      } elseif ($type=='xml' or self::is_html($type)) {
         $replace_flags = $replace_flags | ENT_XML1;
 
-      } elseif ($type=='html' or !empty(self::$types[$type]['is_html'])) {
+      } elseif (self::is_html($type)) {
         $replace_flags = $replace_flags | ENT_HTML5;
 
       } else { # txt
@@ -475,6 +481,10 @@ Class Out extends Nb {
     self::row_parse($row,$o);
     foreach ($row as $k => $v) {
 
+      if (isset($o['tag_val'])) {
+        $v = '<'.$o['tag_val'].'>'.$v.'</'.preg_replace('/ .*$/','',$o['tag_val']).'>';
+      }
+
       # Inside tag, ex: label
       if (isset($o['tag_key'])) {
         $v = '<'.$o['tag_key'].'>'.$k.'</'.preg_replace('/ .*$/','',$o['tag_key']).'>'.$v;
diff --git a/lib/php/out/div.php b/lib/php/out/div.php
index 963bd3b8..363d9467 100644
--- a/lib/php/out/div.php
+++ b/lib/php/out/div.php
@@ -5,14 +5,16 @@ return [
   'tag_enclose' => 'div class="row"',
   'tag' => 'div',
   'tag_key' => 'label',
+# NB 06.01.18   'tag_val' => 'span',
+# NB 06.01.18 div.row div span { text-align: right; }
   'row' => 'out_tag',
-# NB 05.01.18   'parse' => function(&$o,&$r) {
-# NB 05.01.18   	$n = [];
-# NB 05.01.18 		foreach ($r as $k=>$v) {
-# NB 05.01.18 			$k = self::prettyText($k);
-# NB 05.01.18 			$n[$k] = $v;
-# NB 05.01.18 		}
-# NB 05.01.18 		$r = $n;
-# NB 05.01.18   },
+# NB 06.01.18   'parse' => function(&$o,&$r) {
+# NB 06.01.18   	$n = [];
+# NB 06.01.18 		foreach ($r as $k=>$v) {
+# NB 06.01.18 			$k = self::prettyText($k);
+# NB 06.01.18 			$n[$k] = $v;
+# NB 06.01.18 		}
+# NB 06.01.18 		$r = $n;
+# NB 06.01.18   },
 ];
 ?>
diff --git a/www/dbq/html/default.css b/www/dbq/html/default.css
index f19de209..d27ac1b0 100644
--- a/www/dbq/html/default.css
+++ b/www/dbq/html/default.css
@@ -198,13 +198,23 @@ table.rows th { padding-top: 0; }
 table.rows tr:last-child td { padding-bottom: 0; }
 */
 
-div.row div { margin: 0; }
-div.row {
-	float: left;
-	padding: 0.5em;
-	margin-right: 0.5em;
+/*
+div.row { float: left; margin-right: 12px; min-width: 31%; }
+*/
+div.row { float: left; margin-right: 4px; min-width: 24%; }
+
+div.row div {
+	margin: 0;
+	padding: 0.1em 0.2em;
+	border-bottom: solid 1px #fff;
 }
 
+div.row div.view .button { margin-bottom: 5px; }
+div.row div.delete .button { margin-top: 5px; }
+div.row div:last-child { border-bottom: none; padding-bottom: 0; }
+div.row div.view label, div.row div.delete label { display: none; }
+div.row div.view, div.row div.delete { text-align: center; }
+
 ul.row li label, div.row div label {
 	padding: 0.1em 0.5em 0.1em 0;
 	min-width: 20%;