Merge lp:~rharding/launchpad/info_portlet_1052551 into lp:launchpad

[Richard Harding]

Update the JS initialization for the blueprint information type portlet.

= Summary =

See the bug for details on how users are unable to change the InformationType
on the bluesprints from the portlet.

== Implementation Notes ==

This fixes a couple of manual styles added to the choice widget setup as well
as a missed rename for the javascript method setup_information_type_choice to
setup_choice.

#24 Removes manual display:none set on the Edit action icon.

#47 Removes the manual setting of the icon to display:inline

The rest is mainly some matching of the layout of the HTML to the same thing
in the bug portlet so that I could compare the html and css classes required
to get things to work correctly.

There's also the drive by update of adding the JS module dep lp.app.choice to the addspec.js. It's indirectly gotten from requiring information_type.js, but it does use lp.app.choice directly and should be required as well.

== Q/A ==

When viewing a blueprint you should see the privacy portlet on the right side
and the edit icon should be available to change the information type.

[Benji York (benji)]

Looks good. A couple of minor points:

It would be nice to fix the long line on line 26 of the diff.

Would it be possible to put the explicit style attributes on line 31 and 79 into a stylesheet?

review: Approve (code)

[Richard Harding (rharding)]

> Looks good. A couple of minor points:
>
> It would be nice to fix the long line on line 26 of the diff.

Doh, thanks for the heads up on that.

> Would it be possible to put the explicit style attributes on line 31 and 79
> into a stylesheet?

If there was a true widget with CSS properties I'd definitely move it off. As it is, the best shortcut might be to try to turn the div's into p's of textual content, however they're set to have 0 padding and margin (ugh!).

So for now I'm going to leave this as existing bad code and hope someone gets a change to come behind and do a nice portlet widget with CSS that can be reused rather than stick such a specific rule on #information-type-description which seems just as bad.

=== modified file 'lib/lp/blueprints/javascript/addspec.js'
--- lib/lp/blueprints/javascript/addspec.js	2012-09-21 15:39:22 +0000
+++ lib/lp/blueprints/javascript/addspec.js	2012-10-15 23:44:19 +0000
@@ -17,4 +17,4 @@
                                                   choice_data);
 };
 
-}, "0.1", {"requires": ['lp.app.information_type']});
+}, "0.1", {"requires": ['lp.app.information_type', 'lp.app.choice']});

=== modified file 'lib/lp/blueprints/templates/blueprint-portlet-privacy.pt'
--- lib/lp/blueprints/templates/blueprint-portlet-privacy.pt	2012-08-03 19:41:22 +0000
+++ lib/lp/blueprints/templates/blueprint-portlet-privacy.pt	2012-10-15 23:44:19 +0000
@@ -6,11 +6,18 @@
   tal:attributes="class view/privacy_portlet_css"
   tal:define="link context/menu:context/information_type"
 >
+
+  <div id="privacy-text">
     <span id="information-type-summary"
-      tal:attributes="class view/information_type_css;">This blueprint
-      contains <strong id="information-type" tal:content="view/information_type"></strong> information</span>&nbsp;<a class="sprite edit action-icon"
-        id="privacy-link" tal:attributes="href link/path"
-        tal:condition="link/enabled" style="display: none" >Edit</a>
+      tal:attributes="class view/information_type_css;">This blueprint contains
+      <strong id="information-type" tal:content="view/information_type">
+      </strong> information</span>&nbsp;<a class="sprite edit action-icon"
+        id="privacy-link"
+        tal:attributes="href link/path"
+        tal:condition="link/enabled">Edit</a>
 
-    <div id="information-type-description" style="padding-top: 5px" tal:content="view/information_type_description"></div>
+    <div id="information-type-description" style="padding-top: 5px"
+        tal:content="view/information_type_description">
+    </div>
+  </div>
 </div>

=== modified file 'lib/lp/blueprints/templates/specification-index.pt'
--- lib/lp/blueprints/templates/specification-index.pt	2012-08-30 18:19:51 +0000
+++ lib/lp/blueprints/templates/specification-index.pt	2012-10-15 23:44:19 +0000
@@ -314,10 +314,10 @@
              'lp.app.information_type', 'node', 'widget', function(Y) {
         Y.on('domready', function(){
             var privacy_link = Y.one('#privacy-link');
-            Y.lp.app.information_type.setup_information_type_choice(
-              privacy_link, new Y.lp.client.Launchpad(), LP.cache.context,
-              null);
-            privacy_link.setStyle('display', 'inline');
+            Y.lp.app.information_type.setup_choice(
+                privacy_link,
+                new Y.lp.client.Launchpad(),
+                LP.cache.context);
         });
 
         Y.on('lp:context:implementation_status:changed', function(e) {

=== modified file 'lib/lp/bugs/templates/bug-portlet-privacy.pt'
--- lib/lp/bugs/templates/bug-portlet-privacy.pt	2012-06-20 05:25:44 +0000
+++ lib/lp/bugs/templates/bug-portlet-privacy.pt	2012-10-15 23:44:19 +0000
@@ -9,15 +9,16 @@
   tal:define="link context/menu:context/visibility"
 >
   <div id="privacy-text">
-       <span id="information-type-summary"
-         tal:attributes="class view/information_type_css;">This report
-         contains
+     <span id="information-type-summary"
+         tal:attributes="class view/information_type_css;">This report contains
          <strong id="information-type" tal:content="view/information_type" />
          information
-       </span>&nbsp;<a class="sprite edit action-icon" id="privacy-link"
-           tal:attributes="href link/path" tal:condition="link/enabled"
-           >Edit</a>
-      <div id="information-type-description" style="padding-top: 5px"
-                tal:content="view/information_type_description"></div>
+     </span>&nbsp;<a class="sprite edit action-icon" id="privacy-link"
+         tal:attributes="href link/path" tal:condition="link/enabled"
+         >Edit</a>
+
+     <div id="information-type-description" style="padding-top: 5px"
+         tal:content="view/information_type_description">
+     </div>
   </div>
 </div>