MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1679 from fabrixxm/smallfixestothemes

Browse source 
use fields template in photo edit form
This commit is contained in:
Tobias Diekershoff 2015-06-23 09:12:25 +02:00
parent 2076b95179 35e9fc3b02
commit 24c91a4fed
6 changed files with 54 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mod/photos.php
View file

@ -1518,19 +1518,18 @@ function photos_content(&$a) {
$edit = replace_macros($edit_tpl, array( $edit = replace_macros($edit_tpl, array(
'$id' => $ph[0]['id'], '$id' => $ph[0]['id'],
'$rotatecw' => t('Rotate CW (right)'), '$album' => array('albname', t('New album name'), $album_e,''),
'$rotateccw' => t('Rotate CCW (left)'), '$caption' => array('desc', t('Caption'), $caption_e, ''),
'$album' => $album_e, '$tags' => array('newtag', t('Add a Tag'), "", t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping')),
'$newalbum' => t('New album name'), '$rotate_none' => array('rotate',t('Do not rotate'),0,'', true),
'$rotate_cw' => array('rotate',t('Rotate CW (right)'),1,''),
'$rotate_ccw' => array('rotate',t('Rotate CCW (left)'),2,''),
'$nickname' => $a->data['user']['nickname'], '$nickname' => $a->data['user']['nickname'],
'$resource_id' => $ph[0]['resource-id'], '$resource_id' => $ph[0]['resource-id'],
'$capt_label' => t('Caption'),
'$caption' => $caption_e,
'$tag_label' => t('Add a Tag'),
'$tags' => $link_item['tag'],
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$aclselect' => $aclselect_e, '$aclselect' => $aclselect_e,
'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0), '$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$delete' => t('Delete Photo'), '$delete' => t('Delete Photo'),

28
view/templates/photo_edit.tpl
View file

@ -4,29 +4,13 @@
<input type="hidden" name="item_id" value="{{$item_id}}" /> <input type="hidden" name="item_id" value="{{$item_id}}" />
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label> {{include file="field_input.tpl" field=$album}}
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album|escape:'html'}}" /> {{include file="field_input.tpl" field=$caption}}
{{include file="field_input.tpl" field=$tags}}
<div id="photo-edit-albumname-end"></div> {{include file="field_radio.tpl" field=$rotate_none}}
{{include file="field_radio.tpl" field=$rotate_cw}}
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label> {{include file="field_radio.tpl" field=$rotate_ccw}}
<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$caption|escape:'html'}}" />
<div id="photo-edit-caption-end"></div>
<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">
{{$rotatecw}}<br>
{{$rotateccw}}
</div>
<input type="radio" name="rotate" value="1" /><br>
<input type="radio" name="rotate" value="2" />
</div>
<div id="photo-edit-rotate-end"></div>
<div id="photo-edit-perms" class="photo-edit-perms" > <div id="photo-edit-perms" class="photo-edit-perms" >
<a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/> <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/>

3
view/theme/quattro/dark/style.css
View file

@ -2110,6 +2110,9 @@ ul.tabs li .active {
#photo-like-div .like-rotator { #photo-like-div .like-rotator {
float: right; float: right;
} }
#photo_edit_form {
padding: 1em;
}
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;

3
view/theme/quattro/green/style.css
View file

@ -2110,6 +2110,9 @@ ul.tabs li .active {
#photo-like-div .like-rotator { #photo-like-div .like-rotator {
float: right; float: right;
} }
#photo_edit_form {
padding: 1em;
}
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;

3
view/theme/quattro/lilac/style.css
View file

@ -2110,6 +2110,9 @@ ul.tabs li .active {
#photo-like-div .like-rotator { #photo-like-div .like-rotator {
float: right; float: right;
} }
#photo_edit_form {
padding: 1em;
}
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;

5
view/theme/quattro/quattro.less
View file

@ -1443,6 +1443,11 @@ ul.tabs {
.icon {float: left;} .icon {float: left;}
.like-rotator {float: right;} .like-rotator {float: right;}
} }
#photo_edit_form {
padding: 1em;
}
/* profile match wrapper */ /* profile match wrapper */
.profile-match-wrapper { .profile-match-wrapper {
float: left; float: left;