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

Fixed public template 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-03-07 11:05:23 +01:00
parent c401a8cf26
commit d9bd6f3253
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_sharing/css/public.scss
View File

@ -88,15 +88,6 @@ thead {
opacity: .5; opacity: .5;
} }
#directLink-container {
flex-wrap: wrap;
}
#directLink {
margin-left: 30px;
flex-basis: 100%;
}
/* header buttons */ /* header buttons */
#details { #details {
display: inline-flex; display: inline-flex;

8
apps/files_sharing/lib/Template/LinkMenuAction.php
View File

@ -47,8 +47,12 @@ class LinkMenuAction extends SimpleMenuAction {
'<a id="directLink-container">' . '<a id="directLink-container">' .
'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' . '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' . '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
'</a>' . '</a>' .
'</li>' .
'<li>' .
'<span class="menuitem">' .
'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
'</span>' .
'</li>'; '</li>';
} }
} }

1
core/css/header.scss
View File

@ -84,6 +84,7 @@
max-height: 280px; max-height: 280px;
right: 0; right: 0;
top: 44px; top: 44px;
margin: 0;
&:not(.popovermenu) { &:not(.popovermenu) {
display: none; display: none;

34
core/css/public.scss
View File

@ -1,22 +1,22 @@
#body-public { #body-public {
.header-right { .header-right {
span:not(.popovermenu) a { span:not(.popovermenu) a {
color: $color-primary-text; color: $color-primary-text;
} }
.menutoggle, .menutoggle,
#header-primary-action[class^='icon-'] { #header-primary-action[class^='icon-'] {
padding: 14px; padding: 14px;
padding-right: 40px; padding-right: 40px;
background-position: right 15px center; background-position: right 15px center;
color: $color-primary-text; color: $color-primary-text;
cursor: pointer; cursor: pointer;
} }
.menutoggle { #header-secondary-action {
padding-right: 10px; margin-right: 13px;
} }
} }
} }

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

@ -54,16 +54,18 @@
</a> </a>
</span> </span>
<?php if($template->getActionCount()>1) { ?> <?php if($template->getActionCount()>1) { ?>
<span id="header-actions-toggle" class="menutoggle icon-more-white"></span> <div id="header-secondary-action">
<div id="share-menu" class="popovermenu menu"> <span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
<ul> <div id="share-menu" class="popovermenu menu">
<?php <ul>
/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */ <?php
foreach($template->getOtherActions() as $action) { /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
print_unescaped($action->render()); foreach($template->getOtherActions() as $action) {
} print_unescaped($action->render());
?> }
</ul> ?>
</ul>
</div>
</div> </div>
<?php } ?> <?php } ?>
</div> </div>