Merge https://github.com/friendica/friendica into pull

[friendica.git] / view / photo_edit.tpl

diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index bf8563b3c252a9fcc6c56d8baeee7210ef2ab3d8..f6059a7ecc2212f4af76c9c1db9d7f7c09021a98 100644 (file)
--- 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,10 +15,37 @@
 
        <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-rotate-wrapper">
+               <div id="photo-edit-rotate-label">$rotate</div>
+               <input type="checkbox" name="rotate" value="1" />
+       </div>
+       <div id="photo-edit-rotate-end"></div>
+
+       <div id="photo-edit-perms" class="photo-edit-perms" >
+               <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button" title="$permissions"/>
+                       <span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
+               </a>
+               <div id="photo-edit-perms-menu-end"></div>
+               
+               <div style="display: none;">
+                       <div id="photo-edit-perms-select" >
+                               $aclselect
+                       </div>
+               </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()"; />
 
        <div id="photo-edit-end"></div>
 </form>
+
+<script>
+       $("a#photo-edit-perms-menu").fancybox({
+               'transitionIn' : 'none',
+               'transitionOut' : 'none'
+       }); 
+</script>