fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2011-04-01 05:41 am

[dw-free] Add Additional Navigational Links to Inbox and Pages

[commit: http://hg.dwscoalition.org/dw-free/rev/437cf707d595]

http://bugs.dwscoalition.org/show_bug.cgi?id=1669

Put back duplicate action menus at top and bottom in all cases.

Patch by [personal profile] fu.

Files modified:
  • cgi-bin/LJ/Widget/InboxFolder.pm
  • htdocs/inbox/index.bml
--------------------------------------------------------------------------------
diff -r e08080f04917 -r 437cf707d595 cgi-bin/LJ/Widget/InboxFolder.pm
--- a/cgi-bin/LJ/Widget/InboxFolder.pm	Thu Mar 31 03:38:55 2011 +0800
+++ b/cgi-bin/LJ/Widget/InboxFolder.pm	Fri Apr 01 13:41:19 2011 +0800
@@ -85,8 +85,6 @@ sub render_body {
     $last_page ||= 1;
     $page = $last_page if $page > $last_page;
     my $starting_index = ($page - 1) * $page_limit;
-    ${$opts{itemcount}} = scalar( @$nitems ) - $starting_index;
-    my $duplicate_menus = ${$opts{itemcount}} >= 3;
 
     my $prev_disabled = ($page <= 1) ? 'disabled' : '';
     my $next_disabled = ($page >= $last_page) ? 'disabled' : '';
@@ -135,8 +133,7 @@ sub render_body {
         <div id="${name}_Table" class="NotificationTable">
         <table summary='' id="${name}" class="inbox" cellspacing="0" border="0" cellpadding="0">
     };
-    $messagetable .= $actionsrow->(1)
-        if $duplicate_menus;
+    $messagetable .= $actionsrow->(1);
     $messagetable .= "<tbody id='${name}_Body'>";
 
     unless (@$nitems) {
@@ -215,13 +212,12 @@ sub render_body {
         };
     }
 
-    my $actionnumber = $duplicate_menus ? 2 : 1;
+    my $actionnumber = 2;
     $messagetable .= $actionsrow->($actionnumber);
 
     $messagetable .= '</tbody></table></div>';
 
-    $messagetable .= $markdeleteall->(2)
-        if $duplicate_menus;
+    $messagetable .= $markdeleteall->(2);
 
     $msgs_body .= $messagetable;
 
diff -r e08080f04917 -r 437cf707d595 htdocs/inbox/index.bml
--- a/htdocs/inbox/index.bml	Thu Mar 31 03:38:55 2011 +0800
+++ b/htdocs/inbox/index.bml	Fri Apr 01 13:41:19 2011 +0800
@@ -182,7 +182,6 @@ body<=
                      view      => $view,
                      mode      => $GET{mode},
                      items     => \@all_items,
-                     itemcount => \$itemcount,
                      itemid    => $itemid,
               );
 
--------------------------------------------------------------------------------