Ensembia/QRForge-selfhosted
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fase 3 feedback round 4: group filename with owner in the qr forms

Browse Source 
Filename now sits in the same row as Owner instead of the crowded
top row shared with format/frame text/frame font/frame font size/icon.
Freeing that column lets those fields shift left and use the space
better. Applied to both the shared static-form partial
(qrcode_options.php) and the dynamic-form's separate copy of the same
fields (form_dynamic_add.php) - the two have diverged since Fase 3 and
don't share markup. Edit forms (form_static_edit.php/form_dynamic_edit.php)
already had filename/owner side by side, no change needed there.
This commit is contained in:
Dillard Blom
2026-07-11 02:40:22 +02:00
parent 89bf472867
commit a8f55506c8
2 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/forms/form_dynamic_add.php
+13 -14
View File
@@ -117,15 +117,7 @@
</div> </div>
<div class="col-sm-12 mb-2"> <div class="col-sm-12 mb-2">
<div class="row"> <div class="row">
<div class="col-sm-4">
<div class="form-group">
<label for="filename">Filename *</label>
<input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
</div>
</div>
<div class="col-6 col-md-1"> <div class="col-6 col-md-1">
<label for="format">Format *</label> <label for="format">Format *</label>
<select name="format" class="form-control" required="required"> <select name="format" class="form-control" required="required">
@@ -177,13 +169,20 @@
</div> </div>
</div> </div>
<?php if($_SESSION['type'] === 'super') { ?>
<div class="col-sm-12 mb-2"> <div class="col-sm-12 mb-2">
<div class="row"> <div class="row">
<div class="col-sm-4">
<div class="form-group">
<label for="filename">Filename *</label>
<input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
</div>
</div>
<?php if ($_SESSION['type'] === 'super') { ?>
<div class="col-sm-4"> <div class="col-sm-4">
<div class="form-group"> <div class="form-group">
<label for="id_owner">Owner *</label> <label for="id_owner">Owner *</label>
<select name="id_owner" class="form-control"> <select name="id_owner" id="id_owner" class="form-control">
<option value="">All (shared with every admin)</option> <option value="">All (shared with every admin)</option>
<?php <?php
@@ -199,9 +198,9 @@
</select> </select>
</div> </div>
</div> </div>
<?php } else { ?>
<input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
<?php } ?>
</div> </div>
</div> </div>
<?php } else { ?>
<input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
<?php } ?>
</fieldset> </fieldset>
src/forms/qrcode_options.php
+32 -33
View File
@@ -113,15 +113,7 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
--> -->
<div class="col-sm-12 mb-2"> <div class="col-sm-12 mb-2">
<div class="row"> <div class="row">
<div class="col-sm-4">
<div class="form-group">
<label for="filename">Filename *</label>
<input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id = "filename">
</div>
</div>
<div class="col-6 col-md-1"> <div class="col-6 col-md-1">
<label for="format">Format</label> <label for="format">Format</label>
<select name="format" class="form-control"> <select name="format" class="form-control">
@@ -178,31 +170,38 @@ if (QRCODE_GENERATOR === "internal-chillerlan.qrcode") {
</div> </div>
</div> </div>
<?php if($_SESSION['type'] === 'super') { ?> <div class="col-sm-12 mb-2">
<div class="col-sm-12 mb-2"> <div class="row">
<div class="row"> <div class="col-sm-4">
<div class="col-sm-4"> <div class="form-group">
<div class="form-group"> <label for="filename">Filename *</label>
<label for="id_owner">Owner *</label> <input type="text" name="filename" value="" placeholder="My first Qrcode" class="form-control error" required="required" id="filename">
<select name="id_owner" class="form-control">
<option value="">All (shared with every admin)</option>
<?php
require_once BASE_PATH . '/lib/Users/Users.php';
$users_instance = new Users();
$users = $users_instance->getAllUsers();
foreach ($users as $user) {
$is_self = (int) $user["id"] === (int) $_SESSION["user_id"];
?>
<option value="<?php echo $user["id"];?>" <?php echo $is_self ? 'selected' : ''; ?>><?php echo $user["username"];?></option>
<?php } ?>
</select>
</div>
</div> </div>
</div> </div>
<?php if ($_SESSION['type'] === 'super') { ?>
<div class="col-sm-4">
<div class="form-group">
<label for="id_owner">Owner *</label>
<select name="id_owner" id="id_owner" class="form-control">
<option value="">All (shared with every admin)</option>
<?php
require_once BASE_PATH . '/lib/Users/Users.php';
$users_instance = new Users();
$users = $users_instance->getAllUsers();
foreach ($users as $user) {
$is_self = (int) $user["id"] === (int) $_SESSION["user_id"];
?>
<option value="<?php echo $user["id"];?>" <?php echo $is_self ? 'selected' : ''; ?>><?php echo $user["username"];?></option>
<?php } ?>
</select>
</div>
</div>
<?php } else { ?>
<input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
<?php } ?>
</div> </div>
<?php } else { ?> </div>
<input type="hidden" name="id_owner" value="<?php echo $_SESSION["user_id"];?>"/>
<?php } ?>
<br> <br>