diff --git a/jscss/bootstrap-toggle/bootstrap-toggle.min.css b/html/bootstrap-toggle/bootstrap-toggle.min.css similarity index 100% rename from jscss/bootstrap-toggle/bootstrap-toggle.min.css rename to html/bootstrap-toggle/bootstrap-toggle.min.css diff --git a/jscss/bootstrap-toggle/bootstrap-toggle.min.js b/html/bootstrap-toggle/bootstrap-toggle.min.js similarity index 100% rename from jscss/bootstrap-toggle/bootstrap-toggle.min.js rename to html/bootstrap-toggle/bootstrap-toggle.min.js diff --git a/jscss/bootstrap/css/bootstrap-theme.css b/html/bootstrap/css/bootstrap-theme.css similarity index 100% rename from jscss/bootstrap/css/bootstrap-theme.css rename to html/bootstrap/css/bootstrap-theme.css diff --git a/jscss/bootstrap/css/bootstrap-theme.css.map b/html/bootstrap/css/bootstrap-theme.css.map similarity index 100% rename from jscss/bootstrap/css/bootstrap-theme.css.map rename to html/bootstrap/css/bootstrap-theme.css.map diff --git a/jscss/bootstrap/css/bootstrap-theme.min.css b/html/bootstrap/css/bootstrap-theme.min.css similarity index 100% rename from jscss/bootstrap/css/bootstrap-theme.min.css rename to html/bootstrap/css/bootstrap-theme.min.css diff --git a/jscss/bootstrap/css/bootstrap.css b/html/bootstrap/css/bootstrap.css similarity index 100% rename from jscss/bootstrap/css/bootstrap.css rename to html/bootstrap/css/bootstrap.css diff --git a/jscss/bootstrap/css/bootstrap.css.map b/html/bootstrap/css/bootstrap.css.map similarity index 100% rename from jscss/bootstrap/css/bootstrap.css.map rename to html/bootstrap/css/bootstrap.css.map diff --git a/jscss/bootstrap/css/bootstrap.min.css b/html/bootstrap/css/bootstrap.min.css similarity index 100% rename from jscss/bootstrap/css/bootstrap.min.css rename to html/bootstrap/css/bootstrap.min.css diff --git a/jscss/bootstrap/fonts/glyphicons-halflings-regular.eot b/html/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from jscss/bootstrap/fonts/glyphicons-halflings-regular.eot rename to html/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/jscss/bootstrap/fonts/glyphicons-halflings-regular.svg b/html/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from jscss/bootstrap/fonts/glyphicons-halflings-regular.svg rename to html/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/jscss/bootstrap/fonts/glyphicons-halflings-regular.ttf b/html/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from jscss/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to html/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/jscss/bootstrap/fonts/glyphicons-halflings-regular.woff b/html/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from jscss/bootstrap/fonts/glyphicons-halflings-regular.woff rename to html/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/jscss/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/html/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from jscss/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to html/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/jscss/bootstrap/js/bootstrap.js b/html/bootstrap/js/bootstrap.js similarity index 100% rename from jscss/bootstrap/js/bootstrap.js rename to html/bootstrap/js/bootstrap.js diff --git a/jscss/bootstrap/js/bootstrap.min.js b/html/bootstrap/js/bootstrap.min.js similarity index 100% rename from jscss/bootstrap/js/bootstrap.min.js rename to html/bootstrap/js/bootstrap.min.js diff --git a/jscss/bootstrap/js/npm.js b/html/bootstrap/js/npm.js similarity index 100% rename from jscss/bootstrap/js/npm.js rename to html/bootstrap/js/npm.js diff --git a/jscss/custom.css b/html/custom.css similarity index 100% rename from jscss/custom.css rename to html/custom.css diff --git a/html/errors/db_error.php b/html/errors/db_error.php new file mode 100755 index 000000000..1a3591edd --- /dev/null +++ b/html/errors/db_error.php @@ -0,0 +1,81 @@ + + + + + + + + nettemp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + diff --git a/jscss/highcharts/dark-unica.js b/html/highcharts/dark-unica.js similarity index 100% rename from jscss/highcharts/dark-unica.js rename to html/highcharts/dark-unica.js diff --git a/jscss/highcharts/exporting.js b/html/highcharts/exporting.js similarity index 100% rename from jscss/highcharts/exporting.js rename to html/highcharts/exporting.js diff --git a/jscss/highcharts/highcharts.js b/html/highcharts/highcharts.js similarity index 100% rename from jscss/highcharts/highcharts.js rename to html/highcharts/highcharts.js diff --git a/jscss/highcharts/highstock.js b/html/highcharts/highstock.js similarity index 100% rename from jscss/highcharts/highstock.js rename to html/highcharts/highstock.js diff --git a/jscss/jquery/jquery-1.11.3.min.js b/html/jquery/jquery-1.11.3.min.js similarity index 100% rename from jscss/jquery/jquery-1.11.3.min.js rename to html/jquery/jquery-1.11.3.min.js diff --git a/jscss/jquery/jquery.js b/html/jquery/jquery.js similarity index 100% rename from jscss/jquery/jquery.js rename to html/jquery/jquery.js diff --git a/jscss/masonry/masonry.pkgd.min.js b/html/masonry/masonry.pkgd.min.js similarity index 100% rename from jscss/masonry/masonry.pkgd.min.js rename to html/masonry/masonry.pkgd.min.js diff --git a/index.php b/index.php index ed72a762f..7cef24d0b 100755 --- a/index.php +++ b/index.php @@ -25,17 +25,17 @@ nettemp - + - + - + - - + + @@ -70,7 +70,7 @@ query("SELECT * FROM gpio WHERE mode='simple' OR mode='moment' OR mode='trigger'"); -$rows2 = $db1->query("SELECT * FROM relays WHERE type='relay'"); +$rows2 = $db1->query("SELECT * FROM relays WHERE type='relay'") or header("Location: html/errors/db_error.php"); $row1 = $rows1->fetchAll(); $row2 = $rows2->fetchAll(); @@ -152,7 +152,7 @@ - + diff --git a/modules/status/html/status.php b/modules/status/html/status.php index 44376faae..e1c0cf330 100755 --- a/modules/status/html/status.php +++ b/modules/status/html/status.php @@ -1,4 +1,4 @@ - + - - + + +