mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17861 from nextcloud/fix-tab-navigation-of-menu-in-public-share-pages 

Fix tab navigation of menu in public share pages
This commit is contained in:
Roeland Jago Douma 2020-01-07 21:00:00 +01:00 committed by GitHub
parent dd0979c651 883a71ce8e
commit 86bccde9c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/css/public.scss
View File

@ -11,10 +11,19 @@ $footer-height: 65px;
ul li {
min-width: 270px;
}
#save-external-share {
#header-actions-toggle {
background-color: transparent;
border-color: transparent;
&:hover,
&:focus,
&:active {
opacity: 1;
}
}
#external-share-menu-item {
form {
display: flex;
margin: 0;
}
.hidden {
display: none;

5
core/js/public/publicpage.js
View File

@ -26,9 +26,8 @@ $(document).ready(function () {
$(this).next('.popovermenu').toggleClass('open');
});
$('#save-external-share').find('label').click(function () {
$(this).toggleClass('hidden');
$('.save-form').toggleClass('hidden')
$('#save-external-share').click(function () {
$('#external-share-menu-item').toggleClass('hidden')
$('#remote_address').focus();
});

2
core/templates/layout.public.php
View File

@ -61,7 +61,7 @@
</span>
<?php if($template->getActionCount() > 1) { ?>
<div id="header-secondary-action">
<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
<button id="header-actions-toggle" class="menutoggle icon-more-white"></button>
<div id="header-actions-menu" class="popovermenu menu">
<ul>
<?php

17
lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php
View File

@ -67,14 +67,15 @@ class ExternalShareMenuAction extends SimpleMenuAction {
*/
public function render(): string {
return '<li>' .
'<a id="save-external-share" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' .
'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
'<label for="remote_address">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
'<form class="save-form hidden" action="#">' .
'<input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
'<input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
'</form>' .
'</a>' .
' <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
'</li>' .
'<li id="external-share-menu-item" class="hidden">' .
' <span class="menuitem">' .
' <form class="save-form" action="#">' .
' <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
' <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
' </form>' .
' </span>' .
'</li>';
}
}