diff options
| author | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
| commit | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (patch) | |
| tree | 5c00a04297478b8b6550c677d8799c404a0fddd7 /classes | |
| parent | 598a8f37a2ce94186166d1c3b22cc65efdebe4a4 (diff) | |
| parent | 54bc5594ab26ae961bb92c113a1d2815044e450f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 297cad300..c464303c1 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -517,7 +517,9 @@ class Feeds extends Handler_Protected { $mouseover_attrs = "onmouseover='postMouseIn($id)' onmouseout='postMouseOut($id)'"; - $reply['content'] .= "<div class=\"cdm $class\" + $expanded_class = $expand_cdm ? "expanded" : ""; + + $reply['content'] .= "<div class=\"cdm $expanded_class $class\" id=\"RROW-$id\" $mouseover_attrs'>"; $reply['content'] .= "<div class=\"cdmHeader\">"; @@ -548,6 +550,10 @@ class Feeds extends Handler_Protected { $reply['content'] .= $labels_str; + $reply['content'] .= "<span class='collapseBtn' style='display : none'> + <img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\" + title=\"".__("Collapse article")."\"/></span>"; + if (!$expand_cdm) $content_hidden = "style=\"display : none\""; else @@ -555,7 +561,6 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>"; - $reply['content'] .= "</span>"; if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { |