From 23440bb444eb9dac9d39e39c69500d14320d3ac6 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Wed, 3 Oct 2018 02:47:30 +0100 Subject: [PATCH] www/dbq/dbq.php --- lib/php/db/field.php | 31 +++++++++++++++++++++++-------- www/dbq/dbq.php | 2 +- www/dbq/html/default.css | 8 ++++++++ www/dbq/html/default.js | 3 ++- www/dbq/html/default.min.css | 2 +- 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/lib/php/db/field.php b/lib/php/db/field.php index 5d591356..7be51090 100644 --- a/lib/php/db/field.php +++ b/lib/php/db/field.php @@ -147,7 +147,7 @@ class field extends nb { $h = ''; $class = [ 'label', 'form-group', $this->name ]; $mime = Mime::fromContent($value); - if ($mime) $class[] = $mime; +# NB 03.10.18 if ($mime) $class[] = $mime; if ($this->extras) { $h .= ''.$this->out($value).''; @@ -170,12 +170,12 @@ class field extends nb { $tag = 'input'; } #debug([$this->name,$type]); - if ($this->html_edit_hide_min_size - and $this->html_edit_hide_min_size <= mb_strlen($value) - ) { - $tag = 'input'; - $type = 'hidden'; - } +# NB 03.10.18 if ($this->html_edit_hide_min_size +# NB 03.10.18 and $this->html_edit_hide_min_size <= mb_strlen($value) +# NB 03.10.18 ) { +# NB 03.10.18 $tag = 'input'; +# NB 03.10.18 $type = 'hidden'; +# NB 03.10.18 } $media = ''.$media.''; } @@ -201,7 +201,22 @@ class field extends nb { ; # If more than one value, add js code to add more fields - if ($multi) $html .= '+'; + if ($multi) { + $js = preg_replace('/([\r\n\t]| )+/',''," +var i=this.parentNode; +var j = i.cloneNode(true); +j.querySelectorAll('img, input, textarea, select').forEach(function(e) { + e.value=''; + e.src = ''; +}); +i.parentNode.insertBefore(j, i.nextSibling); +/* +*/ +console.log(i.className); +return false; + "); + $html .= '+'; + } $html .= ''.NB_EOL; } diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php index 4f3835c6..b5c546b1 100644 --- a/www/dbq/dbq.php +++ b/www/dbq/dbq.php @@ -306,7 +306,7 @@ class DbQ extends nb { $this->page->body_class = trim('container-fluid_ ' .(empty($this->params['db']) ? '' : ' db-'.$this->params['db']) .(empty($this->params['table']) ? '' : ' table-'.$this->params['table']) - .( (empty($this->db) or empty($this->table)) ? '' : ' no-db' ) +# NB 03.10.18 .( (empty($this->db) or empty($this->table)) ? '' : ' no-db' ) .(empty($this->params['action']) ? ' action-'.self::PARAM_DB_DEFAULT : ' action-'.($this->params['action'] == 'add' ? 'vi' : $this->params['action'])) ); diff --git a/www/dbq/html/default.css b/www/dbq/html/default.css index e240ca98..3a85e1fd 100644 --- a/www/dbq/html/default.css +++ b/www/dbq/html/default.css @@ -108,3 +108,11 @@ h1, h1 a, h1 a:hover { a.active, .active a { color: var(--danger); } + +.db-edit img { + max-height: 5rem; +} + +.db-rows img { + max-height: 2rem; +} diff --git a/www/dbq/html/default.js b/www/dbq/html/default.js index cf35857f..ac19326e 100644 --- a/www/dbq/html/default.js +++ b/www/dbq/html/default.js @@ -154,7 +154,8 @@ document.addEventListener("DOMContentLoaded", function() { // // h1 to select links // - if (document.querySelector("body.no-db")) document.querySelectorAll("body > h1 a.title-nav-db, body > h1 a.title-nav-table").forEach(function(e) { +// NB 03.10.18 if (document.querySelector("body.no-db")) + document.querySelectorAll("body > h1 a.title-nav-db, body > h1 a.title-nav-table").forEach(function(e) { //console.log(e.className+': '+window._dbq[e.className+'.base']); var cname = e.className.replace('title-nav-','') diff --git a/www/dbq/html/default.min.css b/www/dbq/html/default.min.css index 27d853b9..8b1ccafe 100644 --- a/www/dbq/html/default.min.css +++ b/www/dbq/html/default.min.css @@ -1 +1 @@ -@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:140%;padding-bottom:.3em;margin-bottom:.5em;padding:.3em;background-color:var(--dark)}h1,h1 a,h1 a:hover{color:var(--light);font-weight:400!important}#db-menu-form_ *{font-size:95%}#db-menu-form .form-control{max-width:5rem;height:1.5rem;padding:0 .3rem;margin-top:.4rem;margin-left:.2rem}#db-menu-form .btn-group{margin-left:.4rem;max-height:2.5rem}.db-edit .form-control+.media{margin-top:.25rem}#db-menu-form,#page-bottom,.CENTER,.db-results,.db-rows,.pagination{margin-left:auto;margin-right:auto;width:auto;display:table}.pagination *{display:inline-block}.D-NONE,.db-field-delete label,.db-field-view label{display:none}.HIDE,.db-rows th.view{color:transparent;text-shadow:none;background-color:transparent}.active a,a.active{color:var(--danger)} +@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:140%;padding-bottom:.3em;margin-bottom:.5em;padding:.3em;background-color:var(--dark)}h1,h1 a,h1 a:hover{color:var(--light);font-weight:400!important}#db-menu-form_ *{font-size:95%}#db-menu-form .form-control{max-width:5rem;height:1.5rem;padding:0 .3rem;margin-top:.4rem;margin-left:.2rem}#db-menu-form .btn-group{margin-left:.4rem;max-height:2.5rem}.db-edit .form-control+.media{margin-top:.25rem}#db-menu-form,#page-bottom,.CENTER,.db-results,.db-rows,.pagination{margin-left:auto;margin-right:auto;width:auto;display:table}.pagination *{display:inline-block}.D-NONE,.db-field-delete label,.db-field-view label{display:none}.HIDE,.db-rows th.view{color:transparent;text-shadow:none;background-color:transparent}.active a,a.active{color:var(--danger)}.db-edit img{max-height:5rem}.db-rows img{max-height:2rem} -- 2.47.3