Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'devbyspi'

Browse Source 
# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css
This commit is contained in:
Frank Schubert
2023-03-22 14:36:13 +00:00
parent 0ce064b56b 61e84f085d
commit 95a452bba7
99 changed files with 60682 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Layout/default/Device/Detail.php
View File

@@ -25,8 +25,7 @@
<li class="breadcrumb-item active">Device Detail</li>
</ol>
</div>
<h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span>
<span class="ml-2">
<h4 class="page-title">Device: <span class="font-weight-normal ml-1"><?= $devices->data->name ?></span> <span class="ml-2">
<a href="<?= self::getUrl("Device", "edit", ["id" => $devices->id, 'returnto' => "device-detail"]) ?>">
<button class="btn btn-primary">Bearbeiten</button>
</a>