tweak subtoolbar (change convert-to-label placement)

This commit is contained in:
Andrew Dolgov 2007-05-16 05:27:38 +01:00
parent a5e46e0f76
commit d420f2ee0c
2 changed files with 29 additions and 5 deletions

View File

@ -2892,7 +2892,7 @@
} }
if (!strstr($_SESSION["client.userAgent"], "MSIE")) { if (strpos($_SESSION["client.userAgent"], "MSIE") === false) {
print "<td class=\"headlineActions$rtl_cpart\"> print "<td class=\"headlineActions$rtl_cpart\">
<ul class=\"headlineDropdownMenu\"> <ul class=\"headlineDropdownMenu\">
@ -2911,14 +2911,20 @@
<li onclick=\"$catchup_feed_link\">".__('Entire feed')."</li></ul></li> <li onclick=\"$catchup_feed_link\">".__('Entire feed')."</li></ul></li>
<li class=\"vsep\">&nbsp;</li>"; <li class=\"vsep\">&nbsp;</li>";
if ($limit != 0) { if ($limit != 0 && !$search) {
print " print "
<li class=\"top\"><a href=\"$page_next_link\">".__('Next page')."</a><ul> <li class=\"top\"><a href=\"$page_next_link\">".__('Next page')."</a><ul>
<li onclick=\"$page_prev_link\">".__('Previous page')."</li> <li onclick=\"$page_prev_link\">".__('Previous page')."</li>
<li onclick=\"$page_first_link\">".__('First page')."</li></ul></li> <li onclick=\"$page_first_link\">".__('First page')."</li></ul></li>
</ul>"; </ul>";
} }
if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
print "<li class=\"top3\">
<a href=\"javascript:labelFromSearch('$search', '$search_mode',
'$match_on', '$feed_id', '$is_cat');\">
".__('Convert to Label')."</a></td>";
}
print " print "
</td>"; </td>";
@ -2937,16 +2943,25 @@
__('Mark as read:')." __('Mark as read:')."
<a href=\"#\" onclick=\"$catchup_page_link\">".__('Page')."</a>, <a href=\"#\" onclick=\"$catchup_page_link\">".__('Page')."</a>,
<a href=\"#\" onclick=\"$catchup_feed_link\">".__('Feed')."</a>"; <a href=\"#\" onclick=\"$catchup_feed_link\">".__('Feed')."</a>";
if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
print "&nbsp;&nbsp;
<a href=\"javascript:labelFromSearch('$search', '$search_mode',
'$match_on', '$feed_id', '$is_cat');\">
".__('Convert to Label')."</a>";
}
print "</td>"; print "</td>";
} }
if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) { /* if ($search && $feed_id >= 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
print "<td class=\"headlineActions$rtl_cpart\"> print "<td class=\"headlineActions$rtl_cpart\">
<a href=\"javascript:labelFromSearch('$search', '$search_mode', <a href=\"javascript:labelFromSearch('$search', '$search_mode',
'$match_on', '$feed_id', '$is_cat');\"> '$match_on', '$feed_id', '$is_cat');\">
".__('Convert to Label')."</a></td>"; ".__('Convert to Label')."</a></td>";
} } */
print "<td class=\"headlineTitle$rtl_cpart\">"; print "<td class=\"headlineTitle$rtl_cpart\">";

View File

@ -1478,6 +1478,15 @@ ul.headlineDropdownMenu li.top2 {
float : left; float : left;
} }
ul.headlineDropdownMenu li.top3 {
float : left;
margin : 0px;
cursor : pointer;
border-width : 1px 1px 1px 1px;
border-color : transparent;
border-style : solid;
}
ul.headlineDropdownMenu li.vsep { ul.headlineDropdownMenu li.vsep {
float : left; float : left;
margin : 0px 5px 0px 0px; margin : 0px 5px 0px 0px;