Merge lp:~huwshimi/launchpad/what-next-712259 into lp:launchpad

[Huw Wilkins]

[r=benji][bug=712259] Removed "What next?" info from bug page and "Got a question of your own?" from Question page and replaced with appropriate links in sidebar portlets.

Info boxes at the bottom of pages are hard to find and not that useful. These have been replaced with links in sidebar portlets. This adds consistency to the ui.

On the bug page the "What next?" box at the bottom of the page has been removed. In the sidebar portlet I've added the standard "Report a bug" link.

On the question page the "Got a question of your own?" box at the bottom of the page has been removed. In the sidebar portlet I've added the standard "Ask a question" link.

[Benji York (benji)]

Looks good.

review: Approve (code)

[Martin Pool (mbp)]

Could we have a screenshot?

[Huw Wilkins (huwshimi)]

@mbp
Here you are: https://launchpadlibrarian.net/74291628/link_fix.png

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css'
--- lib/canonical/launchpad/icing/style-3-0.css	2011-07-01 14:40:36 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css	2011-07-01 15:14:39 +0000
@@ -1447,6 +1447,9 @@
     padding: 0;
     font-weight: bold;
     }
+.involvement li.single {
+    border-top: 0;
+}
 .involvement a {
     display: block;
     padding: 0.3em;

=== modified file 'lib/lp/answers/stories/question-obfuscation.txt'
--- lib/lp/answers/stories/question-obfuscation.txt	2011-03-30 13:17:36 +0000
+++ lib/lp/answers/stories/question-obfuscation.txt	2011-07-01 15:14:39 +0000
@@ -66,7 +66,7 @@
 'Latest questions asked' portlet for Answers front page.
 
     >>> user_browser.getLink('#9 mailto: problem in webpage').click()
-    >>> user_browser.getLink('ask your own question separately').click()
+    >>> user_browser.getLink('Ask a question').click()
     >>> user_browser.title
     'Ask a question about...
 

=== modified file 'lib/lp/answers/stories/question-workflow.txt'
--- lib/lp/answers/stories/question-workflow.txt	2011-05-31 16:48:06 +0000
+++ lib/lp/answers/stories/question-workflow.txt	2011-07-01 15:14:39 +0000
@@ -458,22 +458,10 @@
     >>> print content.find(id='can-you-help-with-this-problem')
     None
 
-    >>> print content.find(id='ask-your-own-question').h2.renderContents()
-    Got a question of your own?
-
-    >>> user_browser.getLink('ask your own question separately').click()
+    >>> user_browser.getLink('Ask a question').click()
     >>> print user_browser.title
     Ask a question about...
 
-The 'Got a question of your own?' section in not relevant to the
-question owner, so Sample person does not see it.
-
-    >>> owner_browser.open('http://launchpad.dev/firefox/+question/2')
-    >>> content = find_tag_by_id(
-    ...     owner_browser.contents, 'ask-your-own-question')
-    >>> content is None
-    True
-
 Clean up the feature flag.
 
     >>> flags.cleanUp()

=== modified file 'lib/lp/answers/templates/question-index.pt'
--- lib/lp/answers/templates/question-index.pt	2011-05-16 15:29:15 +0000
+++ lib/lp/answers/templates/question-index.pt	2011-07-01 15:14:39 +0000
@@ -39,6 +39,16 @@
 
 
     <metal:portlets fill-slot="side">
+      <div id="involvement" class="portlet">
+        <ul class="involvement">
+          <li class="single">
+            <a tal:attributes="href view/new_question_url"
+               class="sprite answers">
+              Ask a question
+            </a>
+          </li>
+        </ul>
+      </div>
       <div tal:replace="structure context/@@+global-actions" />
       <div tal:replace="structure context/@@+portlet-subscribers" />
     </metal:portlets>
@@ -171,21 +181,6 @@
           </div>
         </tal:not-logged-in>
       </div>
-
-      <div
-        class="related"
-        id="ask-your-own-question"
-        xml:lang="en" lang="en" dir="ltr"
-        tal:condition="not: view/is_question_owner"
-      >
-        <h2>Got a question of your own?</h2>
-
-        <p>For best results,
-          <a href="+addquestion"
-            tal:attributes="href view/new_question_url">ask your own question
-            separately</a>.
-        </p>
-      </div>
     </div>
   </body>
 </html>

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-index.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-index.txt	2010-05-19 05:47:50 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-index.txt	2011-07-01 15:14:39 +0000
@@ -105,27 +105,16 @@
     Assigned: 2005-01-17
     ...
 
-The bug page ends with links to report another bug, and to list open
-bugs.
+The bug page includes a link to report another bug.
 
     >>> user_browser.open('http://bugs.launchpad.dev/firefox/+bug/1')
-    >>> related = find_tags_by_class(user_browser.contents, 'related')[0]
-    >>> print extract_text(related)
-    What next?...
-    >>> print user_browser.getLink('Report another bug').url
+    >>> print user_browser.getLink('Report a bug').url
     http://bugs.launchpad.dev/firefox/+filebug
-    >>> print user_browser.getLink('List open bugs').url
-    http://bugs.launchpad.dev/firefox/+bugs
 
     >>> user_browser.open(
     ...     'http://launchpad.dev/ubuntu/+source/mozilla-firefox/+bug/1')
-    >>> related = find_tags_by_class(user_browser.contents, 'related')[0]
-    >>> print extract_text(related)
-    What next?...
-    >>> print user_browser.getLink('Report another bug').url
+    >>> print user_browser.getLink('Report a bug').url
     http://launchpad.dev/ubuntu/+source/mozilla-firefox/+filebug
-    >>> print user_browser.getLink('List open bugs').url
-    http://launchpad.dev/ubuntu/+source/mozilla-firefox/+bugs
 
 There's also a link on the page that will take the user to the "Add
 attachment or patch" page, for use when JavaScript isn't available.

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2011-06-17 10:31:55 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2011-07-01 15:14:39 +0000
@@ -73,6 +73,16 @@
     </metal:block>
 
     <metal:side fill-slot="side" tal:define="context_menu context/menu:context">
+      <div id="involvement" class="portlet">
+        <ul class="involvement">
+          <li class="single">
+            <a tal:attributes="href string:${context/target/fmt:url}/+filebug" 
+               class="sprite bugs">
+              Report a bug
+            </a>
+          </li>
+        </ul>
+      </div>
       <div tal:replace="structure context/bug/@@+portlet-privacy" />
       <div tal:replace="structure context/bug/@@+portlet-actions" />
       <div tal:replace="structure context/bug/@@+portlet-duplicates" />
@@ -367,24 +377,6 @@
         </tal:comment-list-truncated>
       </tal:comments>
 
-      <div class="related">
-        <h2>What next?</h2>
-        <ul>
-          <li>
-            <a
-                tal:attributes="href string:${context/target/fmt:url}/+filebug"
-                >Report another bug</a>
-            about <tal:context replace="context/target/displayname" />
-          </li>
-          <li>
-            <a
-                tal:attributes="href string:${context/target/fmt:url}/+bugs"
-                >List open bugs</a>
-            for <tal:context replace="context/target/displayname" />
-          </li>
-        </ul>
-      </div>
-
       </div><!-- class="top-portlet" -->
         </div><!-- id="nonportlets"-->
       </div><!--- id="maincontentsub"-->