From a1861d1128aacc1ab98b33a1d035bfc27c9979f5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 26 Feb 2012 16:29:06 -0800 Subject: [PATCH] tagging missing from wallwall and a couple of themes, star missing from dispy --- include/conversation.php | 14 ++++++++++++-- mod/tagger.php | 1 + view/theme/dispy/premium.png | Bin 0 -> 2317 bytes view/theme/dispy/star.png | Bin 0 -> 2129 bytes view/theme/dispy/style.css | 15 +++++++++++++++ view/theme/dispy/tag.png | Bin 0 -> 535 bytes view/theme/dispy/wall_item.tpl | 1 + view/theme/dispy/wallwall_item.tpl | 1 + view/theme/duepuntozero/wallwall_item.tpl | 1 + view/theme/loozah/wall_item.tpl | 2 ++ view/theme/loozah/wallwall_item.tpl | 1 + view/theme/vier/wallwall_item.tpl | 1 + view/wallwall_item.tpl | 2 ++ 13 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 view/theme/dispy/premium.png create mode 100755 view/theme/dispy/star.png create mode 100644 view/theme/dispy/tag.png diff --git a/include/conversation.php b/include/conversation.php index 53369cf20f..2ef37694dc 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -6,6 +6,11 @@ function localize_item(&$item){ $Text = $item['body']; + + + // find private image (w/data url) if present and convert image + // link to a magic-auth redirect. + $saved_image = ''; $img_start = strpos($Text,'[img]data:'); $img_end = strpos($Text,'[/img]'); @@ -403,6 +408,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $toplevelprivate = false; // Take care of author collapsing and comment collapsing + // (author collapsing is currently disabled) // If a single author has more than 3 consecutive top-level posts, squash the remaining ones. // If there are more than two comments, squash all but the last 2. @@ -410,7 +416,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $toplevelprivate = (($toplevelpost && $item['private']) ? true : false); $item_writeable = (($item['writable'] || $item['self']) ? true : false); - /*if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) { + // DISABLED + /* + if($blowhard == $item['cid'] && (! $item['self']) && ($mode != 'profile') && ($mode != 'notes')) { $blowhard_count ++; if($blowhard_count == 3) { $o .= '
WN@{X5y)gRayD!npy6=HG1sIdP18Wv^*1nM4ASW|;KbJJb&@T?lEA_S z4ofnbglIJCf{`$lN-5xcKF?nt&_<&X7qVTFL?S_w!{IOyVhwwEr%)(xuR{6@#bS{o zyO?<*iO1taglDW_5AS>$d3O#q Z1^_p4FDQ4H6ZZfB002ovPDHLkV1l)X^V$Fa literal 0 HcmV?d00001 diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 9c3703f5fd..882843a093 100755 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -24,6 +24,7 @@
{{ if $star }} + {{ endif }} {{ if $vote }}