From 3941f2482e26590e7f0f24147bc87740ab7f18af Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Tue, 3 Oct 2017 20:07:15 +0200 Subject: [locations] implemented new permission system --- .../locations/templates/location-subnets.html | 40 ++++++++++++---------- .../locations/templates/locations.html | 17 +++++---- modules-available/locations/templates/subnets.html | 10 +++--- 3 files changed, 37 insertions(+), 30 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 9cfa5cc8..754616c6 100644 --- a/modules-available/locations/templates/location-subnets.html +++ b/modules-available/locations/templates/location-subnets.html @@ -8,24 +8,26 @@
-
-
- {{lang_name}} - +
+
+
+ {{lang_name}} + +
-
-
-
- {{lang_parentLocation}} - +
+
+ {{lang_parentLocation}} + +
- +

@@ -41,11 +43,11 @@ {{#list}} {{subnetid}} - - + +
- +
@@ -53,7 +55,7 @@ {{/list}} - @@ -86,7 +88,7 @@
- +
diff --git a/modules-available/locations/templates/locations.html b/modules-available/locations/templates/locations.html index 451d8add..afbca3c6 100644 --- a/modules-available/locations/templates/locations.html +++ b/modules-available/locations/templates/locations.html @@ -24,9 +24,10 @@
- {{locationname}} + {{locationname}}{{^linkClass}} {{/linkClass}} + {{^linkClass}} {{#havestatistics}} {{clientCount}} @@ -35,13 +36,17 @@ {{/havestatistics}} + {{/linkClass}} + {{^linkClass}} {{#havestatistics}} {{clientLoad}} {{/havestatistics}} + {{/linkClass}} + {{^linkClass}} {{#havebaseconfig}}
@@ -50,8 +55,10 @@ {{lang_overrideCount}}: {{overriddenVars}}   {{/overriddenVars}} {{/havebaseconfig}} + {{/linkClass}} + {{^linkClass}} {{#havesysconfig}}
@@ -60,6 +67,7 @@ {{configName}}   {{/havesysconfig}} + {{/linkClass}} {{/list}} @@ -90,12 +98,10 @@ - - - @@ -122,8 +128,7 @@ function slxAddLocationRow() { tr.before('\ \ \ \ '); diff --git a/modules-available/locations/templates/subnets.html b/modules-available/locations/templates/subnets.html index 4c96cc4d..0a1eca21 100644 --- a/modules-available/locations/templates/subnets.html +++ b/modules-available/locations/templates/subnets.html @@ -17,12 +17,12 @@ {{#list}} {{subnetid}} - - - + + + @@ -30,7 +30,7 @@ {{/list}}
- +
-- cgit v1.2.3-55-g7522