aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addon/js_upload/js_upload.php28
-rw-r--r--view/photos_upload.tpl19
-rw-r--r--view/theme/duepuntozero/style.css2
-rw-r--r--view/theme/loozah/style.css1
4 files changed, 35 insertions, 15 deletions
diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php
index 06a907603..331548f88 100644
--- a/addon/js_upload/js_upload.php
+++ b/addon/js_upload/js_upload.php
@@ -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(',')
+ });
+ }
}
});
}
diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl
index 2dbcddefd..10240b596 100644
--- a/view/photos_upload.tpl
+++ b/view/photos_upload.tpl
@@ -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>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 90ed2119c..6a909bc7d 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1491,7 +1491,7 @@ input#dfrn-url {
/** acl **/
-
+#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper{
display:block!important;
}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index f46fa0064..96702d320 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1569,6 +1569,7 @@ padding: 5px 10px 0px;
/** acl **/
+#photos-upload-permissions-wrapper,
#profile-jot-acl-wrapper{
display:block!important;
}