diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-13 11:37:24 +0100 |
commit | a2ee5ebe427522228dc03dc81da11f348a399c4d (patch) | |
tree | 8bffe9c8c9abe370523816f7742e6e26364fa5b5 /view/photo_edit.tpl | |
parent | 8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 (diff) | |
parent | a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 (diff) | |
download | volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.gz volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.bz2 volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.zip |
Merge branch 'master' of git://github.com/friendika/friendika
Conflicts:
addon/twitter/twitter.php
Diffstat (limited to 'view/photo_edit.tpl')
-rw-r--r-- | view/photo_edit.tpl | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index bf8563b3c..ceb1ddca3 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -8,7 +8,6 @@ <div id="photo-edit-albumname-end"></div> - <label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label> <input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" /> @@ -16,8 +15,21 @@ <label id="photo-edit-tags-label" for="photo-edit-newtag" >$tag_label</label> <input name="newtag" id="photo-edit-newtag" size="84" title="$help_tags" type="text" /> + <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> + <div id="photo-edit-perms-menu-end"></div> + + <div id="photo-edit-perms-select" style="display: none;" > + + $aclselect + + </div> + </div> + <div id="photo-edit-perms-end"></div> + <input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" /> <input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; /> |