From 9f3e140b2972dda38c0060876a6f822e3b3e1a3a Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Thu, 26 Sep 2019 12:47:55 +0200
Subject: [PATCH] Changed file path to new path

Moved to src/templates/default/static. Should have been in b0ea45a.
---
 manifest.json                                 |  2 +-
 service-worker.js                             | 14 +++----
 src/templates/default/main/body.tpl.html      | 40 +++++++++----------
 .../default/module/install/main.tpl.html      |  2 +-
 .../default/module/server/history.tpl.html    |  6 +--
 5 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/manifest.json b/manifest.json
index 28ca7456..060285ba 100755
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "name": "PHP Server Monitor",
   "short_name": "PSM",
   "icons": [{
-    "src": "static/phpservermon.png",
+    "src": "phpservermon.png",
       "sizes": "128x128",
       "type": "image/png"
     }, {
diff --git a/service-worker.js b/service-worker.js
index f887bf12..3d0a4edb 100755
--- a/service-worker.js
+++ b/service-worker.js
@@ -3,13 +3,13 @@ var cacheName = 'PSM-PWA-final-1';
 var filesToCache = [
   '/',
   'index.php',
-  'static/js/history.js',
-  'static/js/scripts.js',
-  'static/js/search.js',
-  'static/css/bootstrap.min.css',
-  'static/css/search.min.css',
-  'static/css/style.min.css',
-  'static/phpservermon.png'
+  'src/templates/default/static/js/history.js',
+  'src/templates/default/static/js/scripts.js',
+  'src/templates/default/static/js/search.js',
+  'src/templates/default/static/css/bootstrap.min.css',
+  'src/templates/default/static/css/search.min.css',
+  'src/templates/default/static/css/style.min.css',
+  'phpservermon.png'
 ];
 
 self.addEventListener('install', function(e) {
diff --git a/src/templates/default/main/body.tpl.html b/src/templates/default/main/body.tpl.html
index 64de846b..35168a6d 100644
--- a/src/templates/default/main/body.tpl.html
+++ b/src/templates/default/main/body.tpl.html
@@ -12,8 +12,8 @@
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
 	<meta name="apple-mobile-web-app-title" content="PSM">
-	<link rel="apple-touch-icon" href="static/phpservermon.png">
-	<meta name="msapplication-TileImage" content="static/phpservermon.png">
+	<link rel="apple-touch-icon" href="phpservermon.png">
+	<meta name="msapplication-TileImage" content="phpservermon.png">
 	<meta name="msapplication-TileColor" content="#424242">
 	<!-- TODO add base url -->
   	<!-- <link rel="canonical" href=""> -->
@@ -21,9 +21,9 @@
 	<link rel="icon" type="image/x-icon" href="favicon.ico" />
 	<link rel="icon" type="image/png" href="favicon.png" />
 	<link rel="apple-touch-icon" href="favicon.png" />
-	<link href="static/css/bootstrap.min.css" rel="stylesheet">
-	<link href="static/plugin/bootstrap-select/dist/css/bootstrap-select.min.css" rel="stylesheet">
-	<link href="static/css/style.min.css" rel="stylesheet">
+	<link href="src/templates/default/static/css/bootstrap.min.css" rel="stylesheet">
+	<link href="src/templates/default/static/plugin/bootstrap-select/dist/css/bootstrap-select.min.css" rel="stylesheet">
+	<link href="src/templates/default/static/css/style.min.css" rel="stylesheet">
 	<!--[if lt IE 9]>
     	<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
@@ -75,21 +75,21 @@
 	</footer>
 	{% endblock %}
 	{% endif %}
-	<script src="static/plugin/jquery/jquery-3.3.1.min.js"></script>
-	<script src="static/plugin/popper.js/popper.min.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/index.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/util.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/tab.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/dropdown.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/collapse.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/button.js"></script>
-	<script src="static/plugin/bootstrap/js/dist/alert.js"></script>
-	{% if html_modal|raw %}<script src="static/plugin/bootstrap/js/dist/modal.js"></script>{% endif %}
-	<script type="text/javascript" src="static/plugin/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="static/plugin/bootstrap-select/dist/js/i18n/defaults-{{ language }}.min.js"></script>
-	<script defer src="static/plugin/font-awesome/js/solid.min.js"></script>
-	<script defer src="static/plugin/font-awesome/js/fontawesome.min.js" data-auto-replace-svg="nest"></script>
-	<script type="text/javascript" src="static/js/scripts.js"></script>
+	<script src="src/templates/default/static/plugin/jquery/jquery-3.3.1.min.js"></script>
+	<script src="src/templates/default/static/plugin/popper.js/popper.min.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/index.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/util.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/tab.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/dropdown.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/collapse.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/button.js"></script>
+	<script src="src/templates/default/static/plugin/bootstrap/js/dist/alert.js"></script>
+	{% if html_modal|raw %}<script src="src/templates/default/static/plugin/bootstrap/js/dist/modal.js"></script>{% endif %}
+	<script type="text/javascript" src="src/templates/default/static/plugin/bootstrap-select/dist/js/bootstrap-select.min.js"></script>
+	<script type="text/javascript" src="src/templates/default/static/plugin/bootstrap-select/dist/js/i18n/defaults-{{ language }}.min.js"></script>
+	<script defer src="src/templates/default/static/plugin/font-awesome/js/solid.min.js"></script>
+	<script defer src="src/templates/default/static/plugin/font-awesome/js/fontawesome.min.js" data-auto-replace-svg="nest"></script>
+	<script type="text/javascript" src="src/templates/default/static/js/scripts.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/templates/default/module/install/main.tpl.html b/src/templates/default/module/install/main.tpl.html
index bdb96f88..61664db3 100644
--- a/src/templates/default/module/install/main.tpl.html
+++ b/src/templates/default/module/install/main.tpl.html
@@ -1,7 +1,7 @@
 <div class="jumbotron w-100">
 	<div class="row">
 	<a href="http://www.phpservermonitor.org/">
-		<img class="img-responsive" src="static/phpservermon.png" alt="PHPServerMonitor - home" />
+		<img class="img-responsive" src="phpservermon.png" alt="PHPServerMonitor - home" />
 	</a>
 	<h2>&nbsp;PHP Server Monitor</h2>
 </div>
diff --git a/src/templates/default/module/server/history.tpl.html b/src/templates/default/module/server/history.tpl.html
index 61e602ad..7f76bc69 100644
--- a/src/templates/default/module/server/history.tpl.html
+++ b/src/templates/default/module/server/history.tpl.html
@@ -1,5 +1,5 @@
-<script type="text/javascript" src="static/plugin/momentjs/moment.js"></script>
-<script type="text/javascript" src="static/plugin/chartjs/chart-2.7.3.min.js"></script>
+<script type="text/javascript" src="src/templates/default/static/plugin/momentjs/moment.js"></script>
+<script type="text/javascript" src="src/templates/default/static/plugin/chartjs/chart-2.7.3.min.js"></script>
 {% for graph in graphs %}
 <div class="chart-container col-10" style="position: relative;  width:60vw">
 	<canvas id="{{ graph.id }}">Your browser does not support the canvas element.</canvas>
@@ -146,7 +146,7 @@
 <script>
 document.onreadystatechange = function () {
   if (document.readyState === 'interactive') {
-    $.getScript("static/js/history.js");
+    $.getScript("src/templates/default/static/js/history.js");
   }
 }
 </script>
\ No newline at end of file