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

67
mod/photos.php
View file

@ -42,7 +42,7 @@ function photos_init(&$a) {
$sql_extra = permissions_sql($a->data['user']['uid']); $sql_extra = permissions_sql($a->data['user']['uid']);
$albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra group by album order by created desc", $sql_extra group by album order by created desc",
intval($a->data['user']['uid']), intval($a->data['user']['uid']),
dbesc('Contact Photos'), dbesc('Contact Photos'),
@ -156,7 +156,7 @@ function photos_post(&$a) {
killme(); killme();
} }
$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1", WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1",
intval($page_owner_uid) intval($page_owner_uid)
); );
@ -167,7 +167,7 @@ function photos_post(&$a) {
killme(); killme();
} }
$owner_record = $r[0]; $owner_record = $r[0];
if(($a->argc > 3) && ($a->argv[2] === 'album')) { if(($a->argc > 3) && ($a->argv[2] === 'album')) {
@ -377,7 +377,7 @@ function photos_post(&$a) {
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
if((x($_POST,'rotate') !== false) && if((x($_POST,'rotate') !== false) &&
( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) { ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
logger('rotate'); logger('rotate');
@ -488,8 +488,8 @@ function photos_post(&$a) {
$arr['visible'] = $visibility; $arr['visible'] = $visibility;
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']'
. '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]' . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]'
. '[/url]'; . '[/url]';
$item_id = item_store($arr); $item_id = item_store($arr);
@ -741,7 +741,7 @@ function photos_post(&$a) {
* overwhelm the data stream with a hundred newly uploaded photos. * overwhelm the data stream with a hundred newly uploaded photos.
* So we will make the first photo uploaded to this album in the last several hours * So we will make the first photo uploaded to this album in the last several hours
* visible by default, the rest will become visible over time when and if * visible by default, the rest will become visible over time when and if
* they acquire comments, likes, dislikes, and/or tags * they acquire comments, likes, dislikes, and/or tags
* *
*/ */
@ -753,7 +753,7 @@ function photos_post(&$a) {
$visible = 1; $visible = 1;
else else
$visible = 0; $visible = 0;
if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
$visible = 0; $visible = 0;
@ -819,7 +819,7 @@ function photos_post(&$a) {
call_hooks('photo_post_end',$foo); call_hooks('photo_post_end',$foo);
killme(); killme();
} }
$ph = new Photo($imagedata, $type); $ph = new Photo($imagedata, $type);
@ -867,7 +867,7 @@ function photos_post(&$a) {
$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 2; $smallest = 2;
} }
$basename = basename($filename); $basename = basename($filename);
$uri = item_new_uri($a->get_hostname(), $page_owner_uid); $uri = item_new_uri($a->get_hostname(), $page_owner_uid);
@ -897,8 +897,8 @@ function photos_post(&$a) {
$arr['visible'] = $visible; $arr['visible'] = $visible;
$arr['origin'] = 1; $arr['origin'] = 1;
$arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']'
. '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]'
. '[/url]'; . '[/url]';
$item_id = item_store($arr); $item_id = item_store($arr);
@ -957,7 +957,7 @@ function photos_content(&$a) {
$_SESSION['photo_return'] = $a->cmd; $_SESSION['photo_return'] = $a->cmd;
// //
// Parse arguments // Parse arguments
// //
if($a->argc > 3) { if($a->argc > 3) {
@ -1174,14 +1174,14 @@ function photos_content(&$a) {
)); ));
return $o; return $o;
} }
if($datatype === 'album') { if($datatype === 'album') {
$album = hex2bin($datum); $album = hex2bin($datum);
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id`", AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
intval($owner_uid), intval($owner_uid),
dbesc($album) dbesc($album)
@ -1196,7 +1196,7 @@ function photos_content(&$a) {
else else
$order = 'DESC'; $order = 'DESC';
$r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s'
AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d", AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT %d , %d",
intval($owner_uid), intval($owner_uid),
dbesc($album), dbesc($album),
@ -1260,7 +1260,7 @@ function photos_content(&$a) {
$imgalt_e = $rr['filename']; $imgalt_e = $rr['filename'];
$desc_e = $rr['desc']; $desc_e = $rr['desc'];
} }
$photos[] = array( $photos[] = array(
'id' => $rr['id'], 'id' => $rr['id'],
'twist' => ' ' . $twist . rand(2,4), 'twist' => ' ' . $twist . rand(2,4),
@ -1299,7 +1299,7 @@ function photos_content(&$a) {
//$o = ''; //$o = '';
// fetch image, item containing image, then comments // fetch image, item containing image, then comments
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
$sql_extra ORDER BY `scale` ASC ", $sql_extra ORDER BY `scale` ASC ",
intval($owner_uid), intval($owner_uid),
dbesc($datum) dbesc($datum)
@ -1375,8 +1375,8 @@ function photos_content(&$a) {
); );
// lock // lock
$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid']) $lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) ) || strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
? t('Private Message') ? t('Private Message')
: Null); : Null);
@ -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'),
@ -1665,8 +1664,8 @@ function photos_content(&$a) {
$profile_link = $profile_url; $profile_link = $profile_url;
$dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())); $dropping = (($item['contact-id'] == $contact_id) || ($item['uid'] == local_user()));
$drop = array( $drop = array(
'dropping' => $dropping, 'dropping' => $dropping,
@ -1774,7 +1773,7 @@ function photos_content(&$a) {
// Default - show recent photos with upload link (if applicable) // Default - show recent photos with upload link (if applicable)
//$o = ''; //$o = '';
$r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $r = q("SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra GROUP BY `resource-id`", $sql_extra GROUP BY `resource-id`",
intval($a->data['user']['uid']), intval($a->data['user']['uid']),
dbesc('Contact Photos'), dbesc('Contact Photos'),
@ -1786,7 +1785,7 @@ function photos_content(&$a) {
} }
$r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` $r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo`
WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d",
intval($a->data['user']['uid']), intval($a->data['user']['uid']),
dbesc('Contact Photos'), dbesc('Contact Photos'),
@ -1806,7 +1805,7 @@ function photos_content(&$a) {
else else
$twist = 'rotright'; $twist = 'rotright';
$ext = $phototypes[$rr['type']]; $ext = $phototypes[$rr['type']];
if($a->theme['template_engine'] === 'internal') { if($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']); $alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']); $name_e = template_escape($rr['album']);

30
view/templates/photo_edit.tpl
View file

@ -4,36 +4,20 @@
<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}}"/>
<span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}} <span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}}
</a> </a>
<div id="photo-edit-perms-menu-end"></div> <div id="photo-edit-perms-menu-end"></div>
<div style="display: none;"> <div style="display: none;">
<div id="photo-edit-perms-select" > <div id="photo-edit-perms-select" >
{{$aclselect}} {{$aclselect}}

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;