Merge pull request #882 from nextcloud/bugfix/noid/14-public

Fix public layout rendering on Nextcloud 14
nextcloud · Aug 15, 2018 · 45aa98c · 45aa98c
2 parents 8a55de8 + 5d45324
commit 45aa98c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/controller/viewcontroller.php b/controller/viewcontroller.php
@@ -155,7 +155,7 @@ public function publicIndexForEmbedding($token) {
 		$params = array_merge($templateParameters, $publicTemplateParameters);
 		$params['isEmbedded'] = true;
 
-		$response = new TemplateResponse('calendar', 'main', $params, 'public');
+		$response = new TemplateResponse('calendar', 'main', $params, 'base');
 
 		$response->addHeader('X-Frame-Options', 'ALLOW');
 		$csp = new ContentSecurityPolicy();

diff --git a/templates/main.php b/templates/main.php
@@ -55,6 +55,9 @@
 ?>
 <?php if($_['isPublic'] && !$_['isEmbedded']): ?>
 <style>
+	#body-public.layout-base #content {
+		padding-top: 50px;
+	}
 	@media only screen and (max-width: 768px) {
 		#app-navigation, #app-content {
 			top: 45px !important;
@@ -65,6 +68,10 @@
 
 <?php if($_['isEmbedded']): ?>
 <style>
+	#body-public.layout-base #app-navigation {
+		top: 0;
+		height: 100%;
+	}
 	@media only screen and (max-width: 768px) {
 		#app-navigation-toggle {
 			top: 0 !important;