From 338cbcfab6bf4578cded015c79aabe196fa652d8 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:14:30 +0200 Subject: [PATCH 01/33] Convert menu to horizontal top menu --- css/base.css | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/css/base.css b/css/base.css index 38ef03d..2f2d3d1 100644 --- a/css/base.css +++ b/css/base.css @@ -11,21 +11,33 @@ body, html { #wrap { } #menu { - width: 10%; - float: left; - border: 1px solid #DDD; + border: 2px solid #DDD; font-family: 'Segoe UI Semilight','Open Sans',Verdana,Arial,Helvetica,sans-serif; font-weight: 300; font-size: 14px; line-height: 1.3; + display: inline-block; + margin-bottom: 5px; + width: 100%; } + +#menu ul { + padding: 0; + margin: 0; +} + +#menu ul li { + float: right; + margin-right: 5px; +} + #ImportZone { height: 0px; width: 0px; } .tables { float: right; - width: 89%; + width: 100%; min-width: 500px; margin-bottom: 5px; } From d02b0599772f54376039424a09e965651ae3753a Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:41:36 +0200 Subject: [PATCH 02/33] Add additions.css with option into --- index.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.php b/index.php index 7d9f41c..b45dd7c 100644 --- a/index.php +++ b/index.php @@ -26,6 +26,9 @@ if (!is_logged_in() and isset($_POST['formname']) and $_POST['formname'] === "lo + + + From 847e170773e1fb834c831a73e0ed5d94f766a7c2 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:43:34 +0200 Subject: [PATCH 03/33] add $cssadditions option This adds a switch to turn on or off additions.css --- includes/config.inc.php-dist | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/config.inc.php-dist b/includes/config.inc.php-dist index c155a6e..4eda8c7 100644 --- a/includes/config.inc.php-dist +++ b/includes/config.inc.php-dist @@ -53,3 +53,6 @@ $defaults['defaulttype'] = 'Master'; # Choose between 'Native $defaults['primaryns'] = 'unconfigured.primaryns'; # The value of the first NS-record $defaults['secondaryns'] = 'unconfigured.secondaryns'; # The value of the second NS-record $defaults['ttl'] = 3600; # Default TTL for records + +## UI Options +$cssadditions = TRUE; # enable or disable horizontal menu From fa3c069f28f6eca06e49e79e0f24fd54803e0a6d Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:45:45 +0200 Subject: [PATCH 04/33] Create additions.css --- css/additions.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 css/additions.css diff --git a/css/additions.css b/css/additions.css new file mode 100644 index 0000000..7cd379f --- /dev/null +++ b/css/additions.css @@ -0,0 +1,27 @@ +#menu { + width: 100%; + border-bottom: 2px solid #DDD; + font-family: 'Segoe UI Semilight','Open Sans',Verdana,Arial,Helvetica,sans-serif; + font-weight: 300; + font-size: 14px; + line-height: 1.3; + display: inline-block; + margin-bottom: 5px; +} + +#menu ul { + padding: 0; + margin: 0; +} + +#menu ul li { + float: right; + margin-right: 5px; +} + +.tables { + float: right; + width: 100%; + min-width: 500px; + margin-bottom: 5px; +} From 237b17df06aa3a57e0365c688e482d8b373f6203 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:52:29 +0200 Subject: [PATCH 05/33] Update index.php --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index b45dd7c..c1d421a 100644 --- a/index.php +++ b/index.php @@ -26,8 +26,8 @@ if (!is_logged_in() and isset($_POST['formname']) and $_POST['formname'] === "lo - - + + From e559b6e2638d069e7bc06f45bc0297d4062d3621 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:54:08 +0200 Subject: [PATCH 06/33] Update config.inc.php-dist --- includes/config.inc.php-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/config.inc.php-dist b/includes/config.inc.php-dist index 4eda8c7..99307c7 100644 --- a/includes/config.inc.php-dist +++ b/includes/config.inc.php-dist @@ -55,4 +55,4 @@ $defaults['secondaryns'] = 'unconfigured.secondaryns'; # The value of the secon $defaults['ttl'] = 3600; # Default TTL for records ## UI Options -$cssadditions = TRUE; # enable or disable horizontal menu +$menutype = horizontal; # horizontal|vertical - use a horizontal or vertical menu From 79591b7968a9b68720da0db348f3e460b58ee283 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:54:50 +0200 Subject: [PATCH 07/33] Delete additions.css --- css/additions.css | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 css/additions.css diff --git a/css/additions.css b/css/additions.css deleted file mode 100644 index 7cd379f..0000000 --- a/css/additions.css +++ /dev/null @@ -1,27 +0,0 @@ -#menu { - width: 100%; - border-bottom: 2px solid #DDD; - font-family: 'Segoe UI Semilight','Open Sans',Verdana,Arial,Helvetica,sans-serif; - font-weight: 300; - font-size: 14px; - line-height: 1.3; - display: inline-block; - margin-bottom: 5px; -} - -#menu ul { - padding: 0; - margin: 0; -} - -#menu ul li { - float: right; - margin-right: 5px; -} - -.tables { - float: right; - width: 100%; - min-width: 500px; - margin-bottom: 5px; -} From 2e6dc7e072adb641e8cc2fb98d6a3ce94bdadf38 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 16:56:04 +0200 Subject: [PATCH 08/33] Create horizontal-menu.css --- css/horizontal-menu.css | 1 + 1 file changed, 1 insertion(+) create mode 100644 css/horizontal-menu.css diff --git a/css/horizontal-menu.css b/css/horizontal-menu.css new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/css/horizontal-menu.css @@ -0,0 +1 @@ + From f87569a1f6f48f8beeb8480a3b06d574169e12e6 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 18:07:29 +0200 Subject: [PATCH 09/33] revert changes --- css/base.css | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/css/base.css b/css/base.css index 2f2d3d1..1e4a174 100644 --- a/css/base.css +++ b/css/base.css @@ -11,24 +11,12 @@ body, html { #wrap { } #menu { - border: 2px solid #DDD; + border: 1px solid #DDD; font-family: 'Segoe UI Semilight','Open Sans',Verdana,Arial,Helvetica,sans-serif; font-weight: 300; font-size: 14px; line-height: 1.3; - display: inline-block; - margin-bottom: 5px; - width: 100%; -} - -#menu ul { - padding: 0; - margin: 0; -} - -#menu ul li { - float: right; - margin-right: 5px; + width: 10%; } #ImportZone { @@ -37,7 +25,7 @@ body, html { } .tables { float: right; - width: 100%; + width: 89%; min-width: 500px; margin-bottom: 5px; } From aebec8bc25b5d59dd8a4c4860656f2da1261fae4 Mon Sep 17 00:00:00 2001 From: piwats Date: Fri, 17 Apr 2015 18:21:40 +0200 Subject: [PATCH 10/33] Add .horizontal to #menu --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index c1d421a..30ffbcc 100644 --- a/index.php +++ b/index.php @@ -103,7 +103,7 @@ if ($blocklogin === TRUE) {
-