Changed layout to have directories beside the main input/options column

This commit is contained in:
Conner Harkness 2025-09-03 13:30:57 -06:00
parent 8170ab2855
commit 8eae00253c

View File

@ -245,8 +245,6 @@
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="mb-3"> <div class="mb-3">
<label>Choose Query</label> <label>Choose Query</label>
<div class="input-group"> <div class="input-group">
@ -264,62 +262,53 @@
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
</div> </div>
</div>
</div>
<?php if ($intAllowed == 1): ?> <?php if ($intAllowed == 1): ?>
<?php foreach (["description"] as $strClass): ?>
<?php if (array_key_exists($strClass, $varOptions)): ?>
<?php foreach (["description"] as $strClass): ?>
<?php if (array_key_exists($strClass, $varOptions)): ?>
<div class="row">
<div class="col-md-6">
<div class="mb-3"> <div class="mb-3">
<?= $varOptions[$strClass]; ?> <?= $varOptions[$strClass]; ?>
</div> </div>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
<?php foreach (["danger", "warning", "info"] as $strClass): ?> <?php endif; ?>
<?php if (array_key_exists($strClass, $varOptions)): ?> <?php endforeach; ?>
<div class="row">
<div class="col-md-6"> <?php foreach (["danger", "warning", "info"] as $strClass): ?>
<?php if (array_key_exists($strClass, $varOptions)): ?>
<div class="alert alert-<?= $strClass; ?>"> <div class="alert alert-<?= $strClass; ?>">
<strong><?= ucfirst($strClass); ?>:</strong> <?= $varOptions[$strClass]; ?> <strong><?= ucfirst($strClass); ?>:</strong> <?= $varOptions[$strClass]; ?>
</div> </div>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
<form method="get"> <?php endif; ?>
<?php if (count($varInputs[0]) > 0): ?> <?php endforeach; ?>
<?php for ($i = 0; $i < count($varInputs[0]); $i++): ?>
<?php
$strInputName = $varInputs[1][$i];
$strInputType = $varInputs[2][$i];
$strInputTypeHTML = "text"; <form method="get">
<?php if (count($varInputs[0]) > 0): ?>
<?php for ($i = 0; $i < count($varInputs[0]); $i++): ?>
<?php
$strInputName = $varInputs[1][$i];
$strInputType = $varInputs[2][$i];
if ($strInputType == "datetime") $strInputTypeHTML = "text";
$strInputTypeHTML = "date";
$strInputDefaultValue = ""; if ($strInputType == "datetime")
if (strtolower($varInputs[4][$i]) == "default") $strInputTypeHTML = "date";
if (strlen($varInputs[5][$i]) > 0)
$strInputDefaultValue = $varInputs[5][$i];
$varOptions = []; $strInputDefaultValue = "";
if (strtolower($varInputs[4][$i]) == "options") if (strtolower($varInputs[4][$i]) == "default")
{ if (strlen($varInputs[5][$i]) > 0)
$strOptionsList = $varInputs[5][$i]; $strInputDefaultValue = $varInputs[5][$i];
$varOptions = explode(",", $strOptionsList);
} $varOptions = [];
?> if (strtolower($varInputs[4][$i]) == "options")
{
$strOptionsList = $varInputs[5][$i];
$varOptions = explode(",", $strOptionsList);
}
?>
<div class="row">
<div class="col-md-6">
<div class="mb-3"> <div class="mb-3">
<label><?= $strInputName; ?> <code><?= $strInputType; ?></code></label> <label><?= $strInputName; ?> <code><?= $strInputType; ?></code></label>
@ -350,64 +339,46 @@
</select> </select>
</div> </div>
<?php else: ?> <?php else: ?>
<div class="input-group"> <div class="input-group">
<span class="input-group-text"><i class="fa fa-fw fa-at"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-at"></i></span>
<input type="<?= $strInputTypeHTML; ?>" class="form-control" name="<?= $strInputName; ?>" value="<?= Request::getParam($strInputName) ?? $strInputDefaultValue; ?>" /> <input type="<?= $strInputTypeHTML; ?>" class="form-control" name="<?= $strInputName; ?>" value="<?= Request::getParam($strInputName) ?? $strInputDefaultValue; ?>" />
</div> </div>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> <?php endfor; ?>
</div> <?php endif; ?>
<?php endfor; ?>
<?php endif; ?>
<div class="row">
<div class="col-md-6">
<div class="mb-3"> <div class="mb-3">
<label>Actions</label> <label>Actions</label>
<div> <div>
<a class="btn btn-primary" onclick="fnSubmit(this);"><i class="fa fa-fw fa-server me-1"></i> Execute</a> <a class="btn btn-primary" onclick="fnSubmit(this);"><i class="fa fa-fw fa-server me-1"></i> Execute</a>
</div> </div>
</div> </div>
</div>
</div>
<input type="hidden" name="run" value="1" /> <input type="hidden" name="run" value="1" />
</form> </form>
<?php else: ?> <?php else: ?>
<div class="row">
<div class="col-md-6">
<div class="text-danger mb-3"> <div class="text-danger mb-3">
The selected report requires being logged in as a user with permission to run it. The selected report requires being logged in as a user with permission to run it.
</div> </div>
</div> <?php endif; ?>
</div> </div>
<?php endif; ?> <?php
$varDirectories = [];
<?php foreach ($varFiles as $f)
$varDirectories = []; {
preg_match("/^(.*\/)[^\/]/", $f, $varMatches);
$strDirectory = $varMatches[1];
foreach ($varFiles as $f) if (strlen($strDirectory) > 0)
{ $varDirectories[$strDirectory] = 1;
preg_match("/^(.*\/)[^\/]/", $f, $varMatches); }
$strDirectory = $varMatches[1]; ?>
if (strlen($strDirectory) > 0)
$varDirectories[$strDirectory] = 1;
}
//Respond::json($varDirectoryKeys);
?>
<div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="mb-3"> <div class="mb-3">
<label>Directories</label> <label>Directories</label>
@ -425,8 +396,8 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
@ -467,7 +438,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-sm table-striped table-bordered w-100" id="table"> <table class="table table-sm table-striped table-bordered w-100" id="table">
<thead> <thead class="sticky-top">
<tr> <tr>
<?php foreach ($varColumns as $col): ?> <?php foreach ($varColumns as $col): ?>
<?php <?php