From 14d9001eca82103d3dcd493bb1cf95207f7418b3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 26 Feb 2009 14:23:28 +0300
Subject: use optgroup tag for grouped select boxes (code cleanup)

---
 modules/pref-feeds.php | 12 ++++++------
 tt-rss.php             | 24 ++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index cffcff3d8..e92ad6ebd 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1370,24 +1370,24 @@
 			print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
 				<option value=\"facDefault\" selected>".__('Actions...')."</option>
 				<optgroup label=\"".__('Selection:')."\">
-				<option value=\"facEdit\">&nbsp;&nbsp;".__('Edit')."</option>";
+				<option value=\"facEdit\">".__('Edit')."</option>";
 
 			if (FORCE_ARTICLE_PURGE == 0) {
 				print 
-					"<option value=\"facPurge\">&nbsp;&nbsp;".__('Manual purge')."</option>";
+					"<option value=\"facPurge\">".__('Manual purge')."</option>";
 			}
 
 			print "
-				<option value=\"facClear\">&nbsp;&nbsp;".__('Clear feed data')."</option>
-				<option value=\"facRescore\">&nbsp;&nbsp;".__('Rescore articles')."</option>
-				<option value=\"facUnsubscribe\">&nbsp;&nbsp;".__('Unsubscribe')."</option>";
+				<option value=\"facClear\">".__('Clear feed data')."</option>
+				<option value=\"facRescore\">".__('Rescore articles')."</option>
+				<option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>";
 
 			print "</optgroup>";
 
 				if (get_pref($link, 'ENABLE_FEED_CATS')) {
 
 					print "<optgroup label=\"".__('Other:')."\">
-						<option value=\"facEditCats\">&nbsp;&nbsp;".__('Edit categories')."
+						<option value=\"facEditCats\">".__('Edit categories')."
 							</option>
 					</optgroup>";
 
diff --git a/tt-rss.php b/tt-rss.php
index b963cd150..02d054d89 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -190,23 +190,23 @@ window.onload = init;
 					<option value="qmcSearch"><?php echo __('Search...') ?></option>
 					<!-- <option value="qmcPrefs"><?php echo __('Preferences') ?></option> -->
 					<optgroup label="<?php echo __('Feed actions:') ?>">
-					<option value="qmcAddFeed">&nbsp;&nbsp;<?php echo __('Subscribe to feed...') ?></option>
-					<option value="qmcEditFeed">&nbsp;&nbsp;<?php echo __('Edit this feed...') ?></option>
-					<!-- <option value="qmcClearFeed">&nbsp;&nbsp;<?php echo __('Clear articles') ?></option> -->
-					<option value="qmcRescoreFeed">&nbsp;&nbsp;<?php echo __('Rescore feed') ?></option>
-					<option value="qmcRemoveFeed">&nbsp;&nbsp;<?php echo __('Unsubscribe') ?></option>
+					<option value="qmcAddFeed"><?php echo __('Subscribe to feed...') ?></option>
+					<option value="qmcEditFeed"><?php echo __('Edit this feed...') ?></option>
+					<!-- <option value="qmcClearFeed"><?php echo __('Clear articles') ?></option> -->
+					<option value="qmcRescoreFeed"><?php echo __('Rescore feed') ?></option>
+					<option value="qmcRemoveFeed"><?php echo __('Unsubscribe') ?></option>
 					</optgroup>
 					<optgroup label="<?php echo __('All feeds:') ?>">
-					<option value="qmcCatchupAll">&nbsp;&nbsp;<?php echo __('Mark as read') ?></option>
-					<option value="qmcShowOnlyUnread">&nbsp;&nbsp;<?php echo __('(Un)hide read feeds') ?></option>
+					<option value="qmcCatchupAll"><?php echo __('Mark as read') ?></option>
+					<option value="qmcShowOnlyUnread"><?php echo __('(Un)hide read feeds') ?></option>
 					</optgroup>
 					<optgroup label="<?php echo __('Other actions:') ?>">
 
-					<option value="qmcAddLabel">&nbsp;&nbsp;<?php echo __('Create label...') ?></option>
-					<option value="qmcAddFilter">&nbsp;&nbsp;<?php echo __('Create filter...') ?></option>
-					<option value="qmcResetUI">&nbsp;&nbsp;<?php echo __('Reset UI layout') ?></option>
-					<option value="qmcResetCats">&nbsp;&nbsp;<?php echo __('Reset category order') ?></option>
-					<option value="qmcHKhelp"><?php echo __('&nbsp;&nbsp;Keyboard shortcuts') ?></option>
+					<option value="qmcAddLabel"><?php echo __('Create label...') ?></option>
+					<option value="qmcAddFilter"><?php echo __('Create filter...') ?></option>
+					<option value="qmcResetUI"><?php echo __('Reset UI layout') ?></option>
+					<option value="qmcResetCats"><?php echo __('Reset category order') ?></option>
+					<option value="qmcHKhelp"><?php echo __('Keyboard shortcuts') ?></option>
 					</optgroup>
 
 			</select>
-- 
cgit v1.2.3