aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/ItemObject.php24
-rw-r--r--view/theme/duepuntozero/css/style.css6
-rw-r--r--view/tpl/wall_thread.tpl2
3 files changed, 18 insertions, 14 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 6142d6a4d..e85461682 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -121,13 +121,17 @@ class Item extends BaseObject {
$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
$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;
- $profile_link = best_link_url($item,$sp);
- if($profile_link === 'mailbox')
- $profile_link = '';
+// $profile_link = best_link_url($item,$sp);
+
if($sp)
$sparkle = ' sparkle';
else
@@ -136,11 +140,11 @@ class Item extends BaseObject {
$profile_link = zrl($item['author']['xchan_profile']);
- $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
- if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
- $profile_avatar = $a->contacts[$normalised]['thumb'];
- else
- $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($this->get_data_value('thumb')));
+// $normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+// if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+// $profile_avatar = $a->contacts[$normalised]['thumb'];
+// else
+// $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'];
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 67a487295..3a78a9ddc 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -958,7 +958,7 @@ input#dfrn-url {
#network-bmark-link {
margin-top: 10px;
}
-.tread-wrapper .wall-item-comment-wrapper {
+.thread-wrapper .wall-item-comment-wrapper {
margin-left: 50px;
}
@@ -968,11 +968,11 @@ input#dfrn-url {
position: relative;
}
-.tread-wrapper .tread-wrapper {
+.thread-wrapper .thread-wrapper {
margin-left: 50px;
}
-.tread-end-wrapper {
+.thread-end-wrapper {
margin-left: 50px;
}
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl
index a67334e33..8dff61057 100644
--- a/view/tpl/wall_thread.tpl
+++ b/view/tpl/wall_thread.tpl
@@ -4,7 +4,7 @@
</div>
<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
{{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>
<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" >