Browse Source

Use popup ACL selector in photo upload. js_upload use new acl selector.

pull/1/head
Fabio Comuni 10 years ago
parent
commit
19c93adf84
4 changed files with 35 additions and 15 deletions
  1. +19
    -9
      addon/js_upload/js_upload.php
  2. +14
    -5
      view/photos_upload.tpl
  3. +1
    -1
      view/theme/duepuntozero/style.css
  4. +1
    -0
      view/theme/loozah/style.css

+ 19
- 9
addon/js_upload/js_upload.php View File

@ -92,15 +92,25 @@ function createUploader() {
debug: true,
onSubmit: function(id,filename) {
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(',')
});
if (typeof acl!="undefined"){
uploader.setParams( {
newalbum : document.getElementById('photos-upload-newalbum').value,
album : document.getElementById('photos-upload-album-select').value,
group_allow : acl.allow_gid.join(','),
contact_allow : acl.allow_cid.join(','),
group_deny : acl.deny_gid.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
- 5
view/photos_upload.tpl View File

@ -14,13 +14,16 @@
<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-permissions-wrapper" style="display: none;" >
$aclselect
<div style="display: none;">
<div id="photos-upload-permissions-wrapper">
$aclselect
</div>
</div>
<div id="photos-upload-spacer"></div>
@ -32,3 +35,9 @@
<div class="photos-upload-end" ></div>
</form>
<script>
$("a#photos-upload-perms-menu").fancybox({
'transitionIn' : 'none',
'transitionOut' : 'none'
});
</script>

+ 1
- 1
view/theme/duepuntozero/style.css View File

@ -1491,7 +1491,7 @@ input#dfrn-url {
/** acl **/
#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper{
display:block!important;
}


+ 1
- 0
view/theme/loozah/style.css View File

@ -1569,6 +1569,7 @@ padding: 5px 10px 0px;
/** acl **/
#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper{
display:block!important;
}


Loading…
Cancel
Save