mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Jan-Christoph Borchardt 2015-04-09 10:16:29 +02:00
parent 0d3bea37c3
commit 000b09ee7a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/css/share.css
View File

@ -37,8 +37,12 @@
display: none !important; display: none !important;
} }
#dropdown .shareWithRemoteInfo {
padding: 11px 20px;
}
#dropdown .avatar { #dropdown .avatar {
margin-right: 2px; margin-right: 8px;
display: inline-block; display: inline-block;
overflow: hidden; overflow: hidden;
vertical-align: middle; vertical-align: middle;
@ -108,7 +112,8 @@ a.unshare {
} }
#dropdown input[type="text"],#dropdown input[type="password"] { #dropdown input[type="text"],#dropdown input[type="password"] {
width:90%; width: 86%;
margin-left: 7px;
} }
#dropdown form { #dropdown form {

10
core/js/share.js
View File

@ -398,6 +398,11 @@ OC.Share={
html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>'; html += '<label for="shareWith" class="hidden-visually">'+t('core', 'Share')+'</label>';
html += '<input id="shareWith" type="text" placeholder="' + sharePlaceholder + '" />'; 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 += '<span class="shareWithLoading icon-loading-small hidden"></span>';
html += '<ul id="shareWithList">'; html += '<ul id="shareWithList">';
html += '</ul>'; html += '</ul>';
@ -448,6 +453,11 @@ OC.Share={
dropDownEl = $(html); dropDownEl = $(html);
dropDownEl = dropDownEl.appendTo(appendTo); dropDownEl = dropDownEl.appendTo(appendTo);
// trigger remote share info tooltip
if(oc_appconfig.core.remoteShareAllowed) {
$('.shareWithRemoteInfo').tipsy({gravity: 'e'});
}
//Get owner avatars //Get owner avatars
if (oc_config.enable_avatars === true && data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) { 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); dropDownEl.find(".avatar").avatar(data.reshare.uid_owner, 32);