Merge pull request #5435 from owncloud/share-improvements

Share improvements

diff --cc apps/files/templates/index.php
Simple merge

diff --cc core/js/share.js
index 281cccaaef89687667466b127249650beef575b0,a8f28a4ec05ec11ebc4c6dde92868f99a484f418..50dbd9b7305ecb0bf62006b1ad97f455c23bbdbc
--- 1/core/js/share.js
--- 2/core/js/share.js
+++ b/core/js/share.js
@@@ -200,13 -200,24 +200,13 @@@ OC.Share=
                                }
                        });
  
-                       html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
+                       html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with user or group …')+'" />';
                        html += '<ul id="shareWithList">';
                        html += '</ul>';
 -                      var linksAllowed = false;
 -                      $.ajax({
 -                              type: 'GET',
 -                              url: OC.filePath('core', 'ajax', 'appconfig.php'),
 -                              data: { action:'getValue', app:'core', key:'shareapi_allow_links', defaultValue:'yes' },
 -                              async: false,
 -                              success: function(result) {
 -                                      if (result && result.status === 'success' && result.data === 'yes') {
 -                                              linksAllowed = true;
 -                                      }
 -                              }
 -                      });
 +                      var linksAllowed = $('#allowShareWithLink').val() === 'yes';
                        if (link && linksAllowed) {
                                html += '<div id="link">';
-                               html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>';
+                               html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
                                html += '<br />';
                                html += '<input id="linkText" type="text" readonly="readonly" />';
                                html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';