harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a couple of things that went wonky when moving to thread objects

Browse Source
This commit is contained in:
friendica 2012-10-27 03:05:51 -07:00
parent 5b1a15704b
commit 0baf4bb4d2
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/ItemObject.php
View File

@ -121,13 +121,17 @@ class Item extends BaseObject {
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true); $diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']);
if($item['author-link'] && (! $item['author-name']))
$profile_name = $item['author-link']; $profile_avatar = $item['author']['xchan_photo_m'];
$profile_link = zrl($item['author']['xchan_profile']);
$profile_name = $item['author']['xchan_name'];
// if($item['author-link'] && (! $item['author-name']))
// $profile_name = $item['author-link'];
$sp = false; $sp = false;
$profile_link = best_link_url($item,$sp); // $profile_link = best_link_url($item,$sp);
if($profile_link === 'mailbox')
$profile_link = '';
if($sp) if($sp)
$sparkle = ' sparkle'; $sparkle = ' sparkle';
else else
@ -136,11 +140,11 @@ class Item extends BaseObject {
$profile_link = zrl($item['author']['xchan_profile']); $profile_link = zrl($item['author']['xchan_profile']);
$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']); // $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
if(($normalised != 'mailbox') && (x($a->contacts,$normalised))) // if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
$profile_avatar = $a->contacts[$normalised]['thumb']; // $profile_avatar = $a->contacts[$normalised]['thumb'];
else // else
$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb'))); // $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb')));
$profile_avatar = $item['author']['xchan_photo_m']; $profile_avatar = $item['author']['xchan_photo_m'];

6
view/theme/duepuntozero/css/style.css
View File

@ -958,7 +958,7 @@ input#dfrn-url {
#network-bmark-link { #network-bmark-link {
margin-top: 10px; margin-top: 10px;
} }
.tread-wrapper .wall-item-comment-wrapper { .thread-wrapper .wall-item-comment-wrapper {
margin-left: 50px; margin-left: 50px;
} }
@ -968,11 +968,11 @@ input#dfrn-url {
position: relative; position: relative;
} }
.tread-wrapper .tread-wrapper { .thread-wrapper .thread-wrapper {
margin-left: 50px; margin-left: 50px;
} }
.tread-end-wrapper { .thread-end-wrapper {
margin-left: 50px; margin-left: 50px;
} }

2
view/tpl/wall_thread.tpl
View File

@ -4,7 +4,7 @@
</div> </div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{endif}} {{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <div id="thread-wrapper-$item.id" class="thread-wrapper $item.toplevel">
<a name="$item.id" ></a> <a name="$item.id" ></a>
<div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing{{ if $item.owner_url }} wallwall{{ endif }}" id="wall-item-outside-wrapper-$item.id" >
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >