Merge pull request #143 from fabrixxm/newacl

Use new ACL selector in photo edit
This commit is contained in:
Friendika 2011-07-21 06:10:30 -07:00
commit a13eaf915c
3 changed files with 17 additions and 6 deletions

View File

@ -19,13 +19,15 @@
<div id="photo-edit-tags-end"></div> <div id="photo-edit-tags-end"></div>
<div id="photo-edit-perms" class="photo-edit-perms" > <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-menu-end"></div>
<div id="photo-edit-perms-select" style="display: none;" > <div style="display: none;">
<div id="photo-edit-perms-select" >
$aclselect $aclselect
</div>
</div> </div>
</div> </div>
<div id="photo-edit-perms-end"></div> <div id="photo-edit-perms-end"></div>
@ -35,3 +37,10 @@
<div id="photo-edit-end"></div> <div id="photo-edit-end"></div>
</form> </form>
<script>
$("a#photo-edit-perms-menu").fancybox({
'transitionIn' : 'none',
'transitionOut' : 'none'
});
</script>

View File

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

View File

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