From 9cd15bf349c86fe72b80664f8bd1268b872f72c4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 15 Aug 2016 15:14:23 +0200
Subject: [locations] Fix wrong overlap function for subnet collision detection
---
modules-available/locations/inc/location.inc.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'modules-available/locations')
diff --git a/modules-available/locations/inc/location.inc.php b/modules-available/locations/inc/location.inc.php
index a018208d..71a621db 100644
--- a/modules-available/locations/inc/location.inc.php
+++ b/modules-available/locations/inc/location.inc.php
@@ -362,8 +362,7 @@ class Location
private static function overlap($net1, $net2)
{
- return ($net1['startaddr'] >= $net2['startaddr'] && $net1['startaddr'] <= $net2['endaddr'])
- || ($net1['endaddr'] >= $net2['startaddr'] && $net1['endaddr'] <= $net2['endaddr']);
+ return ($net1['startaddr'] <= $net2['endaddr'] && $net1['endaddr'] >= $net2['startaddr']);
}
}
--
cgit v1.2.3-55-g7522
From 35667fcedba31d809ded2a2c4eb105d75eb2f6f1 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 17 Aug 2016 12:30:53 +0200
Subject: Clean up css a bit
---
modules-available/dozmod/templates/images-delete.html | 10 +++++-----
modules-available/dozmod/templates/orglist.html | 2 +-
modules-available/dozmod/templates/userlist.html | 8 ++++----
modules-available/locations/templates/locations.html | 12 ++++++------
modules-available/statistics/templates/clientlist.html | 2 +-
modules-available/statistics/templates/kvmstate.html | 2 +-
modules-available/statistics/templates/memory.html | 2 +-
modules-available/statistics/templates/newclients.html | 2 +-
modules-available/sysconfig/templates/custom-filelist.html | 2 +-
modules-available/sysconfig/templates/custom-fileselect.html | 2 +-
modules-available/sysconfig/templates/list-configs.html | 6 +++---
modules-available/sysconfig/templates/list-modules.html | 8 ++++----
style/default.css | 12 ------------
13 files changed, 29 insertions(+), 41 deletions(-)
(limited to 'modules-available/locations')
diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html
index b85d2c06..0ee90835 100644
--- a/modules-available/dozmod/templates/images-delete.html
+++ b/modules-available/dozmod/templates/images-delete.html
@@ -27,11 +27,11 @@
{{#images}}
-
- {{version}} |
- {{lastname}}, {{firstname}} |
- |
- {{filesize}} |
+
+ {{version}} |
+ {{lastname}}, {{firstname}} |
+ |
+ {{filesize}} |
|
{{/images}}
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html
index bb002b3b..482864de 100644
--- a/modules-available/dozmod/templates/orglist.html
+++ b/modules-available/dozmod/templates/orglist.html
@@ -16,7 +16,7 @@
{{#organizations}}
- {{displayname}} |
+ {{displayname}} |
|
diff --git a/modules-available/dozmod/templates/userlist.html b/modules-available/dozmod/templates/userlist.html
index 7dd84fd4..93ef7b41 100644
--- a/modules-available/dozmod/templates/userlist.html
+++ b/modules-available/dozmod/templates/userlist.html
@@ -22,10 +22,10 @@
{{#users}}
- {{lastname}}, {{firstname}} |
- {{orgname}} |
- {{lastlogin}} |
- {{email}} |
+ {{lastname}}, {{firstname}} |
+ {{orgname}} |
+ {{lastlogin}} |
+ {{email}} |
|
|
|
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index bb13131e..5fec2e2e 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -9,10 +9,10 @@
{{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
|
-
+ |
{{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}}
|
-
+ |
{{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}}
|
@@ -22,13 +22,13 @@
{{locationname}}
-
+ |
{{#havestatistics}}
{{clientCount}}
{{/havestatistics}}
|
-
+ |
{{#havebaseconfig}}
@@ -38,7 +38,7 @@
{{/overriddenVars}}
{{/havebaseconfig}}
|
-
+ |
{{#havesysconfig}}
@@ -53,7 +53,7 @@
{{#unassignedCount}}
{{lang_unassignedMachines}} |
-
+ |
{{unassignedCount}}
diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html
index 3a1b52ac..ca4b971a 100644
--- a/modules-available/statistics/templates/clientlist.html
+++ b/modules-available/statistics/templates/clientlist.html
@@ -58,7 +58,7 @@
|
{{#rows}}
-
+ |
{{#hasnotes}}{{/hasnotes}}
{{#state_off}}
diff --git a/modules-available/statistics/templates/kvmstate.html b/modules-available/statistics/templates/kvmstate.html
index c44fb9ab..33a00d38 100644
--- a/modules-available/statistics/templates/kvmstate.html
+++ b/modules-available/statistics/templates/kvmstate.html
@@ -13,7 +13,7 @@
|
{{#rows}}
-
+ |
{{kvmstate}}
|
{{count}} |
diff --git a/modules-available/statistics/templates/memory.html b/modules-available/statistics/templates/memory.html
index 2d50c47f..ae040674 100644
--- a/modules-available/statistics/templates/memory.html
+++ b/modules-available/statistics/templates/memory.html
@@ -13,7 +13,7 @@
{{#rows}}
-
+ |
{{gb}} GiB
|
{{count}} |
diff --git a/modules-available/statistics/templates/newclients.html b/modules-available/statistics/templates/newclients.html
index 0d9c74df..e7d79818 100644
--- a/modules-available/statistics/templates/newclients.html
+++ b/modules-available/statistics/templates/newclients.html
@@ -14,7 +14,7 @@
{{#rows}}
- {{hostname}} |
+ {{hostname}} |
{{firstseen}} |
{{kvmicon}} |
{{gbram}} GiB |
diff --git a/modules-available/sysconfig/templates/custom-filelist.html b/modules-available/sysconfig/templates/custom-filelist.html
index 3ad241dd..344eece3 100644
--- a/modules-available/sysconfig/templates/custom-filelist.html
+++ b/modules-available/sysconfig/templates/custom-filelist.html
@@ -4,7 +4,7 @@
{{#files}}
{{#isdir}}
- {{name}} |
+ {{name}} |
{{/isdir}}
{{^isdir}}
{{name}} |
diff --git a/modules-available/sysconfig/templates/custom-fileselect.html b/modules-available/sysconfig/templates/custom-fileselect.html
index 000c8d10..f14a6fde 100644
--- a/modules-available/sysconfig/templates/custom-fileselect.html
+++ b/modules-available/sysconfig/templates/custom-fileselect.html
@@ -16,7 +16,7 @@
{{#files}}
{{#isdir}}
- {{name}} |
+ {{name}} |
{{/isdir}}
{{^isdir}}
{{name}} |
diff --git a/modules-available/sysconfig/templates/list-configs.html b/modules-available/sysconfig/templates/list-configs.html
index ed027385..987becfd 100644
--- a/modules-available/sysconfig/templates/list-configs.html
+++ b/modules-available/sysconfig/templates/list-configs.html
@@ -21,7 +21,7 @@
{{#configs}}
-
+ |
{{config}}
|
@@ -45,7 +45,7 @@
{{/locationCount}}
|
-
+ |
|
-
+ |
|
diff --git a/modules-available/sysconfig/templates/list-modules.html b/modules-available/sysconfig/templates/list-modules.html
index 5b2c940b..29726c5d 100644
--- a/modules-available/sysconfig/templates/list-modules.html
+++ b/modules-available/sysconfig/templates/list-modules.html
@@ -11,15 +11,15 @@
{{#modules}}
- {{moduleType}} |
- {{title}} |
-
+ | {{moduleType}} |
+ {{title}} |
+
{{#allowDownload}}
{{/allowDownload}}
|
-
+ |
| |