Merge pull request #12316 from nextcloud/public-download-button-fix

Better primary visual on public pages
nextcloud · Nov 7, 2018 · a8fb7e1 · a8fb7e1
2 parents 3e8ea39 + f54b201
commit a8fb7e1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss
@@ -192,6 +192,20 @@ thead {
 	font-weight: bold;
 }
 
+// hide the download entry on the menu
+// on public share when NOT on mobile
+@media only screen and (min-width: 769px) {
+	#body-public {
+		.header-right {
+			#header-actions-menu {
+				> ul > li#download {
+					display: none;
+				}
+			}
+		}
+	}
+}
+
 // hide the primary on public share on mobile
 @media only screen and (max-width: 768px) {
 	#body-public {

diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
@@ -51,18 +51,18 @@
 			?>
 		<div class="header-right">
 			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
-				<a href="<?php p($primary->getLink()); ?>">
+				<a href="<?php p($primary->getLink()); ?>" class="primary button">
 					<span><?php p($primary->getLabel()) ?></span>
 				</a>
 			</span>
-			<?php if($template->getActionCount()>1) { ?>
+			<?php if($template->getActionCount() > 1) { ?>
 			<div id="header-secondary-action">
 				<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
 				<div id="header-actions-menu" class="popovermenu menu">
 					<ul>
 						<?php
 							/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-							foreach($template->getOtherActions() as $action) {
+							foreach($others as $action) {
 								print_unescaped($action->render());
 							}
 						?>