Merge lp:~matthew.revell/launchpad/bugs-439909-439267 into lp:launchpad

[Matthew Revell]

[Matthew Revell (matthew.revell)]

Updates /version.txt to "3.0" and also changes "lib/lp/app/templates/base-layout-macros.pt" so that the "Contact us" link is shown to everyone, not just logged-in users.

[Michael Nelson (michael.nelson)]

> Updates /version.txt to "3.0" and also changes "lib/lp/app/templates/base-
> layout-macros.pt" so that the "Contact us" link is shown to everyone, not just
> logged-in users.

Thanks for doing that Matthew!

r=me

<mrevell> noodles775: I have a branch fixing the problems we discussed: https://code.launchpad.net/~matthew.revell/launchpad/bugs-439909-439267/+merge/12710
<noodles775> mrevell: great, thanks for that!
* lantash has quit (Client Quit)
<noodles775> mrevell: doing yours first as it's tiny :), I was just checking to see if there were any tests that might check the url for the contact-us link...
<noodles775> mrevell: and there aren't, but: http://pastebin.ubuntu.com/282928/
<noodles775> there's a few other places where we say 'Contact us' but send people to <email address hidden>?
<noodles775> mrevell: I'll leave it up to you whether you think it's worthwhile making them consistent.
<noodles775> mrevell: r=me
<mrevell> noodles775: Yeah. The first of those, main-template, I believe is an over hang from the old design. I'll fix the other links. Thanks.
<noodles775> Great.
<noodles775> mrevell: and, of course, run it through ec2 first as there could be a test somewhere looking for the contact us url/href etc.

review: Approve (code)

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2009-09-18 14:53:15 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2009-10-01 11:57:14 +0000
@@ -358,8 +358,8 @@
        • 
       <a href="/legal">Terms of use</a>
       &nbsp;&bull;&nbsp;
-      <a href="/feedback"
-        tal:condition="request/lp:person">Contact us</a>
+      <a href="https://help.launchpad.net/Feedback"
+        >Contact us</a>
       <span id="lp-version" tal:condition="not:is_lpnet">
       &nbsp;&bull;&nbsp;
         <a href="https://help.launchpad.net/LaunchpadReleases"

=== modified file 'lib/lp/registry/templates/product-new.pt'
--- lib/lp/registry/templates/product-new.pt	2009-09-02 20:25:33 +0000
+++ lib/lp/registry/templates/product-new.pt	2009-10-01 11:57:14 +0000
@@ -253,7 +253,7 @@
     <div metal:use-macro="context/@@launchpad_form/form">
       <metal:step fill-slot="extra_info">
       <div style="text-align: right;">Not sure what to do?
-        <a href="mailto:[e-mail]">Contact us</a>
+        <a href="https://help.launchpad.net/Feedback">Contact us</a>
       </div>
       <h2 class="legend" id="step-title">Step
           <tal:step_number tal:replace="view/step_number"/>

=== modified file 'version.txt'
--- version.txt	2009-09-01 20:24:17 +0000
+++ version.txt	2009-10-01 11:57:14 +0000
@@ -1,1 +1,1 @@
-2.2.7
+3.0