diff options
| -rw-r--r-- | apps/files_sharing/css/public.scss | 14 | ||||
| -rw-r--r-- | core/templates/layout.public.php | 6 | ||||
| -rw-r--r-- | settings/js/settings.js | 4 |
3 files changed, 20 insertions, 4 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index b8a5dbf4f38..c31b4f82bed 100644 --- 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 index 0558da52d0b..8a87e88a16c 100644 --- 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()); } ?> diff --git a/settings/js/settings.js b/settings/js/settings.js index 66b8347fdf2..2c4f9c4c94f 100644 --- a/settings/js/settings.js +++ b/settings/js/settings.js @@ -55,7 +55,9 @@ OC.Settings = _.extend(OC.Settings, { selection = _.map((groups || []).split('|').sort(), function(groupId) { return { id: groupId, - displayname: results.find(group => group.id === groupId).displayname + displayname: results.find(function (group) { + return group.id === groupId; + }).displayname }; }); } else if (groups) { |