diff options
| author | Andrew Dolgov <[email protected]> | 2009-10-09 13:45:48 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2009-10-09 13:45:48 +0400 |
| commit | f69281f7ebb030429a724621570524d3d03902cb (patch) | |
| tree | d428a3caafcb3496ff535e9c03ec7cf39b1f9012 | |
| parent | 584d3e035f616fe89df2a019cdae7ae1eb505719 (diff) | |
| parent | 3af75631670aa9823010adedb8354672a8273506 (diff) | |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
| -rw-r--r-- | modules/pref-feeds.php | 5 | ||||
| -rw-r--r-- | themes/graycube/theme.css | 4 | ||||
| -rw-r--r-- | tt-rss.css | 5 | ||||
| -rw-r--r-- | tt-rss.php | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index b0269243e..6b510bc9d 100644 --- a/modules/pref-feeds.php +++ b/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>"; diff --git a/themes/graycube/theme.css b/themes/graycube/theme.css index 09332ffe3..129f167e1 100644 --- a/themes/graycube/theme.css +++ b/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; diff --git a/tt-rss.css b/tt-rss.css index f18896784..0511979bb 100644 --- a/tt-rss.css +++ b/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; diff --git a/tt-rss.php b/tt-rss.php index 607bedb1d..1dcee23a4 100644 --- a/tt-rss.php +++ b/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> |