diff options
Diffstat (limited to 'classes')
-rwxr-xr-x | classes/article.php | 2 | ||||
-rw-r--r-- | classes/dlg.php | 2 | ||||
-rwxr-xr-x | classes/feeds.php | 19 | ||||
-rwxr-xr-x | classes/pref/feeds.php | 2 |
4 files changed, 13 insertions, 12 deletions
diff --git a/classes/article.php b/classes/article.php index 20febdf3b..282748ed1 100755 --- a/classes/article.php +++ b/classes/article.php @@ -877,7 +877,7 @@ class Article extends Handler_Protected { $tags_str = ""; for ($i = 0; $i < $maxtags; $i++) { - $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.viewfeed({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, "; + $tags_str .= "<a class=\"tag\" href=\"#\" onclick=\"Feeds.open({feed:'".$tags[$i]."'})\">" . $tags[$i] . "</a>, "; } $tags_str = mb_substr($tags_str, 0, mb_strlen($tags_str)-2); diff --git a/classes/dlg.php b/classes/dlg.php index 02249ea96..aa695ee18 100644 --- a/classes/dlg.php +++ b/classes/dlg.php @@ -139,7 +139,7 @@ class Dlg extends Handler_Protected { $key_escaped = str_replace("'", "\\'", $key); - echo "<a href=\"#\" onclick=\"Feeds.viewfeed({feed:'$key_escaped'}) \" style=\"font-size: " . + echo "<a href=\"#\" onclick=\"Feeds.open({feed:'$key_escaped'}) \" style=\"font-size: " . $size . "px\" title=\"$value articles tagged with " . $key . '">' . $key . '</a> '; } diff --git a/classes/feeds.php b/classes/feeds.php index 647414609..c9e5ca496 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -50,8 +50,8 @@ class Feeds extends Handler_Protected { $reply .= "<span class='r'> <a href=\"#\" - title=\"".__("View as RSS feed")."\" - onclick=\"Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\"> + title=\"".__("Show as feed")."\" + onclick=\"Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\"> <img class=\"noborder\" src=\"images/pub_set.png\"></a>"; @@ -137,7 +137,8 @@ class Feeds extends Handler_Protected { //$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>"; - $reply .= "<option value=\"Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>"; + $reply .= "<option value=\"Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">". + __('Show as feed')."</option>"; $reply .= "</select>"; @@ -392,7 +393,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>". "<div style='float : right'>$feed_icon_img</div>". - "<a class='title' href=\"#\" onclick=\"Feeds.viewfeed({feed:$feed_id})\">". + "<a class='title' href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">". $line["feed_title"]."</a> $vf_catchup_link</div>"; @@ -434,7 +435,7 @@ class Feeds extends Handler_Protected { if (@$line["feed_title"]) { $rgba = @$rgba_cache[$feed_id]; - $reply['content'] .= "<span class=\"feed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"Feeds.viewfeed({feed:$feed_id})\">". + $reply['content'] .= "<span class=\"feed\"><a style=\"background : rgba($rgba, 0.3)\" href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">". truncate_string($line["feed_title"],30)."</a></span>"; } } @@ -451,7 +452,7 @@ class Feeds extends Handler_Protected { if ($line["feed_title"] && !$vfeed_group_enabled) { - $reply['content'] .= "<span onclick=\"Feeds.viewfeed({feed:$feed_id})\" + $reply['content'] .= "<span onclick=\"Feeds.open({feed:$feed_id})\" style=\"cursor : pointer\" title=\"".htmlspecialchars($line['feed_title'])."\"> $feed_icon_img</span>"; @@ -488,7 +489,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<div data-feed-id='$feed_id' class='feed-title'>". "<div style=\"float : right\">$feed_icon_img</div>". - "<a href=\"#\" class='title' onclick=\"Feeds.viewfeed({feed:$feed_id})\">". + "<a href=\"#\" class='title' onclick=\"Feeds.open({feed:$feed_id})\">". $line["feed_title"]."</a> $vf_catchup_link</div>"; } @@ -547,7 +548,7 @@ class Feeds extends Handler_Protected { $tmp_content .= "<div class=\"feed\"> <a href=\"#\" style=\"background-color: rgba($rgba,0.3)\" - onclick=\"Feeds.viewfeed({feed:$feed_id})\">". + onclick=\"Feeds.open({feed:$feed_id})\">". truncate_string($line["feed_title"],30)."</a> </div>"; } @@ -561,7 +562,7 @@ class Feeds extends Handler_Protected { if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { $tmp_content .= "<span style=\"cursor : pointer\" title=\"".htmlspecialchars($line["feed_title"])."\" - onclick=\"Feeds.viewfeed({feed:$feed_id})\">$feed_icon_img</span>"; + onclick=\"Feeds.open({feed:$feed_id})\">$feed_icon_img</span>"; } $tmp_content .= "</div>"; //score wrapper2 diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 2184a0b42..f47d24501 100755 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -1323,7 +1323,7 @@ class Pref_Feeds extends Handler_Protected { print "<p>"; - print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">". + print "<button dojoType=\"dijit.form.Button\" onclick=\"return Utils.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">". __('Display URL')."</button> "; print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">". |