From 5eb175ce52538d73bd21b8b38dc85603909d8d3b Mon Sep 17 00:00:00 2001 From: damian Date: Sun, 19 Aug 2018 16:36:54 +1000 Subject: [PATCH] Moved all content out of /static into /src/templates/default to generate a single template (most things werent actually static but can/should based on template/theme. --- .../templates/default}/css/history.css | 0 .../templates/default}/css/style.css | 0 .../templates/default/img}/phpservermon.png | Bin .../templates/default}/js/history.js | 0 .../templates/default}/js/scripts.js | 0 src/templates/default/main/body.tpl.html | 16 ++++++++-------- .../default/module/install/main.tpl.html | 2 +- .../default/module/server/history.tpl.html | 18 +++++++++--------- .../bootstrap-multiselect.min.css | 0 .../bootstrap-multiselect.min.js | 0 .../default/plugin/excanvas}/excanvas.min.js | 0 .../plugin/jqplot/jqplot.canvasOverlay.min.js | 0 .../plugin/jqplot/jqplot.cursor.min.js | 0 .../jqplot/jqplot.dateAxisRenderer.min.js | 0 .../plugin/jqplot/jqplot.highlighter.min.js | 0 .../default}/plugin/jqplot/jquery.jqplot.js | 0 .../plugin/jqplot/jquery.jqplot.min.css | 0 .../plugin/jqplot/jquery.jqplot.min.js | 0 .../plugin/jquery}/jquery-1.8.3.min.js | 0 .../css/bootstrap-responsive.css | 0 .../css/bootstrap-responsive.min.css | 0 .../twitter-bootstrap/css/bootstrap.css | 0 .../twitter-bootstrap/css/bootstrap.min.css | 0 .../img/glyphicons-halflings-white.png | Bin .../img/glyphicons-halflings.png | Bin .../plugin/twitter-bootstrap/js/bootstrap.js | 0 .../twitter-bootstrap/js/bootstrap.min.js | 0 static/index.html | 7 ------- 28 files changed, 18 insertions(+), 25 deletions(-) rename {static => src/templates/default}/css/history.css (100%) mode change 100644 => 100755 rename {static => src/templates/default}/css/style.css (100%) rename {static => src/templates/default/img}/phpservermon.png (100%) mode change 100644 => 100755 rename {static => src/templates/default}/js/history.js (100%) mode change 100644 => 100755 rename {static => src/templates/default}/js/scripts.js (100%) mode change 100644 => 100755 src/templates/default/main/body.tpl.html mode change 100644 => 100755 src/templates/default/module/install/main.tpl.html mode change 100644 => 100755 src/templates/default/module/server/history.tpl.html rename {static => src/templates/default}/plugin/bootstrap-multiselect/bootstrap-multiselect.min.css (100%) rename {static => src/templates/default}/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js (100%) rename {static/plugin => src/templates/default/plugin/excanvas}/excanvas.min.js (100%) mode change 100644 => 100755 rename {static => src/templates/default}/plugin/jqplot/jqplot.canvasOverlay.min.js (100%) rename {static => src/templates/default}/plugin/jqplot/jqplot.cursor.min.js (100%) rename {static => src/templates/default}/plugin/jqplot/jqplot.dateAxisRenderer.min.js (100%) rename {static => src/templates/default}/plugin/jqplot/jqplot.highlighter.min.js (100%) rename {static => src/templates/default}/plugin/jqplot/jquery.jqplot.js (100%) rename {static => src/templates/default}/plugin/jqplot/jquery.jqplot.min.css (100%) rename {static => src/templates/default}/plugin/jqplot/jquery.jqplot.min.js (100%) rename {static/plugin => src/templates/default/plugin/jquery}/jquery-1.8.3.min.js (100%) mode change 100644 => 100755 rename {static => src/templates/default}/plugin/twitter-bootstrap/css/bootstrap-responsive.css (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/css/bootstrap.css (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/css/bootstrap.min.css (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/img/glyphicons-halflings.png (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/js/bootstrap.js (100%) rename {static => src/templates/default}/plugin/twitter-bootstrap/js/bootstrap.min.js (100%) delete mode 100644 static/index.html diff --git a/static/css/history.css b/src/templates/default/css/history.css old mode 100644 new mode 100755 similarity index 100% rename from static/css/history.css rename to src/templates/default/css/history.css diff --git a/static/css/style.css b/src/templates/default/css/style.css similarity index 100% rename from static/css/style.css rename to src/templates/default/css/style.css diff --git a/static/phpservermon.png b/src/templates/default/img/phpservermon.png old mode 100644 new mode 100755 similarity index 100% rename from static/phpservermon.png rename to src/templates/default/img/phpservermon.png diff --git a/static/js/history.js b/src/templates/default/js/history.js old mode 100644 new mode 100755 similarity index 100% rename from static/js/history.js rename to src/templates/default/js/history.js diff --git a/static/js/scripts.js b/src/templates/default/js/scripts.js similarity index 100% rename from static/js/scripts.js rename to src/templates/default/js/scripts.js diff --git a/src/templates/default/main/body.tpl.html b/src/templates/default/main/body.tpl.html old mode 100644 new mode 100755 index a3478442..be30167a --- a/src/templates/default/main/body.tpl.html +++ b/src/templates/default/main/body.tpl.html @@ -12,18 +12,18 @@ - - - - + + + + - - - - + + + + {% endblock %} diff --git a/src/templates/default/module/install/main.tpl.html b/src/templates/default/module/install/main.tpl.html old mode 100644 new mode 100755 index c7d7d0f9..1a843a52 --- a/src/templates/default/module/install/main.tpl.html +++ b/src/templates/default/module/install/main.tpl.html @@ -1,6 +1,6 @@
-

+

 PHP Server Monitor

diff --git a/src/templates/default/module/server/history.tpl.html b/src/templates/default/module/server/history.tpl.html old mode 100644 new mode 100755 index 7a2aeaab..bc1fee4d --- a/src/templates/default/module/server/history.tpl.html +++ b/src/templates/default/module/server/history.tpl.html @@ -1,19 +1,19 @@ - - - - - - - + + + + + + + - + - +
{% for graph in graphs %} diff --git a/static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.css b/src/templates/default/plugin/bootstrap-multiselect/bootstrap-multiselect.min.css similarity index 100% rename from static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.css rename to src/templates/default/plugin/bootstrap-multiselect/bootstrap-multiselect.min.css diff --git a/static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js b/src/templates/default/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js similarity index 100% rename from static/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js rename to src/templates/default/plugin/bootstrap-multiselect/bootstrap-multiselect.min.js diff --git a/static/plugin/excanvas.min.js b/src/templates/default/plugin/excanvas/excanvas.min.js old mode 100644 new mode 100755 similarity index 100% rename from static/plugin/excanvas.min.js rename to src/templates/default/plugin/excanvas/excanvas.min.js diff --git a/static/plugin/jqplot/jqplot.canvasOverlay.min.js b/src/templates/default/plugin/jqplot/jqplot.canvasOverlay.min.js similarity index 100% rename from static/plugin/jqplot/jqplot.canvasOverlay.min.js rename to src/templates/default/plugin/jqplot/jqplot.canvasOverlay.min.js diff --git a/static/plugin/jqplot/jqplot.cursor.min.js b/src/templates/default/plugin/jqplot/jqplot.cursor.min.js similarity index 100% rename from static/plugin/jqplot/jqplot.cursor.min.js rename to src/templates/default/plugin/jqplot/jqplot.cursor.min.js diff --git a/static/plugin/jqplot/jqplot.dateAxisRenderer.min.js b/src/templates/default/plugin/jqplot/jqplot.dateAxisRenderer.min.js similarity index 100% rename from static/plugin/jqplot/jqplot.dateAxisRenderer.min.js rename to src/templates/default/plugin/jqplot/jqplot.dateAxisRenderer.min.js diff --git a/static/plugin/jqplot/jqplot.highlighter.min.js b/src/templates/default/plugin/jqplot/jqplot.highlighter.min.js similarity index 100% rename from static/plugin/jqplot/jqplot.highlighter.min.js rename to src/templates/default/plugin/jqplot/jqplot.highlighter.min.js diff --git a/static/plugin/jqplot/jquery.jqplot.js b/src/templates/default/plugin/jqplot/jquery.jqplot.js similarity index 100% rename from static/plugin/jqplot/jquery.jqplot.js rename to src/templates/default/plugin/jqplot/jquery.jqplot.js diff --git a/static/plugin/jqplot/jquery.jqplot.min.css b/src/templates/default/plugin/jqplot/jquery.jqplot.min.css similarity index 100% rename from static/plugin/jqplot/jquery.jqplot.min.css rename to src/templates/default/plugin/jqplot/jquery.jqplot.min.css diff --git a/static/plugin/jqplot/jquery.jqplot.min.js b/src/templates/default/plugin/jqplot/jquery.jqplot.min.js similarity index 100% rename from static/plugin/jqplot/jquery.jqplot.min.js rename to src/templates/default/plugin/jqplot/jquery.jqplot.min.js diff --git a/static/plugin/jquery-1.8.3.min.js b/src/templates/default/plugin/jquery/jquery-1.8.3.min.js old mode 100644 new mode 100755 similarity index 100% rename from static/plugin/jquery-1.8.3.min.js rename to src/templates/default/plugin/jquery/jquery-1.8.3.min.js diff --git a/static/plugin/twitter-bootstrap/css/bootstrap-responsive.css b/src/templates/default/plugin/twitter-bootstrap/css/bootstrap-responsive.css similarity index 100% rename from static/plugin/twitter-bootstrap/css/bootstrap-responsive.css rename to src/templates/default/plugin/twitter-bootstrap/css/bootstrap-responsive.css diff --git a/static/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css b/src/templates/default/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css similarity index 100% rename from static/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css rename to src/templates/default/plugin/twitter-bootstrap/css/bootstrap-responsive.min.css diff --git a/static/plugin/twitter-bootstrap/css/bootstrap.css b/src/templates/default/plugin/twitter-bootstrap/css/bootstrap.css similarity index 100% rename from static/plugin/twitter-bootstrap/css/bootstrap.css rename to src/templates/default/plugin/twitter-bootstrap/css/bootstrap.css diff --git a/static/plugin/twitter-bootstrap/css/bootstrap.min.css b/src/templates/default/plugin/twitter-bootstrap/css/bootstrap.min.css similarity index 100% rename from static/plugin/twitter-bootstrap/css/bootstrap.min.css rename to src/templates/default/plugin/twitter-bootstrap/css/bootstrap.min.css diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png b/src/templates/default/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png similarity index 100% rename from static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png rename to src/templates/default/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png b/src/templates/default/plugin/twitter-bootstrap/img/glyphicons-halflings.png similarity index 100% rename from static/plugin/twitter-bootstrap/img/glyphicons-halflings.png rename to src/templates/default/plugin/twitter-bootstrap/img/glyphicons-halflings.png diff --git a/static/plugin/twitter-bootstrap/js/bootstrap.js b/src/templates/default/plugin/twitter-bootstrap/js/bootstrap.js similarity index 100% rename from static/plugin/twitter-bootstrap/js/bootstrap.js rename to src/templates/default/plugin/twitter-bootstrap/js/bootstrap.js diff --git a/static/plugin/twitter-bootstrap/js/bootstrap.min.js b/src/templates/default/plugin/twitter-bootstrap/js/bootstrap.min.js similarity index 100% rename from static/plugin/twitter-bootstrap/js/bootstrap.min.js rename to src/templates/default/plugin/twitter-bootstrap/js/bootstrap.min.js diff --git a/static/index.html b/static/index.html deleted file mode 100644 index 02e60c73..00000000 --- a/static/index.html +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - -