Skip to content

Commit

Permalink
Move images, svgs, favicons to assets folder
Browse files Browse the repository at this point in the history
Eventually all assets will live within `frontend`, but this cleans up the projects a little until that time.
  • Loading branch information
dmtrek14 committed Aug 1, 2023
1 parent c07dda7 commit 48261a1
Show file tree
Hide file tree
Showing 16 changed files with 59 additions and 56 deletions.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
32 changes: 16 additions & 16 deletions site.webmanifest
Original file line number Diff line number Diff line change
@@ -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"
}
79 changes: 41 additions & 38 deletions web/include/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 48261a1

Please sign in to comment.