add more present info about remote shares, fix layout of inputs

diff --git a/core/css/share.css b/core/css/share.css
index 448f0bac239c99b3eb2e356541d73cd5e2cc8539..bcfd90e4204fcaefc44ecd2ebf1836172b6c5746 100644 (file)
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -37,8 +37,12 @@
        display: none !important;
 }
 
+#dropdown .shareWithRemoteInfo {
+       padding: 11px 20px;
+}
+
 #dropdown .avatar {
-       margin-right: 2px;
+       margin-right: 8px;
        display: inline-block;
        overflow: hidden;
        vertical-align: middle;
@@ -108,7 +112,8 @@ a.unshare {
 }
 
 #dropdown input[type="text"],#dropdown input[type="password"] {
-       width:90%;
+       width: 86%;
+       margin-left: 7px;
 }
 
 #dropdown form {

diff --git a/core/js/share.js b/core/js/share.js
index 0a36ca2bdbbddcf0e30cd16a99adbb1330dbf524..646123a60556d36e614f10332077a6af87193be7 100644 (file)
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -398,6 +398,11 @@ OC.Share={
 
                        html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
                        html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />';
+                       if(oc_appconfig.core.remoteShareAllowed) {
+                               html += '<a target="_blank" class="icon-info shareWithRemoteInfo" '
+                                       + 'title="'+t('core', 'Share with people on other ownClouds using the syntax username@example.com/owncloud')+'" '
+                                       + 'href="https://doc.owncloud.org/server/8.0/user_manual/files/federated_cloud_sharing.html"></a>';
+                       }
                        html += '<span class="shareWithLoading icon-loading-small hidden"></span>';
                        html += '<ul id="shareWithList">';
                        html += '</ul>';
@@ -448,6 +453,11 @@ OC.Share={
                        dropDownEl = $(html);
                        dropDownEl = dropDownEl.appendTo(appendTo);
 
+                       // trigger remote share info tooltip
+                       if(oc_appconfig.core.remoteShareAllowed) {
+                               $('.shareWithRemoteInfo').tipsy({gravity: 'e'});
+                       }
+
                        //Get owner avatars
                        if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
                                dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);