diff options
| author | Andrew Dolgov <[email protected]> | 2011-12-20 22:38:25 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-12-20 22:38:25 +0400 |
| commit | f10808259c286cb4ebc6318a71eee470066fc6ef (patch) | |
| tree | 84bc45c013d1214e8edaa772df363600e6aa3344 /classes/feeds.php | |
| parent | 761501fc9fd619594670111a19ea00f4585a2c17 (diff) | |
tweak headlines-toolbar appearance
Diffstat (limited to 'classes/feeds.php')
| -rw-r--r-- | classes/feeds.php | 94 |
1 files changed, 39 insertions, 55 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 5ecac494a..2e9aea686 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -68,7 +68,43 @@ class Feeds extends Protected_Handler { $tog_marked_link = "selectionToggleMarked()";
$tog_published_link = "selectionTogglePublished()";
- $reply = "<div id=\"subtoolbar_main\">";
+ if ($is_cat) $cat_q = "&is_cat=$is_cat";
+
+ if ($search) {
+ $search_q = "&q=$search&m=$match_on&smode=$search_mode";
+ } else {
+ $search_q = "";
+ }
+
+ $rss_link = htmlspecialchars(get_self_url_prefix() .
+ "/public.php?op=rss&id=$feed_id$cat_q$search_q");
+
+ // right part
+
+ $reply .= "<span class='r'>";
+
+ if ($feed_site_url) {
+ $target = "target=\"_blank\"";
+ $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
+ truncate_string($feed_title,30)."</a>";
+
+ if ($error) {
+ $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";
+ }
+
+ } else {
+ $reply .= $feed_title;
+ }
+
+ $reply .= "
+ <a href=\"#\"
+ title=\"".__("View as RSS feed")."\"
+ onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
+ <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
+
+ $reply .= "</span>";
+
+ // left part
$reply .= __('Select:')."
<a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
@@ -103,17 +139,6 @@ class Feeds extends Protected_Handler { $reply .= "<option value=\"emailArticle(false)\">".__('Forward by email').
"</option>";
- if ($is_cat) $cat_q = "&is_cat=$is_cat";
-
- if ($search) {
- $search_q = "&q=$search&m=$match_on&smode=$search_mode";
- } else {
- $search_q = "";
- }
-
- $rss_link = htmlspecialchars(get_self_url_prefix() .
- "/public.php?op=rss&id=$feed_id$cat_q$search_q");
-
$reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
@@ -122,50 +147,9 @@ class Feeds extends Protected_Handler { $reply .= "</select>";
- $reply .= "</div>";
-
- $reply .= "<div id=\"subtoolbar_ftitle\">";
-
- if ($feed_site_url) {
- $target = "target=\"_blank\"";
- $reply .= "<a title=\"".__("Visit the website")."\" $target href=\"$feed_site_url\">".
- truncate_string($feed_title,30)."</a>";
-
- if ($error) {
- $reply .= " (<span class=\"error\" title=\"$error\">Error</span>)";
- }
-
- } else {
- if ($feed_id < -10) {
- $label_id = -11-$feed_id;
-
- $result = db_query($this->link, "SELECT fg_color, bg_color
- FROM ttrss_labels2 WHERE id = '$label_id' AND owner_uid = " .
- $_SESSION["uid"]);
-
- if (db_num_rows($result) != 0) {
- $fg_color = db_fetch_result($result, 0, "fg_color");
- $bg_color = db_fetch_result($result, 0, "bg_color");
-
- $reply .= "<span style=\"background : $bg_color; color : $fg_color\" >";
- $reply .= $feed_title;
- $reply .= "</span>";
- } else {
- $reply .= $feed_title;
- }
-
- } else {
- $reply .= $feed_title;
- }
- }
-
- $reply .= "
- <a href=\"#\"
- title=\"".__("View as RSS feed")."\"
- onclick=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">
- <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/feed-icon-12x12.png\"></a>";
+ //$reply .= "</div>";
- $reply .= "</div>";
+ //$reply .= "</h2";
return $reply;
}
|