rework the way published feed is displayed; css cleanups

2 files changed, 37 insertions, 8 deletions

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index ea3ff8135..e75d8a9ad 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -3,6 +3,33 @@
 		$id = $_REQUEST["id"];
 		$param = db_escape_string($_REQUEST["param"]);
 
+		if ($id == "pubUrl") {
+
+			print "<div id=\"infoBoxTitle\">".__('Published Articles')."</div>";
+			print "<div class=\"infoBoxContents\">";
+	
+			$url_path = article_publish_url($link);
+
+			print __("Your Published articles feed URL is:");
+
+			print "<div class=\"tagCloudContainer\">";
+			print "<a id='pub_feed_url' href='$url_path' target='_blank'>$url_path</a>";
+			print "</div>";
+
+			print "<div align='center'>";
+
+			print "<button onclick=\"return pubRegenKey()\">".
+				__('Generate new URL')."</button> ";
+
+			print "<input class=\"button\"
+				type=\"submit\" onclick=\"return closeInfoBox()\" 
+				value=\"".__('Close this window')."\">";
+
+			print "</div></div>";
+
+			return;
+		}
+
 		if ($id == "explainError") {
 
 			print "<div id=\"infoBoxTitle\">".__('Notice')."</div>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 452acde69..c1190b549 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1404,12 +1404,17 @@
 
 		print "<h3>" . __("Firefox Integration") . "</h3>";
                 
-                print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.');
-		print "</p><p> <a class='visibleLinkB' href='javascript:window.navigator.registerContentHandler(" .
+		print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+
+		print "<p";
+
+		print "<button onclick='window.navigator.registerContentHandler(" .
                       "\"application/vnd.mozilla.maybe.feed\", " .
                       "\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
-                      __('Click here to register this site as a feed reader.') . "</a></p>";
+							 __('Click here to register this site as a feed reader.') . 
+				"</button>";
 
+		print "</p>";
 
 		print "<h3>".__("Published articles")."</h3>";
 
@@ -1419,12 +1424,9 @@
 		
 		print "<p>".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."</p>";
 
-		$url_path = article_publish_url($link);
-
-		print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
+		print "<button onclick=\"return displayDlg('pubUrl')\">".
+			__('Display URL')."</button> ";
 
-		print "<button onclick=\"return pubRegenKey()\">".
-			__('Generate another link')."</button>";
 
 	}