unify main and headlines toolbar

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 7f5fd10af3fa8996856b3de80bcf36d3abc26879..c0f5bcf9356b4ea898da533e80028c2c0ac658a9 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -43,6 +43,8 @@ class Feeds extends Handler_Protected {
                        $search_q = "";
                }
 
+               $reply .= "<span class=\"holder\">";
+
                $rss_link = htmlspecialchars(get_self_url_prefix() .
                        "/public.php?op=rss&id=$feed_id$cat_q$search_q");
 
@@ -50,10 +52,18 @@ class Feeds extends Handler_Protected {
 
                $error_class = $error ? "error" : "";
 
-               $reply .= "<span class='r'>";
-               $reply .= "<span id='selected_prompt'></span>";
+               $reply .= "<span class='r'>
+                       <a href=\"#\"
+                               title=\"".__("View as RSS feed")."\"
+                               onclick=\"displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
+                               <img class=\"noborder\" src=\"images/pub_set.png\"></a>";
+
+
+#              $reply .= "<span>";
                $reply .= "<span id='feed_title' class='$error_class'>";
 
+               $reply .= "</span>";
+
                if ($feed_site_url) {
                        $last_updated = T_sprintf("Last updated: %s",
                                $feed_last_updated);
@@ -72,18 +82,15 @@ class Feeds extends Handler_Protected {
                }
 
                $reply .= "</span>";
+               $reply .= "<span id='selected_prompt'></span>";
 
-               $reply .= "
-                       <a href=\"#\"
-                               title=\"".__("View as RSS feed")."\"
-                               onclick=\"displayDlg('".__("View as RSS")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">
-                               <img class=\"noborder\" style=\"vertical-align : middle\" src=\"images/pub_set.png\"></a>";
-
-               $reply .= "</span>";
+#              $reply .= "</span>";
 
                // left part
 
-               $reply .= __('Select:')."
+               $reply .= "<span class=\"main\">";
+
+               $reply .= "
                        <a href=\"#\" onclick=\"$sel_all_link\">".__('All')."</a>,
                        <a href=\"#\" onclick=\"$sel_unread_link\">".__('Unread')."</a>,
                        <a href=\"#\" onclick=\"$sel_inv_link\">".__('Invert')."</a>,
@@ -132,14 +139,14 @@ class Feeds extends Handler_Protected {
 
                $reply .= "</select>";
 
-               //$reply .= "</div>";
-
                //$reply .= "</h2";
 
                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINE_TOOLBAR_BUTTON) as $p) {
                         echo $p->hook_headline_toolbar_button($feed_id, $is_cat);
                }
 
+               $reply .= "</span></span>";
+
                return $reply;
        }
 
@@ -148,7 +155,7 @@ class Feeds extends Handler_Protected {
                                        $override_order = false, $include_children = false) {
 
                if (isset($_REQUEST["DevForceUpdate"]))
-                       header("Content-Type: text/plain");
+                       header("Content-Type: text/plain; charset=utf-8");
 
                $disable_cache = false;
 
@@ -292,7 +299,7 @@ class Feeds extends Handler_Protected {
                        $expand_cdm = get_pref('CDM_EXPANDED');
 
                        while ($line = $this->dbh->fetch_assoc($result)) {
-                               $line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content_preview"]), 250);
+                               $line["content_preview"] =  "&mdash; " . truncate_string(strip_tags($line["content"]), 250);
 
                                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
                                        $line = $p->hook_query_headlines($line, 250, false);
@@ -725,7 +732,7 @@ class Feeds extends Handler_Protected {
                                        $reply['content'] .= "</div>";
                                        $reply['content'] .= "</div>";
 
-                                       $reply['content'] .= "</div><hr/>";
+                                       $reply['content'] .= "</div>";
 
                                        $reply['content'] .= "</div>";