Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

modules/pref-feeds.php

@@ -224,8 +224,11 @@
 					} else {
 						$is_selected = "";
 					}
+
+					$title = truncate_string(htmlspecialchars($tmp_line["title"]), 40);
+
 					printf("<option $is_selected value='%d'>%s</option>", 
-						$tmp_line["id"], $tmp_line["title"]);
+						$tmp_line["id"], $title);
 				}
 
 			print "</select>";

themes/graycube/theme.css

@@ -290,6 +290,10 @@ div.infoBoxContents a:hover {
 	background : #f9f9f9;
 }
 
+#toolbar div.actionChooser {
+	margin-right : 0px;
+}
+
 #toolbar {
 	position : absolute;
 	left : 280px;

tt-rss.css

@@ -1535,6 +1535,11 @@ div.whiteBox {
 	border-collapse : collapse;
 }
 
+#toolbar div.actionChooser {
+	margin-right : 5px;
+	float : right;
+}
+
 #toolbar {
 	position : absolute;
 	left : 261px;

tt-rss.php

@@ -188,7 +188,7 @@ window.onload = init;
 
 <div id="toolbar">
 
-		<div style="float : right">
+		<div class="actionChooser">
 			<select id="quickMenuChooser" onchange="quickMenuChange()">
 					<option value="qmcDefault" selected="selected"><?php echo __('Actions...') ?></option>
 					<option value="qmcSearch"><?php echo __('Search...') ?></option>