diff options
author | Friendika <info@friendika.com> | 2011-07-21 06:10:30 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-07-21 06:10:30 -0700 |
commit | a13eaf915c70a69f877605622b249cc1c2c46621 (patch) | |
tree | e0bb6d7ddfde766e1749a5a948996abaf5cc6656 | |
parent | 1d7d4bf8c6dcd8d3d70129d5a09228a62851cc74 (diff) | |
parent | 096ecba8836318b8c61ae70431ce7cff50c2cf8b (diff) | |
download | volse-hubzilla-a13eaf915c70a69f877605622b249cc1c2c46621.tar.gz volse-hubzilla-a13eaf915c70a69f877605622b249cc1c2c46621.tar.bz2 volse-hubzilla-a13eaf915c70a69f877605622b249cc1c2c46621.zip |
Merge pull request #143 from fabrixxm/newacl
Use new ACL selector in photo edit
-rw-r--r-- | view/photo_edit.tpl | 21 | ||||
-rw-r--r-- | view/theme/duepuntozero/style.css | 1 | ||||
-rw-r--r-- | view/theme/loozah/style.css | 1 |
3 files changed, 17 insertions, 6 deletions
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index ceb1ddca3..839e41ee7 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -19,13 +19,15 @@ <div id="photo-edit-tags-end"></div> <div id="photo-edit-perms" class="photo-edit-perms" > - <div id="photo-edit-perms-menu" class="fakelink" onClick="openClose('photo-edit-perms-select');" >$permissions</div> + <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" title="$permissions"/> + <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions + </a> <div id="photo-edit-perms-menu-end"></div> - - <div id="photo-edit-perms-select" style="display: none;" > - - $aclselect - + + <div style="display: none;"> + <div id="photo-edit-perms-select" > + $aclselect + </div> </div> </div> <div id="photo-edit-perms-end"></div> @@ -35,3 +37,10 @@ <div id="photo-edit-end"></div> </form> + +<script> + $("a#photo-edit-perms-menu").fancybox({ + 'transitionIn' : 'none', + 'transitionOut' : 'none' + }); +</script> diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 6a909bc7d..e2b1a57dc 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1491,6 +1491,7 @@ input#dfrn-url { /** acl **/ +#photo-edit-perms-select, #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 96702d320..c58bda5bb 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -1569,6 +1569,7 @@ padding: 5px 10px 0px; /** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper{ display:block!important; |