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

This commit is contained in:
Andrew Dolgov 2009-10-09 13:45:48 +04:00
commit f69281f7eb
4 changed files with 14 additions and 2 deletions

View File

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

View File

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

View File

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

View File

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