Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix mobile view and add public share note view
Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
  • Loading branch information
skjnldsv committed Aug 24, 2018
commit ac2c925231253847bfa0fc99f5002b3f92a5b8f1
12 changes: 8 additions & 4 deletions apps/files_sharing/css/public.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,16 @@ thead {
opacity: .57;
}

#note {
text-align: center;
padding: 10px;
#note-content {
padding: 5px;
display:inline-block;
width: 350px;
.content {
overflow: auto;
max-height: 200px;
}
}


// hide the primary on public share on mobile
@media only screen and (max-width: 768px) {
#body-public {
Expand Down
28 changes: 28 additions & 0 deletions apps/files_sharing/js/public_note.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* @copyright Copyright (c) 2018, John Molakvoæ ([email protected])
*
* @author John Molakvoæ (skjnldsv) <[email protected]>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

$(document).ready(function() {
var noteHtml = document.getElementById('notemenu').outerHTML
$(noteHtml).insertBefore('#header-primary-action');
$('#notemenu').removeClass('hidden');
OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu'))
})
1 change: 1 addition & 0 deletions apps/files_sharing/lib/Controller/ShareController.php
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ public function showShare($path = ''): TemplateResponse {
\OCP\Util::addScript('files', 'file-upload');
\OCP\Util::addStyle('files_sharing', 'publicView');
\OCP\Util::addScript('files_sharing', 'public');
\OCP\Util::addScript('files_sharing', 'public_note');
\OCP\Util::addScript('files', 'fileactions');
\OCP\Util::addScript('files', 'fileactionsmenu');
\OCP\Util::addScript('files', 'jquery.fileupload');
Expand Down
11 changes: 9 additions & 2 deletions apps/files_sharing/templates/public.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,15 @@
<?php endif; ?>
<input type="hidden" name="maxSizeAnimateGif" value="<?php p($_['maxSizeAnimateGif']); ?>" id="maxSizeAnimateGif">
<?php if (isset($_['note']) && $_['note'] !== '') : ?>
<div id="note">
<?php p($l->t('Note:')); p(' ' . $_['note']); ?>
<div id="notemenu" class="hidden">
<div class="icon-comment-white menutoggle" tabindex="0" role="button" aria-haspopup="true" aria-controls="note-content" aria-expanded="false">
<span class="hidden-visually"><?php p($l->t('Share note'))?></span>
</div>
<div id="note-content" class="menu" aria-label="Note content">
<div class="content">
<?php p($_['note']); ?>
</div>
</div>
</div>
<?php endif; ?>

Expand Down
3 changes: 2 additions & 1 deletion core/css/mobile.scss
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@
}

@media only screen and (max-width: 480px) {
#header .header-right .menu {
#header .header-left > nav > .menu,
#header .header-right > div > .menu {
max-width: calc(100vw - 10px);
position: fixed;
&::after {
Expand Down
9 changes: 0 additions & 9 deletions core/css/public.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ $footer-height: 60px;
color: var(--color-primary-text);
}

.menutoggle,
#header-primary-action[class^='icon-'] {
padding: 14px;
padding-right: 40px;
background-position: right 15px center;
color: var(--color-primary-text);
cursor: pointer;
}

#header-secondary-action {
margin-right: 13px;

Expand Down