friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

even more fixes

This commit is contained in:
Mike Macgirvin 2010-08-10 21:22:36 -07:00
parent 06bdf8a4cf
commit 9662c44a17
9 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/items.php
View File

@ -93,6 +93,7 @@ function get_feed_for(&$a,$dfrn_id,$owner_id,$last_update) {
'$name' => xmlify($owner['name']), '$name' => xmlify($owner['name']),
'$profile_page' => xmlify($owner['url']), '$profile_page' => xmlify($owner['url']),
'$photo' => xmlify($owner['photo']), '$photo' => xmlify($owner['photo']),
'$thumb' => xmlify($owner['thumb']),
'$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) , '$picdate' => xmlify(datetime_convert('UTC','UTC',$owner['avatar-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
'$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) , '$uridate' => xmlify(datetime_convert('UTC','UTC',$owner['uri-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,
'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) , '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , 'Y-m-d\TH:i:s\Z')) ,

2
mod/dfrn_poll.php
View File

@ -15,7 +15,7 @@ function dfrn_poll_init(&$a) {
if(x($_GET,'last_update')) if(x($_GET,'last_update'))
$last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update']; $last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
if(($dfrn_id == '') && ($a->argc > 1)) { if(($dfrn_id == '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
$o = get_feed_for($a,'*', $a->argv[1],$last_update); $o = get_feed_for($a,'*', $a->argv[1],$last_update);
echo $o; echo $o;
killme(); killme();

4
mod/item.php
View File

@ -89,7 +89,7 @@ function item_post(&$a) {
if(count($r)) if(count($r))
$contact_record = $r[0]; $contact_record = $r[0];
$post_type == notags(trim($_POST['type'])); $post_type = notags(trim($_POST['type']));
if($post_type == 'net-comment') { if($post_type == 'net-comment') {
if($parent_item !== null) { if($parent_item !== null) {
@ -170,7 +170,7 @@ function item_post(&$a) {
); );
// photo comments turn the corresponding item visible to the profile wall // photo comments turn the corresponding item visible to the profile wall
if(! $parent_item['visible']) { if(! $parent_item['visible']) {
$r = q("UPDATE `item` SET `visible = 1 WHERE `id` = %d LIMIT 1", $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d LIMIT 1",
intval($parent_item['id']) intval($parent_item['id'])
); );
} }

3
mod/network.php
View File

@ -172,6 +172,9 @@ function network_content(&$a, $update = false) {
'$id' => $item['item_id'], '$id' => $item['item_id'],
'$parent' => $item['parent'], '$parent' => $item['parent'],
'$profile_uid' => $_SESSION['uid'], '$profile_uid' => $_SESSION['uid'],
'$mylink' => $a->contact['url'],
'$mytitle' => t('Me'),
'$myphoto' => $a->contact['thumb'],
'$ww' => $commentww '$ww' => $commentww
)); ));
} }

3
mod/profile.php
View File

@ -238,6 +238,9 @@ function profile_content(&$a, $update = false) {
'$id' => $item['item_id'], '$id' => $item['item_id'],
'$parent' => $item['parent'], '$parent' => $item['parent'],
'$profile_uid' => $a->profile['uid'], '$profile_uid' => $a->profile['uid'],
'$mylink' => $a->contact['url'],
'$mytitle' => t('Me'),
'$myphoto' => $a->contact['thumb'],
'$ww' => '' '$ww' => ''
)); ));
} }

6
view/comment_item.tpl
View File

@ -7,9 +7,13 @@
<input type="hidden" name="parent" value="$parent" /> <input type="hidden" name="parent" value="$parent" />
<input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="return" value="$return_path" />
<div class="comment-edit-photo" id="comment-edit-photo-$id" >
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >Comment</textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" > <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" /> <input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
</div> </div>

6
view/head.tpl
View File

@ -67,8 +67,14 @@
$('#' + prev).after($(this)); $('#' + prev).after($(this));
} }
else { else {
$('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago')); $('#' + ident + ' ' + '.wall-item-ago').replaceWith($(this).find('.wall-item-ago'));
$('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper')); $('#' + ident + ' ' + '.wall-item-comment-wrapper').replaceWith($(this).find('.wall-item-comment-wrapper'));
$('#' + ident + ' ' + '.my-comment-photo').each(function() {
$(this).attr('src',$(this).attr('dst'));
});
} }
prev = ident; prev = ident;
}); });

27
view/style.css
View File

@ -547,11 +547,11 @@ input#dfrn-url {
clear: both; clear: both;
} }
.wall-item-outside-wrapper { .wall-item-content-wrapper {
margin-top: 10px; margin-top: 10px;
} }
.wall-item-outside-wrapper.comment { .wall-item-content-wrapper.comment {
margin-left: 50px; margin-left: 50px;
background: #F7F7F7; background: #F7F7F7;
} }
@ -624,14 +624,35 @@ input#dfrn-url {
.comment-edit-wrapper { .comment-edit-wrapper {
margin-top: 15px; margin-top: 15px;
margin-left: 100px; background: #F7F7F7;
margin-left: 50px;
} }
.comment-wwedit-wrapper { .comment-wwedit-wrapper {
margin-top: 15px; margin-top: 15px;
background: #F7F7F7;
margin-left: 250px; margin-left: 250px;
} }
.comment-edit-photo {
margin-top: 10px;
margin-left: 10px;
margin-bottom: 10px;
width: 100px;
float: left;
}
.comment-edit-text-empty, .comment-edit-text-full {
float: left;
margin-top: 40px;
}
.comment-edit-text-end {
clear: both;
}
.comment-edit-submit {
margin-left: 110px;
margin-top: 10px;
}
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
margin-top: 15px; margin-top: 15px;

28
view/wall_item.tpl
View File

@ -1,20 +1,22 @@
<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" > <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" > <div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id"> <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a> <a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
</div> <img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
</div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" > <div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> <a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a>
<div class="wall-item-ago" id="wall-item-ago-$id">$ago</div> <div class="wall-item-ago" id="wall-item-ago-$id">$ago</div>
</div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
$drop
</div> </div>
<div class="wall-item-content" id="wall-item-content-$id" >
<div class="wall-item-title" id="wall-item-title-$id">$title</div>
<div class="wall-item-body" id="wall-item-body-$id" >$body</div>
</div>
$drop
<div class="wall-item-wrapper-end"></div> <div class="wall-item-wrapper-end"></div>
<div class="wall-item-comment-separator"></div>
<div class="wall-item-comment-wrapper" > <div class="wall-item-comment-wrapper" >
$comment $comment
</div> </div>