From 48261a1187e6694acd535cc7dbc883f7f51590d8 Mon Sep 17 00:00:00 2001
From: Danielle Mayabb <danielle@igalia.com>
Date: Mon, 31 Jul 2023 12:57:07 -0700
Subject: [PATCH] Move images, svgs, favicons to assets folder

Eventually all assets will live within `frontend`, but this cleans up the projects a little until that time.
---
 .../android-chrome-192x192.png                | Bin
 .../android-chrome-512x512.png                | Bin
 .../apple-touch-icon.png                      | Bin
 .../application-icon.svg                      |   0
 favicon-16x16.png => assets/favicon-16x16.png | Bin
 favicon-32x32.png => assets/favicon-32x32.png | Bin
 favicon.ico => assets/favicon.ico             | Bin
 .../mstile-144x144.png                        | Bin
 .../mstile-150x150.png                        | Bin
 .../mstile-310x150.png                        | Bin
 .../mstile-310x310.png                        | Bin
 mstile-70x70.png => assets/mstile-70x70.png   | Bin
 .../safari-pinned-tab.svg                     |   0
 browserconfig.xml                             |   4 +-
 site.webmanifest                              |  32 +++----
 web/include/header.php                        |  79 +++++++++---------
 16 files changed, 59 insertions(+), 56 deletions(-)
 rename android-chrome-192x192.png => assets/android-chrome-192x192.png (100%)
 rename android-chrome-512x512.png => assets/android-chrome-512x512.png (100%)
 rename apple-touch-icon.png => assets/apple-touch-icon.png (100%)
 rename application-icon.svg => assets/application-icon.svg (100%)
 rename favicon-16x16.png => assets/favicon-16x16.png (100%)
 rename favicon-32x32.png => assets/favicon-32x32.png (100%)
 rename favicon.ico => assets/favicon.ico (100%)
 rename mstile-144x144.png => assets/mstile-144x144.png (100%)
 rename mstile-150x150.png => assets/mstile-150x150.png (100%)
 rename mstile-310x150.png => assets/mstile-310x150.png (100%)
 rename mstile-310x310.png => assets/mstile-310x310.png (100%)
 rename mstile-70x70.png => assets/mstile-70x70.png (100%)
 rename safari-pinned-tab.svg => assets/safari-pinned-tab.svg (100%)

diff --git a/android-chrome-192x192.png b/assets/android-chrome-192x192.png
similarity index 100%
rename from android-chrome-192x192.png
rename to assets/android-chrome-192x192.png
diff --git a/android-chrome-512x512.png b/assets/android-chrome-512x512.png
similarity index 100%
rename from android-chrome-512x512.png
rename to assets/android-chrome-512x512.png
diff --git a/apple-touch-icon.png b/assets/apple-touch-icon.png
similarity index 100%
rename from apple-touch-icon.png
rename to assets/apple-touch-icon.png
diff --git a/application-icon.svg b/assets/application-icon.svg
similarity index 100%
rename from application-icon.svg
rename to assets/application-icon.svg
diff --git a/favicon-16x16.png b/assets/favicon-16x16.png
similarity index 100%
rename from favicon-16x16.png
rename to assets/favicon-16x16.png
diff --git a/favicon-32x32.png b/assets/favicon-32x32.png
similarity index 100%
rename from favicon-32x32.png
rename to assets/favicon-32x32.png
diff --git a/favicon.ico b/assets/favicon.ico
similarity index 100%
rename from favicon.ico
rename to assets/favicon.ico
diff --git a/mstile-144x144.png b/assets/mstile-144x144.png
similarity index 100%
rename from mstile-144x144.png
rename to assets/mstile-144x144.png
diff --git a/mstile-150x150.png b/assets/mstile-150x150.png
similarity index 100%
rename from mstile-150x150.png
rename to assets/mstile-150x150.png
diff --git a/mstile-310x150.png b/assets/mstile-310x150.png
similarity index 100%
rename from mstile-310x150.png
rename to assets/mstile-310x150.png
diff --git a/mstile-310x310.png b/assets/mstile-310x310.png
similarity index 100%
rename from mstile-310x310.png
rename to assets/mstile-310x310.png
diff --git a/mstile-70x70.png b/assets/mstile-70x70.png
similarity index 100%
rename from mstile-70x70.png
rename to assets/mstile-70x70.png
diff --git a/safari-pinned-tab.svg b/assets/safari-pinned-tab.svg
similarity index 100%
rename from safari-pinned-tab.svg
rename to assets/safari-pinned-tab.svg
diff --git a/browserconfig.xml b/browserconfig.xml
index dd90c8cbe..d70c54e35 100644
--- a/browserconfig.xml
+++ b/browserconfig.xml
@@ -2,8 +2,8 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/assets/mstile-150x150.png" />
             <TileColor>#dadada</TileColor>
         </tile>
     </msapplication>
-</browserconfig>
+</browserconfig>
\ No newline at end of file
diff --git a/site.webmanifest b/site.webmanifest
index eb38cc380..9bc1cf7e6 100644
--- a/site.webmanifest
+++ b/site.webmanifest
@@ -1,18 +1,18 @@
 {
-    "name": "PhpReport",
-    "short_name": "PhpReport",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#dadada",
-    "background_color": "#dadada"
+  "name": "PhpReport",
+  "short_name": "PhpReport",
+  "icons": [
+    {
+      "src": "/assets/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/assets/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "theme_color": "#dadada",
+  "background_color": "#dadada"
 }
diff --git a/web/include/header.php b/web/include/header.php
index bee47dbc7..29fd6e428 100644
--- a/web/include/header.php
+++ b/web/include/header.php
@@ -18,60 +18,63 @@
  * along with PhpReport.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-  header('Content-Type: text/html; charset=UTF-8');
+header('Content-Type: text/html; charset=UTF-8');
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
-    <meta charset="UTF-8">
+  <meta charset="UTF-8">
 
-    <title><?php echo PAGE_TITLE; ?></title>
+  <title>
+    <?php echo PAGE_TITLE; ?>
+  </title>
 
-    <!-- Include PhpReport stylesheet -->
-    <link rel="stylesheet" type="text/css" href="include/phpreport.css">
+  <!-- Include PhpReport stylesheet -->
+  <link rel="stylesheet" type="text/css" href="include/phpreport.css">
 
-    <!-- Include Ext stylesheet -->
-    <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.min.css">
-    <link rel="stylesheet" type="text/css" href="include/silk.css" />
-    <link rel="stylesheet" type="text/css" href="include/tools.css" />
-    <link rel="stylesheet" type="text/css" href="ext/examples/ux/css/ux-all.css"/>
+  <!-- Include Ext stylesheet -->
+  <link rel="stylesheet" type="text/css" href="ext/resources/css/ext-all.min.css">
+  <link rel="stylesheet" type="text/css" href="include/silk.css" />
+  <link rel="stylesheet" type="text/css" href="include/tools.css" />
+  <link rel="stylesheet" type="text/css" href="ext/examples/ux/css/ux-all.css" />
 
-    <!-- Include DatePickerPlus stylesheet -->
-    <link rel="stylesheet" type="text/css" href="include/ext.ux.datepickerplus/datepickerplus.css"/>
+  <!-- Include DatePickerPlus stylesheet -->
+  <link rel="stylesheet" type="text/css" href="include/ext.ux.datepickerplus/datepickerplus.css" />
 
-    <!-- Include Ext library -->
-    <script src="ext/adapter/ext/base.js"></script>
-    <script src="ext/ext.js"></script>
-    <script src="include/App.js"></script>
+  <!-- Include Ext library -->
+  <script src="ext/adapter/ext/base.js"></script>
+  <script src="ext/ext.js"></script>
+  <script src="include/App.js"></script>
 
-    <!-- Configure prototypes -->
-    <script>
-      Ext.DatePicker.prototype.startDay = 1;
-    </script>
+  <!-- Configure prototypes -->
+  <script>
+    Ext.DatePicker.prototype.startDay = 1;
+  </script>
 
-    <!-- Include other common validations -->
-    <script src="include/validations.js"></script>
+  <!-- Include other common validations -->
+  <script src="include/validations.js"></script>
 
-    <!-- Include improved calendar widget -->
-    <script src="include/ext.ux.datepickerplus/ext.ux.datepickerplus.js"></script>
+  <!-- Include improved calendar widget -->
+  <script src="include/ext.ux.datepickerplus/ext.ux.datepickerplus.js"></script>
 
-    <!-- Periodical check for open sessions -->
-    <script src="js/include/sessionTracker.js"></script>
+  <!-- Periodical check for open sessions -->
+  <script src="js/include/sessionTracker.js"></script>
 
-    <!-- Favicon / shortcut icon configuration -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
-    <link rel="manifest" href="/site.webmanifest">
-    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
-    <meta name="msapplication-TileColor" content="#dadada">
-    <meta name="theme-color" content="#dadada">
+  <!-- Favicon / shortcut icon configuration -->
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/assets/favicon-16x16.png">
+  <link rel="manifest" href="/site.webmanifest">
+  <link rel="mask-icon" href="/assets/safari-pinned-tab.svg" color="#5bbad5">
+  <meta name="msapplication-TileColor" content="#dadada">
+  <meta name="theme-color" content="#dadada">
 
 </head>
 
 <body>
 
-    <?php include("include/menubar.php"); ?>
-    <script>
-        var HEADER_HEIGHT = document.getElementById('menubar').scrollHeight;
-    </script>
+  <?php include("include/menubar.php"); ?>
+  <script>
+    var HEADER_HEIGHT = document.getElementById('menubar').scrollHeight;
+  </script>
\ No newline at end of file