From 0bde9ef7c993b9940b5e4dcd19e9358a55940232 Mon Sep 17 00:00:00 2001
From: Dillard Blom <dillard.blom@ensembia.com>
Date: Mon, 13 Jul 2026 16:13:09 +0200
Subject: [PATCH] Move filename/style options after the type-specific content
 fields

qrcode_options.php (foreground/background, style presets, frame text,
filename/format/owner) was included at the top of every static QR type
form, ahead of the actual content fields (address, phone number, vCard
name, etc). Moved it to just before the submit button across all 16
static form templates, so the fields you actually came to fill in are
first and the shared styling/filename options come after.
---
 src/forms/static/2fa.php       | 2 +-
 src/forms/static/applink.php   | 2 +-
 src/forms/static/bitcoin.php   | 2 +-
 src/forms/static/bluetooth.php | 2 +-
 src/forms/static/bookmark.php  | 2 +-
 src/forms/static/email.php     | 2 +-
 src/forms/static/event.php     | 2 +-
 src/forms/static/location.php  | 2 +-
 src/forms/static/paypal.php    | 2 +-
 src/forms/static/phone.php     | 2 +-
 src/forms/static/skype.php     | 2 +-
 src/forms/static/sms.php       | 2 +-
 src/forms/static/text.php      | 2 +-
 src/forms/static/vcard.php     | 2 +-
 src/forms/static/whatsapp.php  | 2 +-
 src/forms/static/wifi.php      | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/forms/static/2fa.php b/src/forms/static/2fa.php
index 907b993..28b2ca6 100644
--- a/src/forms/static/2fa.php
+++ b/src/forms/static/2fa.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=2fa" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -38,6 +37,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/applink.php b/src/forms/static/applink.php
index c939515..1ea1883 100644
--- a/src/forms/static/applink.php
+++ b/src/forms/static/applink.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=applink" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -62,6 +61,7 @@
     })();
 </script>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/bitcoin.php b/src/forms/static/bitcoin.php
index 8d5d3e7..cd3a408 100644
--- a/src/forms/static/bitcoin.php
+++ b/src/forms/static/bitcoin.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=bitcoin" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
  <!-- Input forms -->   
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -47,6 +46,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/bluetooth.php b/src/forms/static/bluetooth.php
index a2368a7..15ebd07 100644
--- a/src/forms/static/bluetooth.php
+++ b/src/forms/static/bluetooth.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=bluetooth" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <small class="form-text text-muted mb-2">
@@ -26,6 +25,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/bookmark.php b/src/forms/static/bookmark.php
index 97aba8c..6ea1318 100644
--- a/src/forms/static/bookmark.php
+++ b/src/forms/static/bookmark.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=bookmark" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -20,6 +19,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/email.php b/src/forms/static/email.php
index d1ab83e..0bcefe4 100644
--- a/src/forms/static/email.php
+++ b/src/forms/static/email.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=email" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -28,6 +27,7 @@
         </div>
     </div>
     
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/event.php b/src/forms/static/event.php
index 1a92159..c41229b 100644
--- a/src/forms/static/event.php
+++ b/src/forms/static/event.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=event" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-4">
 	<div class="form-group">
@@ -72,6 +71,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/location.php b/src/forms/static/location.php
index 788c95c..3cecee1 100644
--- a/src/forms/static/location.php
+++ b/src/forms/static/location.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=location" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
     <div class="col-sm-8">
         <div class="form-group" style="position: relative;">
@@ -30,6 +29,7 @@
         </div>
     </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
     <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/paypal.php b/src/forms/static/paypal.php
index f709937..2baa7e0 100644
--- a/src/forms/static/paypal.php
+++ b/src/forms/static/paypal.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=paypal" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -100,6 +99,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/phone.php b/src/forms/static/phone.php
index cd7b957..0336536 100644
--- a/src/forms/static/phone.php
+++ b/src/forms/static/phone.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=phone" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -23,6 +22,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/skype.php b/src/forms/static/skype.php
index 3be9b3c..29758b5 100644
--- a/src/forms/static/skype.php
+++ b/src/forms/static/skype.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=skype" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
     <div class="col-sm-4">
         <div class="form-group">
@@ -9,6 +8,7 @@
         </div>
     </div>
     
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/sms.php b/src/forms/static/sms.php
index b060a46..f90a02e 100644
--- a/src/forms/static/sms.php
+++ b/src/forms/static/sms.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=sms" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -30,6 +29,7 @@
         </div>
     </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/text.php b/src/forms/static/text.php
index 2942e23..78c2c4f 100644
--- a/src/forms/static/text.php
+++ b/src/forms/static/text.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=text" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
     <div class="col-sm-6">
         <div class="form-group">
@@ -9,6 +8,7 @@
         </div>
     </div>
     
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
     <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/vcard.php b/src/forms/static/vcard.php
index 6a042b0..97867c2 100644
--- a/src/forms/static/vcard.php
+++ b/src/forms/static/vcard.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=vcard" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <!-- First row -->
 <div class="col-sm-12 mb-2">
@@ -149,6 +148,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/whatsapp.php b/src/forms/static/whatsapp.php
index 255ce98..b91efa5 100644
--- a/src/forms/static/whatsapp.php
+++ b/src/forms/static/whatsapp.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=whatsapp" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -30,6 +29,7 @@
         </div>
     </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">
diff --git a/src/forms/static/wifi.php b/src/forms/static/wifi.php
index 8c3c49d..553307a 100644
--- a/src/forms/static/wifi.php
+++ b/src/forms/static/wifi.php
@@ -1,6 +1,5 @@
 <form class="form" action="static_qrcode.php?type=wifi" method="post" id="static_form" enctype="multipart/form-data">
 <?php echo csrf_field(); ?>
-    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <!-- Input forms -->
 <div class="col-sm-12 mb-2">
     <div class="row">
@@ -33,6 +32,7 @@
     </div>
 </div>
 
+    <?php include BASE_PATH.'/forms/qrcode_options.php'; ?>
 <div class="col-sm-12 mb-2">
     <div class="row">
         <div class="col-6 col-md-3">