From 3d0cb99c70dd9714655cf26893504e4bd007b036 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 24 Jun 2016 17:08:24 +0200
Subject: [locations] Support CIDR notion (start field), tweak templates a bit
---
.../locations/templates/location-subnets.html | 34 ++++++++++++----------
.../locations/templates/locations.html | 27 ++++++++++-------
modules-available/locations/templates/subnets.html | 6 ++--
3 files changed, 38 insertions(+), 29 deletions(-)
(limited to 'modules-available/locations/templates')
diff --git a/modules-available/locations/templates/location-subnets.html b/modules-available/locations/templates/location-subnets.html
index b0353416..23035002 100644
--- a/modules-available/locations/templates/location-subnets.html
+++ b/modules-available/locations/templates/location-subnets.html
@@ -43,31 +43,35 @@
{{#list}}
-
+
{{subnetid}}
-
-
+
+
{{/list}}
-
+
{{lang_subnet}}
-
- {{lang_save}}
-
+
+
+ {{lang_save}}
+
+ {{lang_locationInfo}}
+ {{#haveDozmod}}
+
+ {{lang_referencingLectures}}: {{lectures}}
+
+ {{/haveDozmod}}
+ {{#haveStatistics}}
+
+ {{/haveStatistics}}
-
- {{lang_locationInfo}}
-
- {{lang_referencingLectures}}: {{lectures}}
-
-
\ No newline at end of file
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html
index 2971105b..1fb60926 100644
--- a/modules-available/locations/templates/locations.html
+++ b/modules-available/locations/templates/locations.html
@@ -6,13 +6,15 @@
{{lang_locationName}}
- {{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
- {{lang_editConfigVariables}}
- {{#havesysconfig}}
+
+ {{#havestatistics}}{{lang_machineCount}}{{/havestatistics}}
+
+
+ {{#havebaseconfig}}{{lang_editConfigVariables}}{{/havebaseconfig}}
+
- {{#havebaseconfig}}{{lang_sysConfig}}{{/havebaseconfig}}
+ {{#havesysconfig}}{{lang_sysConfig}}{{/havesysconfig}}
- {{/havesysconfig}}
{{#list}}
@@ -37,13 +39,13 @@
{{/havebaseconfig}}
+ {{#havesysconfig}}
{{configName}}
- {{#havesysconfig}}
{{/havesysconfig}}
@@ -123,23 +125,26 @@ function slxOpenLocation(e, lid) {
}
return;
}
- var td = $('').attr('colspan', '2').css('padding', '0px 0px 12px');
+ var td = $(' ').attr('colspan', '4').css('padding', '0px 0px 12px');
var tr = $(' ').attr('id', 'location-details-' + lid);
tr.append(td);
$(e).closest('tr').addClass('active slx-bold').after(tr);
- td.load('?do=Locations&action=showlocation&locationid=' + lid);
+ td.load('?do=Locations&action=showlocation&locationid=' + lid, function() {
+ slxAttachCidr();
+ });
slxLastLocation = tr;
}
function slxAddSubnetRow(e, lid) {
var tr = $('#loc-sub-' + lid);
- tr.before(' \
+ tr.before(' \
# \
- \
- \
+ \
+ \
\
');
slxAddCounter++;
+ slxAttachCidr();
}
function slxConfirm() {
diff --git a/modules-available/locations/templates/subnets.html b/modules-available/locations/templates/subnets.html
index 2294f42b..0320e333 100644
--- a/modules-available/locations/templates/subnets.html
+++ b/modules-available/locations/templates/subnets.html
@@ -14,10 +14,10 @@
{{lang_location}}
{{#list}}
-
+
{{subnetid}}
-
-
+
+
{{#locations}}
--
cgit v1.2.3-55-g7522