summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-09-08 09:13:59 +0200
committerMorris Jobke <hey@morrisjobke.de>2016-09-08 18:44:27 +0200
commit6bb95de1c50208d6cbaf1242f86a2fdab09c2246 (patch)
tree47fa17b753a672e6d93c2186c517df2fd5b355b2 /apps/files_sharing
parentb3d3a95bf3e11a4689884f72f6d6021d4dcff97c (diff)
downloadnextcloud-server-6bb95de1c50208d6cbaf1242f86a2fdab09c2246.tar.gz
nextcloud-server-6bb95de1c50208d6cbaf1242f86a2fdab09c2246.zip
Adding a optional disclaimer to the anonymous upload page
Diffstat (limited to 'apps/files_sharing')
-rw-r--r--apps/files_sharing/css/public.css11
-rw-r--r--apps/files_sharing/lib/Controllers/ShareController.php1
-rw-r--r--apps/files_sharing/templates/public.php5
3 files changed, 16 insertions, 1 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 4c5f847f9ff..3e3d13cebf0 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -168,6 +168,10 @@ thead {
margin: 0 auto;
}
+#emptycontent.has-disclaimer {
+ margin-top: 10vh;
+}
+
#public-upload #emptycontent h2 {
margin: 10px 0 5px 0;
}
@@ -222,3 +226,10 @@ thead {
padding-left: 18px;
margin-right: 7px;
}
+
+
+.disclaimer {
+ margin: -20px auto 30px;
+ max-width: 400px;
+ text-align: left;
+} \ No newline at end of file
diff --git a/apps/files_sharing/lib/Controllers/ShareController.php b/apps/files_sharing/lib/Controllers/ShareController.php
index cd0d40048cf..5ccaab746fc 100644
--- a/apps/files_sharing/lib/Controllers/ShareController.php
+++ b/apps/files_sharing/lib/Controllers/ShareController.php
@@ -357,6 +357,7 @@ class ShareController extends Controller {
$shareTmpl['previewEnabled'] = $this->config->getSystemValue('enable_previews', true);
$shareTmpl['previewMaxX'] = $this->config->getSystemValue('preview_max_x', 1024);
$shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
+ $shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
// Load files we need
\OCP\Util::addScript('files', 'file-upload');
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 1b282f04a7a..bdedb04d244 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -104,10 +104,13 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
<?php } else { ?>
<input type="hidden" id="upload-only-interface" value="1"/>
<div id="public-upload">
- <div id="emptycontent" class="">
+ <div id="emptycontent" class="<?php if (!empty($_['disclaimer'])) { ?>has-disclaimer<?php } ?>">
<div id="displayavatar"><div class="avatardiv"></div></div>
<h2><?php p($l->t('Upload files to %s', [$_['shareOwner']])) ?></h2>
<p><span class="icon-folder"></span> <?php p($_['filename']) ?></p>
+ <?php if (!empty($_['disclaimer'])) { ?>
+ <p class="disclaimer"><?php p($_['disclaimer']); ?></p>
+ <?php } ?>
<input type="file" name="files[]" class="hidden" multiple>
<a href="#" class="button icon-upload"><?php p($l->t('Select or drop files')) ?></a>