diff options
author | Richard Beales <[email protected]> | 2013-03-19 18:19:07 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-19 18:19:07 +0000 |
commit | 05809dfdf7cbf7699be6408c0f49d325585726b5 (patch) | |
tree | bfa33dcd1cf8707e65a05df98d27d563396520d2 /classes/feeds.php | |
parent | 1d707e9f03d1a654e0807aadce7ab790befd0b95 (diff) | |
parent | 2229e6ed6b07d4a28b04689a21c645bdb83652f7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes/feeds.php')
-rw-r--r-- | classes/feeds.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index d6cd2a255..d598a9e4f 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -126,6 +126,11 @@ class Feeds extends Handler_Protected { "</option>"; } + if ($pluginhost->get_plugin("mailto")) { + $reply .= "<option value=\"mailtoArticle(false)\">".__('Forward by email'). + "</option>"; + } + $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>"; $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>"; @@ -400,11 +405,11 @@ class Feeds extends Handler_Protected { $cur_feed_title = htmlspecialchars($cur_feed_title); - $vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)"; + $vf_catchup_link = "(<a class='catchup' onclick='catchupFeedInGroup($feed_id);' href='#'>".__('Mark as read')."</a>)"; $reply['content'] .= "<div class='cdmFeedTitle'>". "<div style=\"float : right\">$feed_icon_img</div>". - "<a href=\"#\" onclick=\"viewfeed($feed_id)\">". + "<a class='title' href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> $vf_catchup_link</div>"; } @@ -490,7 +495,7 @@ class Feeds extends Handler_Protected { $cur_feed_title = htmlspecialchars($cur_feed_title); - $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)"; + $vf_catchup_link = "(<a class='catchup' onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)"; $has_feed_icon = feed_has_icon($feed_id); @@ -502,7 +507,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<div class='cdmFeedTitle'>". "<div style=\"float : right\">$feed_icon_img</div>". - "<a href=\"#\" onclick=\"viewfeed($feed_id)\">". + "<a href=\"#\" class='title' onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> $vf_catchup_link</div>"; } } @@ -539,7 +544,7 @@ class Feeds extends Handler_Protected { target=\"_blank\" href=\"". htmlspecialchars($line["link"])."\">". $line["title"] . - " $entry_author</a>"; + " <span class=\"author\">$entry_author</span></a>"; $reply['content'] .= $labels_str; |