Merge lp:~wallyworld/launchpad/edit-sharing-policies-1040336 into lp:launchpad

[Ian Booth]

Fix rendering of choice source popup widget used to edit project sharing policies.

Just a couple of small tweaks:

1. Anchor elements to activate the popups defined in the TAL were missing hrefs
2. Popup items did not have style defined to be choice-description
3. choice-description css rule needed to have "whitespace: normal" to prevent wrapping. This is a global change. Till now, all descriptions have been short so it has not been an issue.

[Steve Kowalik (stevenk)]

So I'm concerned about the possible fallout with white-space: normal. Please check that careful when it hits qas.

review: Approve (code)

=== modified file 'lib/lp/app/javascript/choiceedit/assets/choiceedit-core.css'
--- lib/lp/app/javascript/choiceedit/assets/choiceedit-core.css	2012-06-06 21:38:11 +0000
+++ lib/lp/app/javascript/choiceedit/assets/choiceedit-core.css	2012-08-23 00:40:25 +0000
@@ -53,6 +53,7 @@
   font-weight: normal;
   padding: 0;
   color: #666;
+  white-space: normal;
 }
 .yui3-ichoicelist-content .choice-link:hover {
   text-decoration: underline;

=== modified file 'lib/lp/registry/javascript/sharing/pillarsharingview.js'
--- lib/lp/registry/javascript/sharing/pillarsharingview.js	2012-08-17 00:06:40 +0000
+++ lib/lp/registry/javascript/sharing/pillarsharingview.js	2012-08-23 00:40:25 +0000
@@ -158,7 +158,8 @@
             choice_items.push({
                 value: 'LEGACY',
                 name: 'Legacy policy',
-                description: this.get('legacy_sharing_policy_description')
+                description: this.get('legacy_sharing_policy_description'),
+                description_css_class: 'choice-description'
             });
         }
         choice_items.push.apply(
@@ -259,7 +260,8 @@
                 info.push({
                     value: policy.title,
                     name: policy.title,
-                    description: policy.description
+                    description: policy.description,
+                    description_css_class: 'choice-description'
                 });
         });
         return info;

=== modified file 'lib/lp/registry/templates/pillar-sharing.pt'
--- lib/lp/registry/templates/pillar-sharing.pt	2012-08-16 00:06:25 +0000
+++ lib/lp/registry/templates/pillar-sharing.pt	2012-08-23 00:40:25 +0000
@@ -43,7 +43,7 @@
            <td id="branch-sharing-policy">
              Branches sharing policy:&nbsp;
              <strong><span class="value"></span></strong>
-             <a class="editicon sprite edit action-icon"
+             <a class="editicon sprite edit action-icon" href="#"
                  style="padding-bottom: 0;">Edit</a>
              <div id="branch-sharing-policy-description" class="formHelp"></div>
            </td>
@@ -53,7 +53,7 @@
            <td id="bug-sharing-policy">
              Bugs sharing policy:&nbsp;
              <strong><span class="value"></span></strong>
-             <a class="editicon sprite edit action-icon"
+             <a class="editicon sprite edit action-icon" href="#"
                  style="padding-bottom: 0;">Edit</a>
              <div id="bug-sharing-policy-description" class="formHelp"></div>
            </td>