diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-10 18:41:08 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-10 18:41:08 +0100 |
| commit | 45074d5023d408f4f81bc45380ce68b1008f9414 (patch) | |
| tree | b9d32d1b211e4c30d522deb3af7af49b58a6cb5f /core | |
| parent | 9a3a83e16a5a65229ffeebafe739fffd524499bc (diff) | |
| download | nextcloud-server-45074d5023d408f4f81bc45380ce68b1008f9414.tar.gz nextcloud-server-45074d5023d408f4f81bc45380ce68b1008f9414.zip | |
restoring feature to send sharing link via email
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/share.css | 14 | ||||
| -rw-r--r-- | core/js/share.js | 12 |
2 files changed, 20 insertions, 6 deletions
diff --git a/core/css/share.css b/core/css/share.css index 5aca731356a..e806d25982e 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -50,11 +50,17 @@ padding-top:.5em; } - #dropdown input[type="text"],#dropdown input[type="password"] { - width:90%; - } +#dropdown input[type="text"],#dropdown input[type="password"] { + width:90%; +} + +#dropdown form { + font-size: 100%; + margin-left: 0; + margin-right: 0; +} - #linkText,#linkPass,#expiration { +#linkText,#linkPass,#expiration { display:none; } diff --git a/core/js/share.js b/core/js/share.js index 475abb58bff..962983e2f35 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -168,6 +168,10 @@ OC.Share={ html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; html += '</div>'; + html += '<form id="emailPrivateLink" >'; + html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />'; + html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />'; + html += '</form>'; } html += '<div id="expiration">'; html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>'; @@ -349,13 +353,17 @@ OC.Share={ $('#linkPassText').attr('placeholder', t('core', 'Password protected')); } $('#expiration').show(); + $('#emailPrivateLink #email').show(); + $('#emailPrivateLink #emailButton').show(); }, hideLink:function() { $('#linkText').hide('blind'); $('#showPassword').hide(); $('#linkPass').hide(); - }, - dirname:function(path) { + $('#emailPrivateLink #email').hide(); + $('#emailPrivateLink #emailButton').hide(); + }, + dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, showExpirationDate:function(date) { |