dbq

diff --git a/lib/css/button.css b/lib/css/button.css
index 66aa43c643476812143e45e5129205d6d46292e4..e02b8a4457c269a95caa3d0f95fc66e9946e25fa 100644 (file)
--- a/lib/css/button.css
+++ b/lib/css/button.css
@@ -9,10 +9,10 @@
        cursor: pointer;
        border-width: 1px;
        border-style: solid;
+       white-space: nowrap;
        -webkit-appearance: none;
        -webkit-border-radius: 3px;
        border-radius: 3px;
-       white-space: nowrap;
        -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
        box-sizing: border-box;

diff --git a/lib/php/db/page.php b/lib/php/db/page.php
index bb098f5b0aebce24710385e90a9e9d2c9e7a9b5b..422d6f0dfecb83a9cc9cf6a08a22575f12347d44 100644 (file)
--- a/lib/php/db/page.php
+++ b/lib/php/db/page.php
@@ -1,36 +1,19 @@
 <?php
 require_once(dirname(__FILE__).'/init.php');
 require_once(dirname(__FILE__).'/../page.php');
-$css = [];
-$js = [];
-if (!empty($_SERVER['DOCUMENT_ROOT'])) {
-  foreach (array_merge([]
-    ,glob($_SERVER['DOCUMENT_ROOT'].'/css/*.css')
-    ,glob($_SERVER['DOCUMENT_ROOT'].'/*.css')
-  ) as $c) {
-    $css[] = substr($c, strlen($_SERVER['DOCUMENT_ROOT']));
-  }
-  foreach (array_merge([]
-    ,[
-      $_SERVER['DOCUMENT_ROOT'].'/jquery/jquery.js',
-      $_SERVER['DOCUMENT_ROOT'].'/jquery/jquery-ui.js',
-    ]
-    ,glob($_SERVER['DOCUMENT_ROOT'].'/js/*.js')
-    ,glob($_SERVER['DOCUMENT_ROOT'].'/*.js')
-  )
-  as $j) {
-    if (file_exists($j)) $js[] = substr($j, strlen($_SERVER['DOCUMENT_ROOT']));
-  }
-  #debug([$js,$css]);
-}
-
-function auto_doc_root() {
-}
 
 $Page = new Page([
   'title' => ($Db->title ? $Db->title : Db::prettyText($Db->name)),
-  'css' => $css,
-  'js' => $js,
+  'css' => [
+    'css/*.css',
+    '/*.css',
+  ],
+  'js' => [
+    '/jquery/jquery.js',
+    '/jquery/jquery-ui.js',
+    'js/*.js',
+    '/*.js',
+  ],
   'content_type' => Page::content_type_and_set_format(),
   'nav' => [
     [ (!empty($Db) and !empty($Db->title)) ? $Db->title : 'Home', '/'],

diff --git a/lib/php/page.php b/lib/php/page.php
index 5e756cec9a01e6b1fc93dc3c5e0076384613bbf4..cadc3b25ac4b969ca5da3e3d5b7f329f144c7937 100644 (file)
--- a/lib/php/page.php
+++ b/lib/php/page.php
@@ -391,7 +391,7 @@ class Page extends nb {
 
       // META
       if (self::$charset) $head .= '<meta http-equiv="Content-Type" content="text/html; charset='.self::$charset.'" />'.NB_EOL;
-      $head .= '<meta name="viewport" content="width=device-width, initial-scale=1" />'.NB_EOL;
+      $head .= '<meta name="viewport" content="width=device-width, initial-scale=1.0" />'.NB_EOL;
 
       // CSS
       foreach ((array)($this->css) as $vv) {

diff --git a/www/dbq/.htaccess b/www/dbq/.htaccess
index d952bee06004b8fcc5b728039769202f59002f61..1ce85584705c800d94c6e58dcbccb95bc3114afe 100644 (file)
--- a/www/dbq/.htaccess
+++ b/www/dbq/.htaccess
@@ -3,3 +3,4 @@ RewriteEngine On
 #RewriteRule "^/([^/\.]+).tgz$" "/$1.git" [R=302]
 
 DirectoryIndex index.php index.html
+

diff --git a/www/dbq/button.css b/www/dbq/button.css
new file mode 120000 (symlink)
index 0000000..3657d48
--- /dev/null
+++ b/www/dbq/button.css
@@ -0,0 +1 @@
+../../lib/css/button.css
\ No newline at end of file

diff --git a/www/dbq/db.css b/www/dbq/db.css
new file mode 120000 (symlink)
index 0000000..d12264f
--- /dev/null
+++ b/www/dbq/db.css
@@ -0,0 +1 @@
+../../lib/css/db.css
\ No newline at end of file

diff --git a/www/dbq/default.css b/www/dbq/default.css
new file mode 100644 (file)
index 0000000..744d2ca
--- /dev/null
+++ b/www/dbq/default.css
@@ -0,0 +1,65 @@
+html {
+  font: 100% 'Trebuchet MS', sans-serif;
+}
+
+body {
+  display: table;
+  margin-left: auto;
+  margin-right: auto;
+  padding-left: 1em;
+  padding-right: 1em;
+  background-color: #E6E6E6;
+}
+
+a,
+body {
+  color: #333333;
+}
+
+ul {
+  padding: 0;
+  margin: 0;
+}
+
+li {
+  list-style:none;
+  padding: 0 0 0 0.3em;
+}
+
+a, a:visited {
+  text-decoration: none;
+}
+
+.button {
+  color: #ddd;
+  background-color: #3C3C3B;
+}
+
+table.rows,
+div.rows,
+object, iframe, pre, .t2d tr
+{
+  border-collapse: separate;
+  border-spacing: 0;
+  padding: 0.2em 0.1em;
+  border-radius: 4px;
+
+  border: solid 1px #fff;
+  margin-bottom: 0.5em;
+
+}
+
+table.rows th, table.rows td,
+table.border th, table.border td {
+  border-bottom: solid 1px #fff;
+}
+
+table.rows tr:last-child td, table.border tr:last-child td { border-bottom: none; }
+
+.menu, .nav, .rows,
+.center {
+  margin-left: auto;
+  margin-right: auto;
+  display: table;
+}
+