Merge lp:~jcsackett/launchpad/misaligned-details into lp:launchpad

[j.c.sackett]

Fixes cosmetic issues on the sharing and grantee tables in the sharing views.

Summary
=======
There are a few small cosmetic problems in the sharing details view;
misalignment, and text not spanning the appropriate columns.

Preimp
======
Spoke with Ian Booth, Curtis Hovey.

Implementation
==============
The bug summary in the details table view has been collapsed into one table
cell spanning the same number of columns.

The nothing shared message in details has been updated to cover all columns in
the table.

The main sharing table had a similar problem, resolved by simply reusing the
setup code for when there is nothing shared on the event where the last sharee
is removed.

Tests
=====
bin/test -vvct shar* --layer=YUI

QA
==
Make sure the cosmetic issues are resolved in the sharing views.

LoC
===
This is part of disclosure.

Lint
====

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/javascript/sharing/granteetable.js
  lib/lp/registry/javascript/sharing/sharingdetails.js

[Curtis Hovey (sinzui)]

Thank you for work with me on IRC to make general revisions the the table layout.

review: Approve (code)

=== modified file 'lib/lp/registry/javascript/sharing/granteetable.js'
--- lib/lp/registry/javascript/sharing/granteetable.js	2012-07-23 03:40:33 +0000
+++ lib/lp/registry/javascript/sharing/granteetable.js	2012-07-27 20:38:23 +0000
@@ -501,6 +501,7 @@
     delete_grantees: function(grantees, all_rows_deleted) {
         var deleted_row_selectors = [];
         var grantee_table = this.get('grantee_table');
+        var that = this;
         Y.Array.each(grantees, function(grantee) {
             var selector = 'tr[id=permission-' + grantee.name + ']';
             var table_row = grantee_table.one(selector);
@@ -515,11 +516,10 @@
         var delete_rows = function() {
             rows_to_delete.remove(true);
             if (all_rows_deleted === true) {
+                var empty_table_row = Y.Node.create(
+                    that.get('grantee_table_empty_row'));
                 grantee_table.one('tbody')
-                    .appendChild('<tr id="grantee-table-not-shared"></tr>')
-                    .appendChild('<td></td>')
-                    .setContent("This project's private information " +
-                                "is not shared with anyone.");
+                    .appendChild(empty_table_row);
             }
         };
         var anim_duration = this.get('anim_duration');

=== modified file 'lib/lp/registry/javascript/sharing/sharingdetails.js'
--- lib/lp/registry/javascript/sharing/sharingdetails.js	2012-07-20 03:15:04 +0000
+++ lib/lp/registry/javascript/sharing/sharingdetails.js	2012-07-27 20:38:23 +0000
@@ -235,7 +235,7 @@
             if (all_rows_deleted === true) {
                 details_table_body
                     .appendChild('<tr></tr>')
-                    .appendChild('<td colspan="4"></td>')
+                    .appendChild('<td colspan="3"></td>')
                     .setContent("There are no shared bugs or branches.");
             }
         };
@@ -279,12 +279,9 @@
     _bug_details_row_template: function() {
         return [
         '<tr id="shared-bug-{{ bug_id }}">',
-        '    <td class="icon right">',
+        '    <td>',
         '        <span class="sortkey">{{bug_id}}</span>',
-        '        <span class="sprite bug-{{bug_importance}}"></span>',
-        '    </td>',
-        '    <td class="amount">{{bug_id}}</td>',
-        '    <td>',
+        '        <span class="sprite bug-{{bug_importance}}">{{bug_id}}</span>',
         '        <a href="{{web_link}}">{{bug_summary}}</a>',
         '    </td>',
         '    <td class="action-icons nowrap">',
@@ -307,7 +304,7 @@
     _branch_details_row_template: function() {
         return [
         '<tr id="shared-branch-{{ branch_id }}">',
-        '    <td colspan="3">',
+        '    <td>',
         '        <span class="sortkey">sorttable_branchsortkey</span>',
         '        <a class="sprite branch" href="{{web_link}}">',
         '            {{branch_name}}',

=== modified file 'lib/lp/registry/templates/pillar-sharing-details.pt'
--- lib/lp/registry/templates/pillar-sharing-details.pt	2012-07-20 03:15:04 +0000
+++ lib/lp/registry/templates/pillar-sharing-details.pt	2012-07-27 20:38:23 +0000
@@ -39,14 +39,12 @@
     </div>
 
     <table id="shared-table" class="listing sortable">
+      <col width="auto"/>
       <col width="20px"/>
       <col width="auto"/>
-      <col width="auto"/>
-      <col width="auto"/>
-      <col width="auto"/>
       <thead>
         <tr>
-          <th colspan="4" width="">
+          <th colspan="2" width="">
             Subscribed Bug Report or Branch
           </th>
           <th>
@@ -56,7 +54,7 @@
       </thead>
       <tbody id="sharing-table-body">
           <tr>
-              <td colspan="5">
+              <td colspan="3">
                   There are no shared bugs or branches.
               </td>
           </tr>