diff options
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/css/public.scss | 27 | ||||
| -rw-r--r-- | apps/files_sharing/js/public_note.js | 31 | ||||
| -rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 11 |
4 files changed, 61 insertions, 9 deletions
diff --git a/apps/files_sharing/css/public.scss b/apps/files_sharing/css/public.scss index 3d6fc62ceba..708fe1f2182 100644 --- a/apps/files_sharing/css/public.scss +++ b/apps/files_sharing/css/public.scss @@ -160,17 +160,30 @@ thead { } #header .header-shared-by { - display: inline-block; color: var(--color-primary-text); position: relative; - top: -10px; font-weight: 300; font-size: 11px; opacity: .57; - margin-top: 10px; } -#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 { + .header-right { + #header-primary-action { + display: none; + } + } + } +}
\ No newline at end of file diff --git a/apps/files_sharing/js/public_note.js b/apps/files_sharing/js/public_note.js new file mode 100644 index 00000000000..a303d6c7675 --- /dev/null +++ b/apps/files_sharing/js/public_note.js @@ -0,0 +1,31 @@ +/** + * @copyright Copyright (c) 2018, John Molakvoæ (skjnldsv@protonmail.com) + * + * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> + * + * @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 noteElmt = document.getElementById('notemenu') + if (noteElmt) { + var noteHtml = noteElmt.outerHTML + $(noteHtml).insertBefore('#header-primary-action'); + $('#notemenu').removeClass('hidden'); + OC.registerMenu($('#notemenu .menutoggle'), $('#notemenu .menu')) + } + })
\ No newline at end of file diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 9594d6e71f5..6b30747c79f 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -386,6 +386,7 @@ class ShareController extends AuthPublicShareController { \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'); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 1c552b7d476..da80f8d1377 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -30,8 +30,15 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); <?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; ?> |