aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-11 17:09:02 -0700
committerfriendica <info@friendica.com>2014-03-11 17:09:02 -0700
commitc903ff7aab3f7d094d0ae0c37f9fe46887cf2363 (patch)
treeafcc6f21c242e1dc2f6ceadfa8a7a6b72a4eae6d
parent7733be7b58e9ffe36db7fd36b9a482fe6a842cd8 (diff)
downloadvolse-hubzilla-c903ff7aab3f7d094d0ae0c37f9fe46887cf2363.tar.gz
volse-hubzilla-c903ff7aab3f7d094d0ae0c37f9fe46887cf2363.tar.bz2
volse-hubzilla-c903ff7aab3f7d094d0ae0c37f9fe46887cf2363.zip
get rid of fancybox for photos upload, not just photo edit
-rw-r--r--view/js/mod_photos.js5
-rwxr-xr-xview/tpl/photos_upload.tpl2
2 files changed, 6 insertions, 1 deletions
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index c9d13f742..f0a0de253 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -3,6 +3,11 @@ var ispublic = aStr['everybody'];
$(document).ready(function() {
+ $("a#photos-upload-perms-menu").colorbox({
+ 'inline' : true,
+ 'transition' : 'elastic'
+ });
+
$("a#settings-default-perms-menu").colorbox({
'inline' : true,
'transition' : 'elastic'
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 102c4d872..3f1906086 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -24,7 +24,7 @@
<div id="photos-upload-perms" class="photos-upload-perms" >
- <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
+ <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />
<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
</a>
</div>