summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-10-21 08:26:51 -0700
committerVincent Petry <pvince81@owncloud.com>2013-10-21 08:26:51 -0700
commita1038c271c9df14acf616ea42f713c4d4a9d195c (patch)
tree316caefe1a640cf156b66fd021c96ef70d534a15
parentdfe38d13e220f1f4ef3c14235147fa9b05713a50 (diff)
parent5ac4ec3a84e778240bf9adda403b155f2a0c8cd7 (diff)
downloadnextcloud-server-a1038c271c9df14acf616ea42f713c4d4a9d195c.tar.gz
nextcloud-server-a1038c271c9df14acf616ea42f713c4d4a9d195c.zip
Merge pull request #5424 from owncloud/sharing-directlink
Added direct link in public share page
-rw-r--r--apps/files_sharing/css/public.css11
-rw-r--r--apps/files_sharing/js/public.js2
-rw-r--r--apps/files_sharing/templates/public.php1
3 files changed, 14 insertions, 0 deletions
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 3aa4a483041..3e1dec9bbe1 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -132,3 +132,14 @@ thead{
top: -2px;
color: #555;
}
+
+.directLink {
+ margin-bottom: 20px;
+}
+ .directLink label {
+ font-weight: normal;
+ }
+ .directLink input {
+ margin-left: 10px;
+ width: 300px;
+ }
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 67320b1cdb6..eacd4096ed8 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -67,4 +67,6 @@ $(document).ready(function() {
procesSelection();
});
+ $('#directLink').focus();
+
});
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 5d935f645e6..1f5453468b4 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -95,6 +95,7 @@
</li>
</ul>
<?php endif; ?>
+ <div class="directLink"><label for="directLink"><?php p($l->t('Direct link')) ?></label><input id="directLink" type="text" readonly value="<?php p($_['downloadURL']); ?>"></input></div>
<?php endif; ?>
</div>
<footer>