Merge branch 'spidev' into 'master'

Pop Erweiterung auf Adressen

See merge request fronk/thetool!2099
This commit is contained in:
Daniel Spitzer
2026-02-20 10:37:02 +00:00
7 changed files with 208 additions and 10 deletions

View File

@@ -70,6 +70,15 @@ if (!empty(trim($pops->vlan_ipv6)))
<th>Kategorie</th>
<td><?= $categoryArray[$pops->category]['name']." (".$categoryArray[$pops->category]['comment'].")" ?> </td>
</tr>
<tr>
<th>Adresse</th>
<td>
<a title="Google-Maps: <?= $pops->street ?> <?= $pops->number ?>, <?= $pops->zip ?> <?= $pops->city ?>"
class="mapsLink"
href="http://maps.google.com/?q=<?= urlencode($pops->street . " " . $pops->number . ", " . $pops->zip . " " . $pops->city) ?>"
target="_blank"><?= $pops->street ?> <?= $pops->number ?>, <?= $pops->zip ?> <?= $pops->city ?></a>
</td>
</tr>
<tr>
<th>Standort</th>
<td>

View File

@@ -112,11 +112,60 @@ if (isset($_GET['returnto']) && $_GET['returnto'] == "pop-detail") {
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="location">Standortinfo</label>
<div class="col-lg-10">
<textarea id="note" class="form-control" name="location"
<textarea id="location" class="form-control" name="location"
rows="5"><?= $pop->location ?></textarea>
</div>
</div>
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="zip">Adresse</label>
<div class="col-lg-1">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">PLZ</span>
</div>
<input type="text" class="form-control" name="zip" id="zip"
value="<?= $pop->zip ?>">
</div>
</div>
<div class="col-lg-4">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Ort</span>
</div>
<input type="text" class="form-control" name="city" id="city"
value="<?= $pop->city ?>">
</div>
</div>
</div>
<div class="form-group row">
<!-- <label class="col-lg-2 col-form-label" for="street">Straße</label>-->
<!-- <div class="col-lg-3">-->
<!-- <input type="text" class="form-control" name="street" id="street"-->
<!-- value="--><?php //= $pop->street ?><!--">-->
<!-- </div>-->
<label class="col-lg-2 col-form-label" for=""></label>
<div class="col-lg-4">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Straße</span>
</div>
<input type="text" class="form-control" name="street" id="street"
value="<?= $pop->street ?>">
</div>
</div>
<div class="col-lg-1">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Nr.</span>
</div>
<input type="text" class="form-control" name="number" id="number"
value="<?= $pop->number ?>">
</div>
</div>
</div>
</div>
</div>