Skip to content
Snippets Groups Projects
Commit 3d05540d authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

Move shared page controls to menu in top right 


Signed-off-by: default avatarJan-Christoph Borchardt <hey@jancborchardt.net>
parent ce12cd91
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/files_sharing/css/public.scss
+ 9
− 10
View file @ 3d05540d
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
min-height: calc(100vh - 120px); min-height: calc(100vh - 120px);
} }
#header .menutoggle {
padding: 14px;
cursor: pointer;
}
/* force layout to make sure the content element's height matches its contents' height */ /* force layout to make sure the content element's height matches its contents' height */
.ie #content { .ie #content {
display: inline-block; display: inline-block;
...@@ -78,12 +83,6 @@ thead { ...@@ -78,12 +83,6 @@ thead {
margin: 0; margin: 0;
} }
.directDownload,
.directLink {
margin-bottom: 20px;
}
/* keep long file names in one line to not overflow download button on mobile */ /* keep long file names in one line to not overflow download button on mobile */
.directDownload #downloadFile { .directDownload #downloadFile {
white-space: nowrap; white-space: nowrap;
...@@ -125,6 +124,7 @@ thead { ...@@ -125,6 +124,7 @@ thead {
/* within #save */ /* within #save */
#save .save-form { #save .save-form {
position: relative; position: relative;
margin-right: -10px;
} }
#remote_address { #remote_address {
...@@ -138,10 +138,9 @@ thead { ...@@ -138,10 +138,9 @@ thead {
position: absolute; position: absolute;
background-color: transparent; background-color: transparent;
border: none; border: none;
margin: 2px 4px !important; margin: 0;
right: 7px; right: 0px;
top: -8px; height: 40px;
height: 30px;
} }
#public-upload .avatardiv { #public-upload .avatardiv {
......
apps/files_sharing/templates/public.php
+ 34
− 20
View file @ 3d05540d
...@@ -48,22 +48,38 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); ...@@ -48,22 +48,38 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
</div> </div>
<div class="header-right"> <div class="header-right">
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
if ($_['server2serversharing']) { <a href="#" title="<?php p($l->t('Download & link')) ?>" id="share-menutoggle" class="menutoggle icon-more-white"></a>
?> <div id="share-menu" class="popovermenu menu hidden" style="display: block;">
<span id="save" data-protected="<?php p($_['protected']) ?>" <ul>
data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>"> <li>
<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button> <a href="<?php p($_['downloadURL']); ?>" id="download">
<form class="save-form hidden" action="#"> <span class="icon icon-download"></span>
<input type="text" id="remote_address" placeholder="user@yourNextcloud.org"/> <span id="download-text"><?php p($l->t('Download'))?> (<?php p($_['fileSize']) ?>)</span>
<button id="save-button-confirm" class="icon-confirm svg" disabled></button> </a>
</form> </li>
</span> <li>
<?php } ?> <a href="#">
<a href="<?php p($_['downloadURL']); ?>" id="download" class="button"> <span class="icon icon-public"></span>
<span class="icon icon-download"></span> <label for="directLink"><?php p($l->t('Direct link')) ?></label>
<span id="download-text"><?php p($l->t('Download'))?></span> <input id="directLink" class="hidden" type="text" readonly value="<?php p($_['downloadURL']); ?>">
</a> </a>
</li>
<?php if ($_['server2serversharing']) { ?>
<li>
<a href="#" id="save" data-protected="<?php p($_['protected']) ?>"
data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
<span class="icon icon-external"></span>
<span id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></span>
<form class="save-form hidden" action="#">
<input type="text" id="remote_address" placeholder="user@yourNextcloud.org"/>
<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
</form>
</a>
</li>
<?php } ?>
</ul>
</div>
<?php } ?> <?php } ?>
</div> </div>
</div></header> </div></header>
...@@ -84,16 +100,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); ...@@ -84,16 +100,14 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<!-- Preview frame is filled via JS to support SVG images for modern browsers --> <!-- Preview frame is filled via JS to support SVG images for modern browsers -->
<div id="imgframe"></div> <div id="imgframe"></div>
<?php endif; ?> <?php endif; ?>
<?php if ($_['previewURL'] === $_['downloadURL']): ?>
<div class="directDownload"> <div class="directDownload">
<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
<span class="icon icon-download"></span> <span class="icon icon-download"></span>
<?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>) <?php p($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
</a> </a>
</div> </div>
<div class="directLink"> <?php endif; ?>
<label for="directLink"><?php p($l->t('Direct link')) ?></label>
<input id="directLink" type="text" readonly value="<?php p($_['previewURL']); ?>">
</div>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment