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

more cleanup 

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
This commit is contained in:
Christoph Wurst 2017-01-16 20:30:38 +01:00
parent 7c824a6177
commit bfa50a4444
No known key found for this signature in database
GPG Key ID: CC42AC2A7F0E56D8
2 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
apps/files_sharing/templates/public.php
View File

@ -35,40 +35,36 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>"> <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" <div id="header-left">
title="" id="nextcloud"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
<div class="logo-icon svg"> title="" id="nextcloud">
</div> <div class="logo-icon svg">
</a> <h1 class="header-appname">
<?php p($theme->getName()); ?>
<div class="header-appname-container"> </h1>
<h1 class="header-appname"> </div>
<?php p($theme->getName()); ?> </a>
</h1>
</div> </div>
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div class="header-right"> <div id="header-right">
<span id="details"> <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) {
<?php if ($_['server2serversharing']) {
if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { ?>
if ($_['server2serversharing']) { <span 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 id="save" data-protected="<?php p($_['protected']) ?>" <button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>"> <form class="save-form hidden" action="#">
<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button> <input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/>
<form class="save-form hidden" action="#"> <button id="save-button-confirm" class="icon-confirm svg" disabled></button>
<input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/> </form>
<button id="save-button-confirm" class="icon-confirm svg" disabled></button> </span>
</form>
</span>
<?php } ?>
<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
<span class="icon icon-download"></span>
<span id="download-text"><?php p($l->t('Download'))?></span>
</a>
<?php } ?> <?php } ?>
</span> <a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
<span class="icon icon-download"></span>
<span id="download-text"><?php p($l->t('Download'))?></span>
</a>
<?php } ?>
</div> </div>
</div></header> </div></header>
<div id="content-wrapper"> <div id="content-wrapper">

16
core/css/header.scss
View File

@ -108,7 +108,8 @@
#header-left, #header-left,
#header-right { #header-right {
display: flex; display: inline-flex;
align-items: center;
} }
#header-left { #header-left {
@ -117,7 +118,6 @@
} }
#header-right { #header-right {
display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
} }
@ -305,18 +305,6 @@
/* USER MENU -----------------------------------------------------------------*/ /* USER MENU -----------------------------------------------------------------*/
/* info part on the right, used e.g. for info on who shared something */
.header-right {
position: absolute;
right: 0;
padding: 7px 5px;
color: #fff;
height: 100%;
max-width: 80%;
white-space: nowrap;
box-sizing: border-box;
}
#settings { #settings {
display: inline-block; display: inline-block;
color: #ddd; color: #ddd;