www/dbq/html/default.js

diff --git a/lib/php/db/table.php b/lib/php/db/table.php
index 374582856c59050897d4412e74d4e9b712f33495..014fa572c7deb4030b1c67f338acd6f3d8382abd 100644 (file)
--- a/lib/php/db/table.php
+++ b/lib/php/db/table.php
@@ -2158,10 +2158,10 @@ Class Table extends nb {
        public function html_menu($opt=[]) {
                if (isset($opt['html_menu']) and !$opt['html_menu']) return '';
 
-               $buttons = '<input type="submit" class="button button-small btn btn-primary" value="Go"/>';
+               $buttons = '<div class="btn-group"><input type="submit" class="button button-small btn btn-primary" value="Go"/></div>';
                if (!empty($opt['buttons'])) $buttons = $opt['buttons'];
 
-               $r = '<form class="menu card list-group-item" id="db-table-html-menu-form" method="get" action="'.$this->request_uri().'">'.NB_EOL;
+               $r = '<form class="menu card list-group-item form-inline" id="db-table-html-menu-form" method="get" action="'.$this->request_uri().'">'.NB_EOL;
 
                # See: http://html5doctor.com/html5-forms-input-types/
                #$r .= '<input id="skill" type="range" min="1" max="100" value="0" />';
@@ -2179,7 +2179,7 @@ Class Table extends nb {
                        if (count($tables)>1) {
                                $option_html .= '<span class="label form-group">';
                                $option_html .= '<label for="table">Tables:</label>'.html_select_array($tables,[
-                                       'html'       => 'class="db-table _form-control" name="table" id="table"',
+                                       'html'       => 'class="db-table form-control" name="table" id="table"',
                                        'selected'   => $this->name,
                                        'prettyText' => true,
                                        'sort'       => 'natcasesort',
@@ -2191,7 +2191,7 @@ Class Table extends nb {
                        if (!empty($this->db()->dbs) and count($this->db()->dbs)>1) {
                                $option_html .= '<span class="label form-group">';
                                $option_html .= '<label for="db">Db:</label>'.html_select_array($this->db()->dbs,[
-                                       'html'       => 'class="dbs _form-control" id="db" name="db" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
+                                       'html'       => 'class="dbs form-control" id="db" name="db" onchange="document.location=\''.preg_replace('/\?.*$/','',$_SERVER['REQUEST_URI']).'?db=\'+this.value"',
                                        'selected'   => $this->db()->name,
                                        'prettyText' => true,
                                        'sort' => 'natcasesort',
@@ -2203,7 +2203,7 @@ Class Table extends nb {
                        $option_html .= '<span class="label form-group">';
                        #debug($this->db()->formats);
                        $option_html .= '<label for="format">Format:</label>'.html_select_array($this->db()->formats,[
-                               'html'       => 'class="format _form-control" name="format" id="format"',
+                               'html'       => 'class="format form-control" name="format" id="format"',
                                'selected'   => $this->db()->format,
                                'prettyText' => true,
 # NB 26.12.16         'sort'       => 'natcasesort',
@@ -2214,7 +2214,7 @@ Class Table extends nb {
                        if (!empty($this->db()->limits) and count($this->db()->limits)>1) {
                                $option_html .= '<span class="label form-group">';
                                $option_html .= '<label for="limit">Limit:</label>'.html_select_array($this->db()->limits,[
-                                       'html'       => 'class="limit _form-control" name="limit" id="limit"',
+                                       'html'       => 'class="limit form-control" name="limit" id="limit"',
                                        'selected'   => $this->p('limit'),
                                        'prettyText' => true,
                                        'sort' => 'sort',
@@ -2230,7 +2230,7 @@ Class Table extends nb {
                        /*
                        $option_html .= '<span class="label form-group">';
                        $option_html .= '<label for="limit">OrderBy:</label>'.html_select_array(array_keys($this->fields()),[
-                               'html'       => 'class="orderby _form-control" name="orderby" id="orderby"',
+                               'html'       => 'class="orderby form-control" name="orderby" id="orderby"',
                                'selected'   => $this->p('orderby'),
                                'prettyText' => true,
                        ]);
@@ -2239,7 +2239,7 @@ Class Table extends nb {
 
                        $form_hidden_ignore = ['db','table','format','limit'];#,'download'];
 
-                       if ($option_html) $r .= '<div class="options">' . $option_html . '</div>';
+                       if ($option_html) $r .= '<div class="options row">' . $option_html . '</div>';
 
 
                } else { # // Options
@@ -2260,7 +2260,7 @@ Class Table extends nb {
                //
                // Criterias
                //
-               $r .= '<div class="criterias">';
+               $r .= '<div class="criterias row">';
                if (!isset($opt['fields'])) $opt['fields'] = $this->fields();
                foreach ($opt['fields'] as $k => $f) {
 
@@ -2270,7 +2270,7 @@ Class Table extends nb {
                        $r .= ''
                                .'<span class="label form-group '.$k.'">'
                                . '<label>'.prettyText($k).':</label>'
-                               . '<input class="_form-control" type="text" id="'.$k.'" name="'.$this->ppreff().$k.'" value="'.$v.'" />'
+                               . '<input class="form-control" type="text" id="'.$k.'" name="'.$this->ppreff().$k.'" value="'.$v.'" />'
                                .'</span>'
                        ;
 

diff --git a/www/dbq/html/default.js b/www/dbq/html/default.js
index 5abc3c5e54c09a9ab9887d0d2361d3135ab1da0a..53baa1114a1311856d61a5bba4ca915e27ad1fa3 100644 (file)
--- a/www/dbq/html/default.js
+++ b/www/dbq/html/default.js
@@ -89,11 +89,11 @@ document.addEventListener("DOMContentLoaded", function() {
 
        document.querySelectorAll("form.menu input[type=submit]").forEach(function(e) {
                e.insertAdjacentHTML("afterend",''
-                       +'&nbsp;<input type="button" class="btn btn-secondary button '+e.className+'" onclick="form_clean(this.form)"'
+                       +'<input type="button" class="btn btn-secondary button '+e.className+'" onclick="form_clean(this.form)"'
                                +' value="'+window._dbq['text.clear']+'"'
                        +' />'
                        +( window._dbq['perm'] >= window._dbq['perms']['write']
-                               ? '&nbsp;<input type="button" class="btn btn-warning add '+e.className+'"'
+                               ? '<input type="button" class="btn btn-warning add '+e.className+'"'
                                        +' onclick="window.location=\''+window._dbq['table.base']+'/add/\'"'
                                        +' value="'+window._dbq['text.add']+'"/>'
                                : ''