From 1bffd1068faee6c33ea86dcec188679d5f1ea4c8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 27 Jan 2014 22:03:42 +0400
Subject: unify main and headlines toolbar

---
 classes/feeds.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 536f1b793..c0f5bcf93 100644
--- 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;
 	}
 
-- 
cgit v1.2.3