From 23b73a387bbc28ad0dca97b4862af0ca59751422 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Tue, 14 Feb 2023 13:48:28 +0100 Subject: [PATCH] Added improvements for empty database --- .gitignore | 2 + lang/de.php | 6 ++- lang/en.php | 5 ++ tpl/asset.tpl | 106 ++++++++++++++++++++-------------------- tpl/assetclass.tpl | 68 ++++++++++++++------------ tpl/assetclassgroup.tpl | 58 ++++++++++++---------- tpl/location.tpl | 56 +++++++++++---------- tpl/node.tpl | 80 ++++++++++++++++-------------- tpl/subnet.tpl | 80 ++++++++++++++++-------------- tpl/vlan.tpl | 80 ++++++++++++++++-------------- tpl/zone.tpl | 82 +++++++++++++++++-------------- 11 files changed, 338 insertions(+), 285 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c50d5e --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +tpl_c/*.php diff --git a/lang/de.php b/lang/de.php index c961b50..6912c11 100644 --- a/lang/de.php +++ b/lang/de.php @@ -88,6 +88,7 @@ $lang = array( 'lang_location_name' => 'Standortname', 'lang_location_parent' => 'Übergeordneter Standort', 'lang_sublocation_add' => 'Unterstandort hinzufügen', + 'lang_location_none' => 'Es sind keine Standorte vorhanden', 'lang_locationsubnet' => 'Standort/Subnetz', 'lang_locationsubnet_edit' => 'Standort/Subnetz bearbeiten', @@ -96,6 +97,7 @@ $lang = array( 'lang_node_del' => 'Knoten löschen', 'lang_node_edit' => 'Knoten ändern', 'lang_node_info' => 'Knoteninfo', + 'lang_node_none' => 'Es sind keine Knoten vorhanden', 'lang_dns1' => 'DNS-Name', 'lang_dns2' => 'DNS-Alias', 'lang_ip' => 'IP-Adresse', @@ -128,6 +130,7 @@ $lang = array( 'lang_subnet_dhcpstart' => 'DHCP Anfang', 'lang_subnet_dhcpend' => 'DHCP Ende', 'lang_subnet_ntp_server' => 'NTP-Server', + 'lang_subnet_none' => 'Es sind keine Subnetze vorhanden', 'lang_subnetlocation' => 'Subnetz/Ort', 'lang_subnetlocation_edit' => 'Subnetz/Ort bearbeiten', @@ -145,7 +148,7 @@ $lang = array( 'lang_zone_add' => 'Zone hinzufügen', 'lang_zone_del' => 'Zone löschen', 'lang_zone_edit' => 'Zone bearbeiten', - + 'lang_zone_none' => 'Es sind keine Zonen vorhanden', 'lang_vlan_add' => 'VLAN hinzufügen', 'lang_vlan_del' => 'VLAN löschen', @@ -154,6 +157,7 @@ $lang = array( 'lang_vlan_info' => 'VLAN Info', 'lang_vlan_new' => 'VLAN Info', 'lang_vlan_name' => 'VLAN Name', + 'lang_vlan_none' => 'Es sind keine VLANs vorhanden', 'lang_vlansubnet' => 'VLAN/Subnetz', 'lang_vlansubnet_edit' => 'VLAN/Subnetz bearbeiten', diff --git a/lang/en.php b/lang/en.php index 0c69ecc..05b50ce 100644 --- a/lang/en.php +++ b/lang/en.php @@ -88,6 +88,7 @@ $lang = array( 'lang_location_name' => 'Location name', 'lang_location_parent' => 'Parent', 'lang_sublocation_add' => 'Add Sub-location', + 'lang_location_none' => 'There are no locations defined', 'lang_locationsubnet' => 'Location/Subnet', 'lang_locationsubnet_edit' => 'Edit Location/Subnet', @@ -96,6 +97,7 @@ $lang = array( 'lang_node_del' => 'Delete node', 'lang_node_edit' => 'Modify node', 'lang_node_info' => 'Node info', + 'lang_node_none' => 'There are no nodes defined', 'lang_dns1' => 'DNS name', 'lang_dns2' => 'DNS Alias', 'lang_ip' => 'IP Address', @@ -128,6 +130,7 @@ $lang = array( 'lang_subnet_dhcpstart' => 'DHCP Start', 'lang_subnet_dhcpend' => 'DHCP End', 'lang_subnet_ntp_server' => 'NTP Server', + 'lang_subnet_none' => 'There are no subnets defined', 'lang_subnetlocation' => 'Subnet/Location', 'lang_subnetlocation_edit' => 'Edit Subnet/Location', @@ -144,6 +147,7 @@ $lang = array( 'lang_zone_add' => 'Add zone', 'lang_zone_del' => 'Delete zone', 'lang_zone_edit' => 'Mofidy zone', + 'lang_zone_none' => 'There are no zones defined', 'lang_vlan_add' => 'Add VLAN', 'lang_vlan_del' => 'Delete VLAN', @@ -152,6 +156,7 @@ $lang = array( 'lang_vlan_info' => 'VLAN info', 'lang_vlan_new' => 'VLAN info', 'lang_vlan_name' => 'VLAN name', + 'lang_vlan_none' => 'There are no VLANs defined', 'lang_user_language' => 'Language', 'lang_vlansubnet' => 'VLAN/Subnet', diff --git a/tpl/asset.tpl b/tpl/asset.tpl index 4be1b9e..da05d39 100644 --- a/tpl/asset.tpl +++ b/tpl/asset.tpl @@ -1,53 +1,53 @@ - - - - - -
- {$lang_assets} ({$assets|@count}) - - {$lang_asset_add} -
- - - -{foreach item=letter from=$alphabet} - -{/foreach} - -
- {$letter.asset_letter}  -
- - - - - - - -{foreach item=asset from=$assets} - - - - - -{foreachelse} - - - -{/foreach} -
- {$lang_asset_name} - - {$lang_assetclass_name} - - {$lang_asset_info} -
- {$asset.asset_name} - - {$asset.assetclass_name} - - {$asset.asset_info} -
- {$lang_asset_none} -
+ + + + + +
+ {$lang_assets} ({$assets|@count}) + + {$lang_asset_add} +
+ + + +{foreach item=letter from=$alphabet} + +{/foreach} + +
+ {$letter.asset_letter}  +
+ + + + + + + +{foreach item=asset from=$assets} + + + + + +{foreachelse} + + + +{/foreach} +
+ {$lang_asset_name} + + {$lang_assetclass_name} + + {$lang_asset_info} +
+ {$asset.asset_name} + + {$asset.assetclass_name} + + {$asset.asset_info} +
+ {$lang_asset_none} +
diff --git a/tpl/assetclass.tpl b/tpl/assetclass.tpl index e83da6c..d0eaa62 100644 --- a/tpl/assetclass.tpl +++ b/tpl/assetclass.tpl @@ -1,31 +1,37 @@ - - - - - -
- {$lang_assetclasses} ({$assetclasses|@count}) - - {$lang_assetclass_add} -
- - - - - - -{foreach item=assetclass from=$assetclasses} - - - - -{/foreach} -
- {$lang_assetclass} - - {$lang_assetclassgroup_name} -
- {$assetclass.assetclass_name} - - {$assetclass.assetclassgroup_name} -
+ + + + + +
+ {$lang_assetclasses} ({$assetclasses|@count}) + + {$lang_assetclass_add} +
+ + + + + + +{foreach item=assetclass from=$assetclasses} + + + + +{foreachelse} + + + +{/foreach} +
+ {$lang_assetclass} + + {$lang_assetclassgroup_name} +
+ {$assetclass.assetclass_name} + + {$assetclass.assetclassgroup_name} +
+ {$lang_assetclass_none} +
diff --git a/tpl/assetclassgroup.tpl b/tpl/assetclassgroup.tpl index 93bd932..f137c0e 100644 --- a/tpl/assetclassgroup.tpl +++ b/tpl/assetclassgroup.tpl @@ -1,26 +1,32 @@ - - - - - -
- {$lang_assetclassgroups} ({$assetclassgroups|@count}) - - {$lang_assetclassgroup_add} -
- - - - - -{foreach item=assetclassgroup from=$assetclassgroups} - - - -{/foreach} -
- {$lang_assetclassgroup_name} -
- #{$assetclassgroup.assetclassgroup_color} - {$assetclassgroup.assetclassgroup_name} -
+ + + + + +
+ {$lang_assetclassgroups} ({$assetclassgroups|@count}) + + {$lang_assetclassgroup_add} +
+ + + + + +{foreach item=assetclassgroup from=$assetclassgroups} + + + +{foreachelse} + + + +{/foreach} +
+ {$lang_assetclassgroup_name} +
+ #{$assetclassgroup.assetclassgroup_color} + {$assetclassgroup.assetclassgroup_name} +
+ {$lang_assetclassgroup_none} +
diff --git a/tpl/location.tpl b/tpl/location.tpl index e550300..4a379d9 100644 --- a/tpl/location.tpl +++ b/tpl/location.tpl @@ -1,25 +1,31 @@ - - - - - -
- - {$lang_locations} ({$locations|@count}) - - {$lang_location_add} -
- - - - - - - - - -
- {$lang_location_name} -
- {treelist tree=$locations} -
+ + + + + +
+ + {$lang_locations} ({$locations|@count}) + + {$lang_location_add} +
+ + + + + + + +{if $locations} + +{else} + +{/if} + +
+ {$lang_location_name} +
+ {treelist tree=$locations} + + {$lang_location_none} +
diff --git a/tpl/node.tpl b/tpl/node.tpl index 112bb4c..f830586 100644 --- a/tpl/node.tpl +++ b/tpl/node.tpl @@ -1,38 +1,44 @@ - - - - - -
- - {$lang_nodes} ({$node|@count}) - - {$lang_node_add} -
- - - - - - - - {foreach item=node from=$nodes} - - - - - - {/foreach} +
- {$lang_ip} - - {$lang_asset_name} - - {$lang_asset_info} -
- {if $node.node_ip}{$node.node_ip}{else}(leer){/if} - - {$node.asset_name} - - {$node.asset_info} -
+ + + + +
+ + {$lang_nodes} ({$node|@count}) + + {$lang_node_add} +
+ + + + + + + + {foreach item=node from=$nodes} + + + + + + {foreachelse} + + + + {/foreach}
+ {$lang_ip} + + {$lang_asset_name} + + {$lang_asset_info} +
+ {if $node.node_ip}{$node.node_ip}{else}(leer){/if} + + {$node.asset_name} + + {$node.asset_info} +
+ {$lang_node_none} +
\ No newline at end of file diff --git a/tpl/subnet.tpl b/tpl/subnet.tpl index 914d2d8..6e619bb 100644 --- a/tpl/subnet.tpl +++ b/tpl/subnet.tpl @@ -1,37 +1,43 @@ - - - - - -
- {$lang_subnets} ({$subnets|@count}) - - {$lang_subnet_add} -
- - - - - - - -{foreach item=subnet from=$subnets} - - - - - -{/foreach} -
- {$lang_subnet_subnetaddress_mask} - - {$lang_nodes} - - {$lang_subnet_info} -
- {$subnet.subnet_address}/{$subnet.subnet_mask} - - {$subnet.node_counter} - - {$subnet.subnet_info} -
+ + + + + +
+ {$lang_subnets} ({$subnets|@count}) + + {$lang_subnet_add} +
+ + + + + + + +{foreach item=subnet from=$subnets} + + + + + +{foreachelse} + + + +{/foreach} +
+ {$lang_subnet_subnetaddress_mask} + + {$lang_nodes} + + {$lang_subnet_info} +
+ {$subnet.subnet_address}/{$subnet.subnet_mask} + + {$subnet.node_counter} + + {$subnet.subnet_info} +
+ {$lang_subnet_none} +
diff --git a/tpl/vlan.tpl b/tpl/vlan.tpl index 4ad6ed7..46e9731 100644 --- a/tpl/vlan.tpl +++ b/tpl/vlan.tpl @@ -1,37 +1,43 @@ - - - - - -
- {$lang_vlans} ({$vlans|@count}) - - {$lang_vlan_add} -
- - - - - - - -{foreach item=vlan from=$vlans} - - - - - -{/foreach} -
- {$lang_vlan_number} - - {$lang_vlan_name} - - {$lang_vlan_info} -
- {$vlan.vlan_number} - - {$vlan.vlan_name} - - {$vlan.vlan_info} -
+ + + + + +
+ {$lang_vlans} ({$vlans|@count}) + + {$lang_vlan_add} +
+ + + + + + + +{foreach item=vlan from=$vlans} + + + + + +{foreachelse} + + + +{/foreach} +
+ {$lang_vlan_number} + + {$lang_vlan_name} + + {$lang_vlan_info} +
+ {$vlan.vlan_number} + + {$vlan.vlan_name} + + {$vlan.vlan_info} +
+ {$lang_vlan_none} +
diff --git a/tpl/zone.tpl b/tpl/zone.tpl index 9f30acf..5523fda 100644 --- a/tpl/zone.tpl +++ b/tpl/zone.tpl @@ -1,38 +1,44 @@ - - - - - -
- - {$lang_zones} ({$zones|@count}) - - {$lang_zone_add} -
- - - - - - - - {foreach item=zone from=$zones} - - - - - - {/foreach} -
- {$lang_zone} - - Hostmaster - - Serial -
- {$zone.zone_origin} - - {$zone.zone_hostmaster} - - {$zone.zone_serial} -
+ + + + + +
+ + {$lang_zones} ({$zones|@count}) + + {$lang_zone_add} +
+ + + + + + + + {foreach item=zone from=$zones} + + + + + + {foreachelse} + + + + {/foreach} +
+ {$lang_zone} + + Hostmaster + + Serial +
+ {$zone.zone_origin} + + {$zone.zone_hostmaster} + + {$zone.zone_serial} +
+ {$lang_zone_none} +