launchpad-reviewers team mailing list archive

[Ian Booth <ian.booth@xxxxxxxxxxxxx>]

Ian Booth has proposed merging lp:~wallyworld/launchpad/nominations-javascript2-271697 into lp:launchpad.

Commit message:
Fix nominations expanders and layout issues.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #271697 in Launchpad itself: "Javascript for approving / declining nominations is confusing "
  https://bugs.launchpad.net/launchpad/+bug/271697
  Bug #629291 in Launchpad itself: "Missing column borders after expanding nominate"
  https://bugs.launchpad.net/launchpad/+bug/629291

For more details, see:
https://code.launchpad.net/~wallyworld/launchpad/nominations-javascript2-271697/+merge/127918

The link to open the nominations form for each bugtask row was wired to old, deleted javascript. The new expander infrastructure has been wired in. The new expander uses a little triangle icon so the now obsolete brackets around the link have been wrapped in a hide-on-load span so they only show when javascript is not available.

Also fix a table cell colspan issue.
-- 
https://code.launchpad.net/~wallyworld/launchpad/nominations-javascript2-271697/+merge/127918
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wallyworld/launchpad/nominations-javascript2-271697 into lp:launchpad.

=== modified file 'lib/lp/bugs/templates/bugnomination-tasks-and-nominations-table-row.pt'
--- lib/lp/bugs/templates/bugnomination-tasks-and-nominations-table-row.pt	2012-03-02 16:24:45 +0000
+++ lib/lp/bugs/templates/bugnomination-tasks-and-nominations-table-row.pt	2012-10-04 01:08:24 +0000
@@ -4,7 +4,7 @@
               nomination_form_id string:nomination${context/id};
               nomination_person view/getNominationPerson">
   <tr class="secondary">
-    <td style="padding: 0.3em 0em 0.3em 1.5em" colspan="4">
+    <td style="padding: 0.3em 0em 0.3em 1.5em" colspan="6">
     <span class="lesser">
       <span tal:content="context/status/title">
         Nominated
@@ -20,17 +20,20 @@
     </span>
     <tal:links condition="view/displayNominationEditLinks">
       <tal:release-management condition="user_is_driver">
-          (<a href="#"
+          <span class="hide-on-load">(</span>
+          <span class="collapsible">
+          <a href="#"
               tal:content="view/getApproveDeclineLinkText"
-              tal:attributes="onclick string:return toggleFormVisibility('${nomination_form_id}');
-                              href view/getNominationEditLink">approve/decline</a>)
+              tal:attributes="href view/getNominationEditLink">approve/decline</a>
         <div tal:attributes="id nomination_form_id"
              tal:condition="user_is_driver"
              class="hidden">
-            <span style="padding-left: 1.5em" tal:content="structure context/@@+edit-form">
+            <span tal:content="structure context/@@+edit-form">
                 Approve/Decline
             </span>
         </div>
+        </span>
+        <span class="hide-on-load">)</span>
       </tal:release-management>
     </tal:links>
   </td>