addjust footer height when legal links are present. fixes #9572

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
nextcloud · May 24, 2018 · 0847c98 · 0847c98
1 parent 16c0618
commit 0847c98
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
@@ -192,3 +192,9 @@ input.primary,
 		border: 1px solid #ebebeb;
 	}
 }
+
+@if ($has-legal-links == 'true') {
+	footer {
+		height: 92px;
+	}
+}
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
@@ -142,11 +142,11 @@ public function getSlogan() {
 	}
 
 	public function getImprintUrl() {
-		return $this->config->getAppValue('theming', 'imprintUrl', '');
+		return (string)$this->config->getAppValue('theming', 'imprintUrl', '');
 	}
 
 	public function getPrivacyUrl() {
-		return $this->config->getAppValue('theming', 'privacyUrl', '');
+		return (string)$this->config->getAppValue('theming', 'privacyUrl', '');
 	}
 
 	public function getShortFooter() {
@@ -287,6 +287,12 @@ public function getScssVariables() {
 		if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') {
 			$variables['image-login-plain'] = 'true';
 		}
+
+		$variables['has-legal-links'] = 'false';
+		if($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
+			$variables['has-legal-links'] = 'true';
+		}
+
 		$cache->set('getScssVariables', $variables);
 		return $variables;
 	}

diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
@@ -654,7 +654,8 @@ public function testGetScssVariables() {
 			'theming-logoheader-mime' => '\'jpeg\'',
 			'theming-favicon-mime' => '\'jpeg\'',
 			'image-logoheader' => '\'custom-logoheader?v=0\'',
-			'image-favicon' => '\'custom-favicon?v=0\''
+			'image-favicon' => '\'custom-favicon?v=0\'',
+			'has-legal-links' => 'false'
 		];
 		$this->assertEquals($expected, $this->template->getScssVariables());
 	}