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

6
Layout/default/Device/Index.php
View File

@@ -4,7 +4,7 @@ $pagination_baseurl_params = ["filter" => $filter];
$pagination_entity_name = "Device";
?>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php"); ?>
<link href="<?= self::getResourcePath() ?>assets/css/datatables-std.css" rel="stylesheet" type="text/css"/>
<link href="<?=self::getResourcePath()?>assets/css/datatables-std.css" rel="stylesheet" type="text/css" />
<style>
</style>
@@ -129,13 +129,13 @@ $pagination_entity_name = "Device";
<script type="text/javascript">
var hidesearch = [9];
var hidesearch=[9];
$(document).ready(function () {
});
</script>
<script type="text/javascript" src="<?= self::getResourcePath() ?>assets/js/datatables-std.js"></script>
<script type="text/javascript" src="<?=self::getResourcePath()?>assets/js/datatables-std.js"></script>
<?php include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/footer.php"); ?>