diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-23 05:03:05 -0400 |
commit | bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4 (patch) | |
tree | 93cd7fe6c2b9b0cc5851cb8324b5f6591d990f7f /view/photo_edit.tpl | |
parent | e56af0e09e0852c7215546d6f9db32ce5cc21b39 (diff) | |
parent | 61dba985c14ebcfd20d18b579aee9b781f98bc23 (diff) | |
download | volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.gz volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.tar.bz2 volse-hubzilla-bd12902d7b384c4ba38ae40c4fa1f34f7e5393b4.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
photo rotation
event calendar theming
import quattro event reminder
mark bubbles unsupported
keep FB out of private notes
clear submanage, etc from session on logout
if identity (uid) changes - reload any other open browser windows on next ping.
* master:
Diffstat (limited to 'view/photo_edit.tpl')
-rw-r--r-- | view/photo_edit.tpl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index 9950cc4ac..f6059a7ec 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -17,6 +17,11 @@ <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"/> |