mirror of
https://github.com/friendica/friendica
synced 2024-11-18 10:23:41 +00:00
Use popup ACL selector in photo upload. js_upload use new acl selector.
This commit is contained in:
parent
7a069c1438
commit
19c93adf84
4 changed files with 35 additions and 15 deletions
|
@ -92,15 +92,25 @@ function createUploader() {
|
||||||
|
|
||||||
debug: true,
|
debug: true,
|
||||||
onSubmit: function(id,filename) {
|
onSubmit: function(id,filename) {
|
||||||
|
if (typeof acl!="undefined"){
|
||||||
uploader.setParams( {
|
uploader.setParams( {
|
||||||
newalbum : document.getElementById('photos-upload-newalbum').value,
|
newalbum : document.getElementById('photos-upload-newalbum').value,
|
||||||
album : document.getElementById('photos-upload-album-select').value,
|
album : document.getElementById('photos-upload-album-select').value,
|
||||||
group_allow : getSelected(document.getElementById('group_allow')).join(','),
|
group_allow : acl.allow_gid.join(','),
|
||||||
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
|
contact_allow : acl.allow_cid.join(','),
|
||||||
group_deny : getSelected(document.getElementById('group_deny')).join(','),
|
group_deny : acl.deny_gid.join(','),
|
||||||
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
|
contact_deny : acl.deny_cid.join(',')
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
uploader.setParams( {
|
||||||
|
newalbum : document.getElementById('photos-upload-newalbum').value,
|
||||||
|
album : document.getElementById('photos-upload-album-select').value,
|
||||||
|
group_allow : getSelected(document.getElementById('group_allow')).join(','),
|
||||||
|
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
|
||||||
|
group_deny : getSelected(document.getElementById('group_deny')).join(','),
|
||||||
|
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,13 +14,16 @@
|
||||||
<div id="photos-upload-exist-end"></div>
|
<div id="photos-upload-exist-end"></div>
|
||||||
|
|
||||||
|
|
||||||
<div id="photos-upload-perms" class="photos-upload-perms" ><div id="photos-upload-perms-menu" onClick="openClose('photos-upload-permissions-wrapper');" />$permissions</div>
|
<div id="photos-upload-perms" class="photos-upload-perms" >
|
||||||
|
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" />
|
||||||
|
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
||||||
|
</a>
|
||||||
<div id="photos-upload-perms-end"></div>
|
<div id="photos-upload-perms-end"></div>
|
||||||
|
|
||||||
<div id="photos-upload-permissions-wrapper" style="display: none;" >
|
<div style="display: none;">
|
||||||
|
<div id="photos-upload-permissions-wrapper">
|
||||||
$aclselect
|
$aclselect
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="photos-upload-spacer"></div>
|
<div id="photos-upload-spacer"></div>
|
||||||
|
@ -32,3 +35,9 @@
|
||||||
<div class="photos-upload-end" ></div>
|
<div class="photos-upload-end" ></div>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$("a#photos-upload-perms-menu").fancybox({
|
||||||
|
'transitionIn' : 'none',
|
||||||
|
'transitionOut' : 'none'
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
|
@ -1491,7 +1491,7 @@ input#dfrn-url {
|
||||||
|
|
||||||
|
|
||||||
/** acl **/
|
/** acl **/
|
||||||
|
#photos-upload-permissions-wrapper,
|
||||||
#profile-jot-acl-wrapper{
|
#profile-jot-acl-wrapper{
|
||||||
display:block!important;
|
display:block!important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1569,6 +1569,7 @@ padding: 5px 10px 0px;
|
||||||
|
|
||||||
|
|
||||||
/** acl **/
|
/** acl **/
|
||||||
|
#photos-upload-permissions-wrapper,
|
||||||
#profile-jot-acl-wrapper{
|
#profile-jot-acl-wrapper{
|
||||||
display:block!important;
|
display:block!important;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue