From: Nicolas Boisselier Date: Wed, 12 Sep 2018 00:40:51 +0000 (+0100) Subject: lib/css/db.css X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=5db68bb7c241d8da37ddd7b946d1b04a1df7bc97;p=nb.git lib/css/db.css --- diff --git a/lib/css/db.css b/lib/css/db.css index 3d933732..a7f8f05a 100644 --- a/lib/css/db.css +++ b/lib/css/db.css @@ -18,7 +18,7 @@ List Div */ -.db div.rows .row { +.db div.db-rows .db-row { text-align: left; vertical-align: top; /* @@ -28,11 +28,11 @@ margin-bottom: 0.5em; padding: 0.2em; } -.Zdb div.rows .row li { +.Zdb div.db-rows .db-row li { } @media screen and (min-width: 400px) { - .db div.rows .row { + .db div.db-rows .db-row { width: 24%; display: inline-block; overflow: auto; @@ -44,28 +44,28 @@ text-align: center; } -table.rows th .name { padding: 0 0.2em; } -#table.rows th.key .name:before { content: "["; } -table.rows th.key .name:after { content: "!"; } +table.db-rows th .name { padding: 0 0.2em; } +#table.db-rows th.key .name:before { content: "["; } +table.db-rows th.key .name:after { content: "!"; } -table.rows tr { vertical-align: top; } +table.db-rows tr { vertical-align: top; } -.db div.rows .row *:not([class~=buttons]):hover { +.db div.db-rows .db-row *:not([class~=buttons]):hover { opacity: 0.7; } -.db div.rows .row .buttons { +.db div.db-rows .db-row .buttons { padding-bottom: 0.5em; } -.db div.rows .row label { +.db div.db-rows .db-row label { width: 25%; display: inline-block; margin: 0 0.5em 0.1em 0; vertical-align: top; } -.db div.rows label { +.db div.db-rows label { width: 70%; display: inline-block; white-space: normal; diff --git a/lib/js/nb.js b/lib/js/nb.js index 3c7588f6..b88307bf 100644 --- a/lib/js/nb.js +++ b/lib/js/nb.js @@ -190,7 +190,6 @@ function NB(args) { if (this.tagName=='TABLE') that.table2div(this); }); - //that.table2div('table.rows'); return true; } else { diff --git a/lib/php/db/table.php b/lib/php/db/table.php index 50d793fe..cc620d16 100644 --- a/lib/php/db/table.php +++ b/lib/php/db/table.php @@ -1611,7 +1611,7 @@ Class Table extends nb { $html = ''; - $html .= ''.NB_EOL; + $html .= '
'.NB_EOL; if ($this->show_header) { $html .= ''.NB_EOL; @@ -1635,7 +1635,7 @@ Class Table extends nb { $buttons = $this->html_row_buttons($row); - $html = ''.NB_EOL; + $html = ''.NB_EOL; if ($this->buttons() and !empty($buttons[0])) $html .= ''.NB_EOL; @@ -1661,14 +1661,14 @@ Class Table extends nb { Html Div -----------------------------------------------------------------*/ private function rows_begin_div() { - return '
'.NB_EOL; + return '
'.NB_EOL; } private function rows_rec_div(&$row) { $html = ''; - $html .= '
    '.NB_EOL; + $html .= '
      '.NB_EOL; if ($this->buttons()) { $html .= '
    • '.NB_EOL; diff --git a/lib/php/nb.php b/lib/php/nb.php index d625c603..312cd505 100644 --- a/lib/php/nb.php +++ b/lib/php/nb.php @@ -171,7 +171,7 @@ class NB { #self::msg( !self::php_cli() self::msg( self::client_header('Accept','ml') ? ''.$msg.''.NB_EOL : $msg ).NB_EOL; @@ -191,7 +191,7 @@ class NB { $msg = is_scalar($msg) ? $msg : print_r($msg,true); if (self::client_header('Accept','ml')) { - $msg = '
      '
      +			$msg = '
      '
       				.(isset($_SERVER['HTTP_HOST']) ? htmlentities($msg) : $msg)
       	# NB 16.12.15       .(isset($_SERVER['HTTP_HOST']) ? htmlspecialchars($msg) : $msg)
       			.'
      '.NB_EOL; diff --git a/lib/php/out/center.php b/lib/php/out/center.php deleted file mode 100644 index 96da517d..00000000 --- a/lib/php/out/center.php +++ /dev/null @@ -1,10 +0,0 @@ - true, - 'enclose' => ["
      ".NB_EOL,"
      ".NB_EOL], - 'tag_enclose' => 'div class="row"', - 'tag' => 'div', - 'row' => 'out_tag', -# NB 25.12.16 'head' => 'out_tag_head', -]; -?> diff --git a/lib/php/out/div.php b/lib/php/out/div.php index 781f63c0..fa63a600 100644 --- a/lib/php/out/div.php +++ b/lib/php/out/div.php @@ -1,21 +1,11 @@ true, - 'enclose' => ["
      ".NB_EOL,"
      ".NB_EOL], - 'tag_enclose' => 'div class="row"', + 'enclose' => ["
      ".NB_EOL,"
      ".NB_EOL], + 'tag_enclose' => 'div class="db-row row"', 'tag' => 'div', 'row' => 'out_tag', 'tag_key' => 'label', 'tag_val' => 'span', -# NB 31.01.18 'tag_val' => 'p', -# NB 06.01.18 div.row div span { text-align: right; } -# 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/lib/php/out/table.php b/lib/php/out/table.php index 87fc90aa..698db888 100644 --- a/lib/php/out/table.php +++ b/lib/php/out/table.php @@ -1,8 +1,8 @@ true, - 'enclose' => array("
'.$buttons[0].'
".NB_EOL,"
".NB_EOL), - 'tag_enclose' => 'tr class="row"', + 'enclose' => array("".NB_EOL,"
".NB_EOL), + 'tag_enclose' => 'tr class="db-row row"', 'tag_head' => 'th', 'tag' => 'td', 'row' => 'out_tag', diff --git a/www/dbq/html/default.css b/www/dbq/html/default.css index bc6e4bef..a5e65b15 100644 --- a/www/dbq/html/default.css +++ b/www/dbq/html/default.css @@ -106,7 +106,7 @@ input[size] { max-width: 70%; } -div.row div label:after, +div.db-row div label:after, form label:after { content: ':'; } @@ -117,12 +117,12 @@ form select { margin: 0.2em 0.4em 0.2em 0; } -.rows { padding: 0; } -.rows form { display: inline-block; } +.db-rows { padding: 0; } +.db-rows form { display: inline-block; } -table.rows, -div.row, -ul.row, +table.db-rows, +div.db-row, +ul.db-row, form.edit, .menu, .block, @@ -139,53 +139,53 @@ pre } -table.rows { +table.db-rows { border-style: hidden; border-collapse: collapse; box-shadow: 0 0 0 1px #DDDDDD; table-layout: fixed; } -table.rows tr:nth-child(even) td { +table.db-rows tr:nth-child(even) td { background-color: #FEFEFE; } -ul.row li, div.row div, table.rows th, table.rows td { +ul.db-row li, div.db-row div, table.db-rows th, table.db-rows td { border-bottom: solid 1px #DDDDDD; } -ul.row li, div.row div, table.rows tr:last-child td { border-bottom: none; } +ul.db-row li, div.db-row div, table.db-rows tr:last-child td { border-bottom: none; } -table.rows th, table.rows td { +table.db-rows th, table.db-rows td { border-right: dashed 1px #DDDDDD; } -.rows .count { +.db-rows .count { text-align: right; } -table.rows th { text-align: left; } +table.db-rows th { text-align: left; } -table.rows td { +table.db-rows td { padding: 0.3em 0.3em; } -table.rows.fixed { width: 100%; } +table.db-rows.fixed { width: 100%; } -table.rows.fixed th, -table.rows.fixed td, -div.row div label +table.db-rows.fixed th, +table.db-rows.fixed td, +div.db-row div label { white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } -table.rows.fixed th { white-space: normal; } +table.db-rows.fixed th { white-space: normal; } /* -table.rows.fixed th:hover, -table.rows.fixed td:hover { +table.db-rows.fixed th:hover, +table.db-rows.fixed td:hover { overflow: inherit; text-overflow: inherit; white-space: normal; @@ -196,51 +196,51 @@ table.rows.fixed td:hover { } */ -table.rows td.view, -table.rows td.delete { +table.db-rows td.view, +table.db-rows td.delete { width: 1%; white-space: nowrap; } -table.rows.fixed th.view { width: 2em; } -table.rows.fixed th.delete { width: 2.7em; } +table.db-rows.fixed th.view { width: 2em; } +table.db-rows.fixed th.delete { width: 2.7em; } /* To counter balance border corner when no border collapse -table.rows th { padding-top: 0; } -table.rows tr:last-child td { padding-bottom: 0; } +table.db-rows th { padding-top: 0; } +table.db-rows tr:last-child td { padding-bottom: 0; } */ /* -div.row { float: left; margin-right: 12px; min-width: 31%; } +div.db-row { float: left; margin-right: 12px; min-width: 31%; } */ -div.rows { clear: both; } -div.row { float: left; margin-right: 4px; min-width: 24%; } +div.db-rows { clear: both; } +div.db-row { float: left; margin-right: 4px; min-width: 24%; } .nofloat { float: none; } -div.row div { +div.db-row div { margin: 0; padding: 0.1em 0.2em; border-bottom: solid 1px #fff; } -.rows .row img { +.db-rows .db-row img { /* height: 1.2em; */ max-height: 4.8em; } -.rows .row iframe.video { +.db-rows .db-row iframe.video { height: 150px; width: 250px; } -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; } +div.db-row div.view .button { margin-bottom: 5px; } +div.db-row div.delete .button { margin-top: 5px; } +div.db-row div:last-child { border-bottom: none; padding-bottom: 0; } +div.db-row div.view label, div.db-row div.delete label { display: none; } +div.db-row div.view, div.db-row div.delete { text-align: center; } -div.row div label, -ul.row li label +div.db-row div label, +ul.db-row li label { padding: 0.1em 0.5em 0.1em 0; min-width: 20%; @@ -270,7 +270,7 @@ ul.row li label .menu, .nav, -.rows, +.db-rows, .bottom, .center { clear: both; @@ -279,7 +279,7 @@ ul.row li label .menu, .nav, -.rows, +.db-rows, .bottom, .buttons, td.button, @@ -350,7 +350,7 @@ form.menu .criterias input[type=text]:focus { width: auto; } /* EDIT PAGE */ -div.row label, +div.db-row label, form.edit .fields label { width: 25%; text-align: right; @@ -359,7 +359,7 @@ form.edit .fields label { vertical-align: top; } -div.row .label span, +div.db-row .label span, form.edit .fields .label span { display: inline-block; text-align: left; diff --git a/www/dbq/html/default.js b/www/dbq/html/default.js index 5869870e..fd298234 100644 --- a/www/dbq/html/default.js +++ b/www/dbq/html/default.js @@ -56,8 +56,8 @@ document.addEventListener("DOMContentLoaded", function() { }); - if (document.querySelector(".nav.bottom") && document.querySelector("table.rows")) { - document.querySelector("table.rows").insertAdjacentHTML("beforebegin","" + if (document.querySelector(".nav.bottom") && document.querySelector("table.db-rows")) { + document.querySelector("table.db-rows").insertAdjacentHTML("beforebegin","" +"
"+document.querySelector(".nav.bottom").innerHTML+"
" ); } @@ -103,7 +103,7 @@ document.addEventListener("DOMContentLoaded", function() { a.onclick = function() { var forms = document.querySelectorAll("form.rm"); - var elem = document.querySelector(".rows") ? document.querySelector(".rows") : ''; + var elem = document.querySelector(".db-rows") ? document.querySelector(".db-rows") : ''; elem.className = 'loader'; for (j = 0; j < forms.length; ++j) { diff --git a/www/dbq/html/default.min.css b/www/dbq/html/default.min.css index a914d6cf..4ce2923a 100644 --- a/www/dbq/html/default.min.css +++ b/www/dbq/html/default.min.css @@ -1 +1 @@ -html{font:90% 'Trebuchet MS',sans-serif;background-color:#eee}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.loader{border:16px solid #fff;border-radius:50%;border-top:16px solid #000;padding:0;margin:0 auto 0 auto;width:8em;height:8em;animation:spin 2s linear infinite;display:block}body.loader{margin-top:8em}.loader *{display:none!important}h1{margin:0 0 .2em 0;font-size:180%;padding-bottom:.3em;margin-bottom:.5em;border-bottom:dashed 1px #444}h1 select{padding:0;border:none;background:inherit;font:inherit}a{color:inherit}div>a,li a,p a,td a{color:#3572b0}a,a:visited{text-decoration:none}.button:hover,a:hover{opacity:.8}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 .3em}table{border-collapse:collapse}td,th{padding:.2em .7em}th a.sort{float:left;margin-right:.1em}input:not([type]),input[type=''],input[type=date],input[type=email],input[type=password],input[type=text],input[type=url],select,textarea{border-radius:3px;border:solid 1px #ddd;padding:.3em .4em;box-shadow:0 1px 1px #eee}input[size]{max-width:70%}div.row div label:after,form label:after{content:':'}form input,form label,form select{vertical-align:middle;margin:.2em .4em .2em 0}.rows{padding:0}.rows form{display:inline-block}.block,.menu,div.row,form.edit,pre,table.rows,ul.row{border-radius:4px;border-spacing:0;padding:.5em .2em;margin-bottom:.5em;border:solid 1px #ddd;background-color:#fafafa;box-shadow:0 1px 2px #eee}table.rows{border-style:hidden;border-collapse:collapse;box-shadow:0 0 0 1px #ddd;table-layout:fixed}table.rows tr:nth-child(even) td{background-color:#fefefe}div.row div,table.rows td,table.rows th,ul.row li{border-bottom:solid 1px #ddd}div.row div,table.rows tr:last-child td,ul.row li{border-bottom:none}table.rows td,table.rows th{border-right:dashed 1px #ddd}.rows .count{text-align:right}table.rows th{text-align:left}table.rows td{padding:.3em .3em}table.rows.fixed{width:100%}div.row div label,table.rows.fixed td,table.rows.fixed th{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}table.rows.fixed th{white-space:normal}table.rows td.delete,table.rows td.view{width:1%;white-space:nowrap}table.rows.fixed th.view{width:2em}table.rows.fixed th.delete{width:2.7em}div.rows{clear:both}div.row{float:left;margin-right:4px;min-width:24%}.nofloat{float:none}div.row div{margin:0;padding:.1em .2em;border-bottom:solid 1px #fff}.rows .row img{max-height:4.8em}.rows .row iframe.video{height:150px;width:250px}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.delete label,div.row div.view label{display:none}div.row div.delete,div.row div.view{text-align:center}div.row div label,ul.row li label{padding:.1em .5em .1em 0;min-width:20%;display:inline-block}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.6em;cursor:pointer;white-space:nowrap;box-sizing:border-box;margin:0 .1em 0 0;padding:0 .3em;border-radius:4px;border:none;color:#3572b0;background-color:#eee;background:linear-gradient(to bottom right,#eee,#ddd);box-shadow:0 1px 1px #bbb}.bottom,.center,.menu,.nav,.rows{clear:both;display:table}.bottom,.buttons,.center,.menu,.nav,.rows,td.button{margin-left:auto;margin-right:auto}div.buttons{text-align:center;margin-top:.5em}form.menu{padding:.5em;background-color:#fafafa;max-width:1024px}form.menu .button.add{float:right;margin-top:.2em}form.menu .criterias{border-top:dashed 1px #ddd;margin-top:.3em;padding-top:.3em;clear:both}form.menu .criterias span.label{border-right:solid 1px #fff;border-radius:3px;margin:0 .2em;white-space:nowrap;float:left}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]{width:4em}div.row label,form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}div.row .label span,form.edit .fields .label span{display:inline-block;text-align:left;vertical-align:middle;margin-top:.2em}form.edit .fields .field{width:54%}form.edit .fields input[size],form.edit .fields select,form.edit .fields textarea{width:65%}form.edit .fields .field a{display:block}form.edit .fields img{max-height:90px}iframe.video{float:left} +html{font:90% 'Trebuchet MS',sans-serif;background-color:#eee}body{display:table;margin-left:auto;margin-right:auto;padding-left:1em;padding-right:1em;color:#444}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}.loader{border:16px solid #fff;border-radius:50%;border-top:16px solid #000;padding:0;margin:0 auto 0 auto;width:8em;height:8em;animation:spin 2s linear infinite;display:block}body.loader{margin-top:8em}.loader *{display:none!important}h1{margin:0 0 .2em 0;font-size:180%;padding-bottom:.3em;margin-bottom:.5em;border-bottom:dashed 1px #444}h1 select{padding:0;border:none;background:inherit;font:inherit}a{color:inherit}div>a,li a,p a,td a{color:#3572b0}a,a:visited{text-decoration:none}.button:hover,a:hover{opacity:.8}ul{padding:0;margin:0}li{list-style:none;padding:0 0 0 .3em}table{border-collapse:collapse}td,th{padding:.2em .7em}th a.sort{float:left;margin-right:.1em}input:not([type]),input[type=''],input[type=date],input[type=email],input[type=password],input[type=text],input[type=url],select,textarea{border-radius:3px;border:solid 1px #ddd;padding:.3em .4em;box-shadow:0 1px 1px #eee}input[size]{max-width:70%}div.db-row div label:after,form label:after{content:':'}form input,form label,form select{vertical-align:middle;margin:.2em .4em .2em 0}.db-rows{padding:0}.db-rows form{display:inline-block}.block,.menu,div.db-row,form.edit,pre,table.db-rows,ul.db-row{border-radius:4px;border-spacing:0;padding:.5em .2em;margin-bottom:.5em;border:solid 1px #ddd;background-color:#fafafa;box-shadow:0 1px 2px #eee}table.db-rows{border-style:hidden;border-collapse:collapse;box-shadow:0 0 0 1px #ddd;table-layout:fixed}table.db-rows tr:nth-child(even) td{background-color:#fefefe}div.db-row div,table.db-rows td,table.db-rows th,ul.db-row li{border-bottom:solid 1px #ddd}div.db-row div,table.db-rows tr:last-child td,ul.db-row li{border-bottom:none}table.db-rows td,table.db-rows th{border-right:dashed 1px #ddd}.db-rows .count{text-align:right}table.db-rows th{text-align:left}table.db-rows td{padding:.3em .3em}table.db-rows.fixed{width:100%}div.db-row div label,table.db-rows.fixed td,table.db-rows.fixed th{white-space:nowrap;text-overflow:ellipsis;overflow:hidden}table.db-rows.fixed th{white-space:normal}table.db-rows td.delete,table.db-rows td.view{width:1%;white-space:nowrap}table.db-rows.fixed th.view{width:2em}table.db-rows.fixed th.delete{width:2.7em}div.db-rows{clear:both}div.db-row{float:left;margin-right:4px;min-width:24%}.nofloat{float:none}div.db-row div{margin:0;padding:.1em .2em;border-bottom:solid 1px #fff}.db-rows .db-row img{max-height:4.8em}.db-rows .db-row iframe.video{height:150px;width:250px}div.db-row div.view .button{margin-bottom:5px}div.db-row div.delete .button{margin-top:5px}div.db-row div:last-child{border-bottom:none;padding-bottom:0}div.db-row div.delete label,div.db-row div.view label{display:none}div.db-row div.delete,div.db-row div.view{text-align:center}div.db-row div label,ul.db-row li label{padding:.1em .5em .1em 0;min-width:20%;display:inline-block}.button{font:inherit;display:inline-block;text-decoration:none;line-height:1.6em;cursor:pointer;white-space:nowrap;box-sizing:border-box;margin:0 .1em 0 0;padding:0 .3em;border-radius:4px;border:none;color:#3572b0;background-color:#eee;background:linear-gradient(to bottom right,#eee,#ddd);box-shadow:0 1px 1px #bbb}.bottom,.center,.db-rows,.menu,.nav{clear:both;display:table}.bottom,.buttons,.center,.db-rows,.menu,.nav,td.button{margin-left:auto;margin-right:auto}div.buttons{text-align:center;margin-top:.5em}form.menu{padding:.5em;background-color:#fafafa;max-width:1024px}form.menu .button.add{float:right;margin-top:.2em}form.menu .criterias{border-top:dashed 1px #ddd;margin-top:.3em;padding-top:.3em;clear:both}form.menu .criterias span.label{border-right:solid 1px #fff;border-radius:3px;margin:0 .2em;white-space:nowrap;float:left}form.menu .criterias span.label:last-child{border-right:none}form.menu select:focus{max-width:auto}form.menu select{max-width:20%}form.menu .criterias input[type=text]{width:4em}div.db-row label,form.edit .fields label{width:25%;text-align:right;display:inline-block;margin-right:1em;vertical-align:top}div.db-row .label span,form.edit .fields .label span{display:inline-block;text-align:left;vertical-align:middle;margin-top:.2em}form.edit .fields .field{width:54%}form.edit .fields input[size],form.edit .fields select,form.edit .fields textarea{width:65%}form.edit .fields .field a{display:block}form.edit .fields img{max-height:90px}iframe.video{float:left}