add and use mainFooter template

Change-Id: I08f6ffffcfb3914dda11fa77ed3ad528abab0c86
derrick-wong · Jun 15, 2023 · ae734e8 · ae734e8
1 parent cb7b2fc
commit ae734e8
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 70 deletions.
diff --git a/chromacapture.php b/chromacapture.php
@@ -130,15 +130,13 @@ class="<?php echo $config['preview']['flip']; ?> <?php echo $config['preview']['
         <script type="text/javascript">
             onCaptureChromaView = true;
         </script>
-        <script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-        <script type="text/javascript" src="api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-        <script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
+
+        <?php include('template/components/mainFooter.php'); ?>
+
         <script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe.umd.min.js"></script>
         <script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe-lightbox.umd.min.js"></script>
-        <script type="text/javascript" src="resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
         <script type="text/javascript" src="resources/js/remotebuzzer_client.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
         <script type="text/javascript" src="resources/js/photoswipe.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-        <script type="text/javascript" src="resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
         <script type="text/javascript" src="resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
         <script type="text/javascript" src="resources/js/core.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
         <?php if ($config['keying']['variant'] === 'marvinj'): ?>
@@ -148,8 +146,6 @@ class="<?php echo $config['preview']['flip']; ?> <?php echo $config['preview']['
             <script type="text/javascript" src="vendor/Seriously/effects/seriously.chroma.js"></script>
         <?php endif; ?>
         <script type="text/javascript" src="resources/js/chromakeying.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-        <script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-        <script type="text/javascript" src="resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
         <?php require_once('lib/services_start.php'); ?>
     </div>

diff --git a/chromakeying.php b/chromakeying.php
@@ -83,21 +83,17 @@
 			<div class="modal__body" id="save_mesg_text"><span data-i18n="saving"></span></div>
 		</div>
 	</div>
-	<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-	<script type="text/javascript" src="api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
+
+    <?php include('template/components/mainFooter.php'); ?>
+
 	<?php if ($config['keying']['variant'] === 'marvinj'): ?>
 	<script type="text/javascript" src="node_modules/marvinj/marvinj/release/marvinj-1.0.js"></script>
 	<?php else:?>
 	<script type="text/javascript" src="vendor/Seriously/seriously.js"></script>
 	<script type="text/javascript" src="vendor/Seriously/effects/seriously.chroma.js"></script>
 	<?php endif; ?>
-	<script type="text/javascript" src="resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/remotebuzzer_client.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/chromakeying.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-	<script type="text/javascript" src="resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
 	<?php require_once('lib/services_start.php'); ?>
 </body>

diff --git a/gallery.php b/gallery.php
@@ -67,27 +67,21 @@
 		</div>
 	</div>
 
-	<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-	<script type="text/javascript" src="api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="resources/js/adminshortcut.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe.umd.min.js"></script>
-	<script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe-lightbox.umd.min.js"></script>
 	<script type="text/javascript">
 		onStandaloneGalleryView = true;
 	</script>
-	<script type="text/javascript" src="resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <?php include('template/components/mainFooter.php'); ?>
+	<script type="text/javascript" src="resources/js/adminshortcut.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+	<script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe.umd.min.js"></script>
+	<script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe-lightbox.umd.min.js"></script>
 	<script type="text/javascript" src="resources/js/remotebuzzer_client.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/photoswipe.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/core.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="resources/js/gallery.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<?php if ($config['gallery']['db_check_enabled']): ?>
 	<script type="text/javascript" src="resources/js/gallery_updatecheck.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<?php endif; ?>
-	<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-	<script type="text/javascript" src="resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
 	<?php require_once('lib/services_start.php'); ?>
 </body>

diff --git a/index.php b/index.php
@@ -219,20 +219,15 @@ class="filter <?php if ($config['filters']['defaults'] === $filter) echo 'active
     </div>
 </div>
 
-<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-<script type="text/javascript" src="api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
+<?php include('template/components/mainFooter.php'); ?>
+
 <script type="text/javascript" src="resources/js/adminshortcut.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
+<script type="text/javascript" src="resources/js/remotebuzzer_client.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 <script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe.umd.min.js"></script>
 <script type="text/javascript" src="node_modules/photoswipe/dist/umd/photoswipe-lightbox.umd.min.js"></script>
-<script type="text/javascript" src="resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="resources/js/remotebuzzer_client.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 <script type="text/javascript" src="resources/js/photoswipe.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 <script type="text/javascript" src="resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 <script type="text/javascript" src="resources/js/core.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-<script type="text/javascript" src="resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
 <?php require_once('lib/services_start.php'); ?>
 </body>

diff --git a/slideshow/index.php b/slideshow/index.php
@@ -51,15 +51,12 @@
 </div>
 	</div>
 
-	<script src="../node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-	<script type="text/javascript" src="../api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
+
+
+    <?php include('../template/components/mainFooter.php'); ?>
+
 	<script type="text/javascript" src="../node_modules/photoswipe/dist/umd/photoswipe.umd.min.js"></script>
 	<script type="text/javascript" src="../node_modules/photoswipe/dist/umd/photoswipe-lightbox.umd.min.js"></script>
-	<script type="text/javascript" src="../resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 	<script type="text/javascript" src="../resources/js/slideshow.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="../resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script src="../node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-	<script type="text/javascript" src="../resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 </body>
 </html>
diff --git a/template/components/mainFooter.php b/template/components/mainFooter.php
@@ -0,0 +1,11 @@
+<?php
+
+echo '<script src="' . $fileRoot . 'node_modules/whatwg-fetch/dist/fetch.umd.js"></script>' . "\n";
+echo '<script type="text/javascript" src="' . $fileRoot . 'api/config.php?v=' . $config['photobooth']['version'] . '"></script>' . "\n";
+echo '<script type="text/javascript" src="' . $fileRoot . 'node_modules/jquery/dist/jquery.min.js"></script>' . "\n";
+echo '<script type="text/javascript" src="' . $fileRoot . 'resources/js/tools.js?v=' . $config['photobooth']['version'] . '"></script>' . "\n";
+echo '<script type="text/javascript" src="' . $fileRoot . 'resources/js/theme.js?v=' . $config['photobooth']['version'] . '"></script>' . "\n";
+echo '<script src="' . $fileRoot . 'node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>' . "\n";
+echo '<script type="text/javascript" src="' . $fileRoot . 'resources/js/i18n.js?v=' . $config['photobooth']['version'] . '"></script>' . "\n";
+
+?>
diff --git a/test/chroma.php b/test/chroma.php
@@ -46,16 +46,11 @@
         </div>
     </div>
 
-<script src="../node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-<script type="text/javascript" src="../api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
-<script type="text/javascript" src="../resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/test_preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/test_chroma.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script src="../node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-<script type="text/javascript" src="../resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <?php include('../template/components/mainFooter.php'); ?>
+
+    <script type="text/javascript" src="../resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <script type="text/javascript" src="../resources/js/test_preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <script type="text/javascript" src="../resources/js/test_chroma.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
 </body>
 </html>
diff --git a/test/preview.php b/test/preview.php
@@ -42,15 +42,10 @@
         </div>
     </div>
 
-<script src="../node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-<script type="text/javascript" src="../api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../node_modules/jquery/dist/jquery.min.js"></script>
-<script type="text/javascript" src="../resources/js/tools.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script type="text/javascript" src="../resources/js/test_preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
-<script src="../node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-<script type="text/javascript" src="../resources/js/i18n.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <?php include('../template/components/mainFooter.php'); ?>
+
+    <script type="text/javascript" src="../resources/js/preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <script type="text/javascript" src="../resources/js/test_preview.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
 
 </body>
 </html>
diff --git a/trigger.php b/trigger.php
@@ -4,7 +4,7 @@
 $btnClass = 'btn btn--' . $config['ui']['button'];
 $btnShape = 'shape--' . $config['ui']['button'];
 $uiShape = 'shape--' . $config['ui']['style'];
-
+$fileRoot = '';
 ?>
 <!DOCTYPE html>
 <html>
@@ -83,12 +83,6 @@
 		</div>
 	</div>
 
-	<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-	<script type="text/javascript" src="api/config.php"></script>
-	<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
-	<script type="text/javascript" src="resources/js/tools.js"></script>
-	<script type="text/javascript" src="resources/js/theme.js"></script>
-	<script src="node_modules/@andreasremdt/simple-translator/dist/umd/translator.min.js"></script>
-	<script type="text/javascript" src="resources/js/i18n.js"></script>
+    <?php include('template/components/mainFooter.php'); ?>
 </body>
 </html>
diff --git a/welcome/index.php b/welcome/index.php
@@ -111,9 +111,6 @@
 	</div>
 
 
-	<script src="node_modules/whatwg-fetch/dist/fetch.umd.js"></script>
-	<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
-	<script type="text/javascript" src="api/config.php?v=<?php echo $config['photobooth']['version']; ?>"></script>
-	<script type="text/javascript" src="resources/js/theme.js?v=<?php echo $config['photobooth']['version']; ?>"></script>
+    <?php include('template/components/mainFooter.php'); ?>
 </body>
 </html>