launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #02269
[Merge] lp:~matthew.revell/launchpad/VAT-update into lp:launchpad
Matthew Revell has proposed merging lp:~matthew.revell/launchpad/VAT-update into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~matthew.revell/launchpad/VAT-update/+merge/45113
UK VAT increased to 20% today and is chargeable on Launchpad subscriptions made from within the EU. This change increases the VAT rate quoted in the tour to 20%.
I have also changed the copyright message in the footer (base-layout-macros.pt and individual tour pages) to included 2011.
--
https://code.launchpad.net/~matthew.revell/launchpad/VAT-update/+merge/45113
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~matthew.revell/launchpad/VAT-update into lp:launchpad.
=== modified file 'lib/canonical/launchpad/tour/api'
--- lib/canonical/launchpad/tour/api 2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/api 2011-01-04 11:56:15 +0000
@@ -24,7 +24,7 @@
<li><a href="translation" accesskey="5">Web-based translation</a></li>
<li><a href="community" accesskey="6">Mailing lists and teams</a></li>
<li><a href="ppa" accesskey="7">Software distribution</a></li>
- <li><a href="community-support" accesskey="8">Community support</a></li>
+ <li><a href="community-support" accesskey="8">Community support</a></li>
<li class="current"><a href="api" accesskey="9">Beta: web services API</a></li>
<li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li>
<li><a href="release-management" accesskey="b">Release management</a></li>
@@ -37,7 +37,7 @@
<img src="images/api/main-image.jpg" alt="A mock-up of Python code using launchpadlib" />
</p>
<p class="intro-text">
- <strong>Create your own applications that work directly with Launchpad.</strong> Join the beta of our RESTful web services API.
+ <strong>Create your own applications that work directly with Launchpad.</strong> Join the beta of our RESTful web services API.
<br /><br />
We've even done the hard work for you: use our LGPL Python library — <a href="https://help.launchpad.net/API/launchpadlib/";>launchpadlib</a> — to manipulate data in Launchpad just like any other Python object.
@@ -45,9 +45,9 @@
<div id="link-holder"><a href="https://help.launchpad.net/API";>Get started with the Launchpad API ></a></div>
</div>
<div id="page-intro-bottom"></div>
- <ul id="secondary-navigation">
- <li class="button-prev">
- <a href="community-support" title="Back to the user support tracking page" accesskey="d" tabindex="2">Back</a>
+ <ul id="secondary-navigation">
+ <li class="button-prev">
+ <a href="community-support" title="Back to the user support tracking page" accesskey="d" tabindex="2">Back</a>
</li>
<li class="button-next">
<a href="feature-tracking" accesskey="e" tabindex="3" title="Read about spec tracking in Launchpad">Next</a>
@@ -63,41 +63,41 @@
<p class="screen-holder">
<img src="images/api/1.png" alt="News about what's new in the API" /> </p>
<p>
- During the beta, we're exposing more and more of Launchpad through the API. Right now the API gives you access to:
-
- </p>
- <p>
- <ul>
- <li><strong>bugs:</strong> report, access and manage</li>
- <li><strong>people, teams and projects:</strong> create, search and edit</li>
- <li><strong>code</strong>: access branch information.</li>
- </ul>
- </p>
-
- <p>We're adding more every month. See the Launchpad <a href="http://news.launchpad.net/category/api";>blog's API category</a> for regular updates.</p>
-
-
+ During the beta, we're exposing more and more of Launchpad through the API. Right now the API gives you access to:
+
+ </p>
+ <p>
+ <ul>
+ <li><strong>bugs:</strong> report, access and manage</li>
+ <li><strong>people, teams and projects:</strong> create, search and edit</li>
+ <li><strong>code</strong>: access branch information.</li>
+ </ul>
+ </p>
+
+ <p>We're adding more every month. See the Launchpad <a href="http://news.launchpad.net/category/api";>blog's API category</a> for regular updates.</p>
+
+
</ul>
</div>
- <div class="block odd">
+ <div class="block odd">
<h3>Python library </h3>
<h4>Using launchpadlib you can treat Launchpad data like any other Python object.</h4>
<p class="screen-holder">
<img src="images/api/3.png" alt="Using launchpadlib" /> </p>
<p>
- If you're a Python developer, you can access and manipulate data in Launchpad as though it were any other Python object.<p>
-
- <p><br />
- <code>
- people = launchpad.people<br />
- salgado = people['salgado']<br />
- print salgado.display_name<br />
- # Guilherme Salgado<br />
- </code>
- <br />
- </p>
-
+ If you're a Python developer, you can access and manipulate data in Launchpad as though it were any other Python object.<p>
+
+ <p><br />
+ <code>
+ people = launchpad.people<br />
+ salgado = people['salgado']<br />
+ print salgado.display_name<br />
+ # Guilherme Salgado<br />
+ </code>
+ <br />
+ </p>
+
<p>You can be up and running in minutes, without having to make any API calls directly. <a href="https://help.launchpad.net/API/launchpadlib";>Read more about launchpadlib ></a>.
</p>
</div>
@@ -108,32 +108,32 @@
<div class="furthur-information-block singular">
<div class="furthur-information-block-top"></div>
<div class="furthur-information-block-mid">
- <div class="block">
+ <div class="block">
<h3>Simple account authentication</h3>
- <h4>
+ <h4>
Your application's users log into their own Launchpad account.</h4>
<p class="screen-holder">
- <img src="images/api/2.png" alt="The API's authentication page" />
+ <img src="images/api/2.png" alt="The API's authentication page" />
</p>
- <p>
+ <p>
Before the API will give your software access to Launchpad data, your user needs to log into their Launchpad account. Launchpad handles that for you, using <a href="http://oauth.net/";>OAuth</a>, by opening an authentication page in your user's web browser. They can then choose what access to grant your software, from reading only public data through to full read-write access.</p>
</div>
<div class="clear"></div>
<div class="furthur-information-block-bot"></div>
</div>
- </div>
- </div>
- <ul id="footer-navigation">
- <li class="button-prev">
- <a href="community-support" title="Back to the user support tracking page" accesskey="f" tabindex="4">Back</a>
+ </div>
+ </div>
+ <ul id="footer-navigation">
+ <li class="button-prev">
+ <a href="community-support" title="Back to the user support tracking page" accesskey="f" tabindex="4">Back</a>
</li>
<li class="button-next" title="Read about spec tracking in Launchpad">
<a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
</li>
- <li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ <li class="copyright">
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
</body>
-</html>
+</html>
=== modified file 'lib/canonical/launchpad/tour/branch-hosting-tracking'
--- lib/canonical/launchpad/tour/branch-hosting-tracking 2010-04-07 17:47:21 +0000
+++ lib/canonical/launchpad/tour/branch-hosting-tracking 2011-01-04 11:56:15 +0000
@@ -127,7 +127,7 @@
<a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/bugs'
--- lib/canonical/launchpad/tour/bugs 2010-10-24 21:00:11 +0000
+++ lib/canonical/launchpad/tour/bugs 2011-01-04 11:56:15 +0000
@@ -134,7 +134,7 @@
<a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/community'
--- lib/canonical/launchpad/tour/community 2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/community 2011-01-04 11:56:15 +0000
@@ -113,7 +113,7 @@
<a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/community-support'
--- lib/canonical/launchpad/tour/community-support 2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/community-support 2011-01-04 11:56:15 +0000
@@ -106,7 +106,7 @@
<a href="api" tabindex="5" accesskey="g">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/feature-tracking'
--- lib/canonical/launchpad/tour/feature-tracking 2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/feature-tracking 2011-01-04 11:56:15 +0000
@@ -88,7 +88,7 @@
<a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/index'
--- lib/canonical/launchpad/tour/index 2010-04-21 09:47:58 +0000
+++ lib/canonical/launchpad/tour/index 2011-01-04 11:56:15 +0000
@@ -174,7 +174,7 @@
<a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="i" tabindex="7">Terms of Use</a> | <a href="https://help.launchpad.net/Feedback"; accesskey="j" tabindex="8">Feedback</a> | <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="k" tabindex="9">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/join-launchpad'
--- lib/canonical/launchpad/tour/join-launchpad 2010-04-07 17:47:21 +0000
+++ lib/canonical/launchpad/tour/join-launchpad 2011-01-04 11:56:15 +0000
@@ -74,7 +74,7 @@
</ul><br />
<p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br />
<p>Want to know more? <a href="mailto:commercial@xxxxxxxxxxxxx";>Get in touch</a>!</p><br />
- <p><small>* US Dollars. Add VAT at 17.5% if you're in the European Union. Subscription is per project. Prices may change in the future.</small></p>
+ <p><small>* US Dollars. Add VAT at 20% if you're in the European Union. Subscription is per project. Prices may change in the future.</small></p>
<p style="float: right;"><a href="https://launchpad.net/projects/+new";>Register your project ></a></p><br />
</p>
@@ -114,7 +114,7 @@
<a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/ppa'
--- lib/canonical/launchpad/tour/ppa 2010-04-07 17:47:21 +0000
+++ lib/canonical/launchpad/tour/ppa 2011-01-04 11:56:15 +0000
@@ -113,7 +113,7 @@
<a href="community-support" accesskey="g" tabindex="5">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/release-management'
--- lib/canonical/launchpad/tour/release-management 2010-01-08 20:39:15 +0000
+++ lib/canonical/launchpad/tour/release-management 2011-01-04 11:56:15 +0000
@@ -96,7 +96,7 @@
<a href="join-launchpad" title="Read about commercial subscriptions and free access to Launchpad" accesskey="g" tabindex="5" title="Read about commercial subscriptions and free access to Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/canonical/launchpad/tour/translation'
--- lib/canonical/launchpad/tour/translation 2010-04-07 17:47:21 +0000
+++ lib/canonical/launchpad/tour/translation 2011-01-04 11:56:15 +0000
@@ -113,7 +113,7 @@
<a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
</li>
<li class="copyright">
- © 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
+ © 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal"; accesskey="h" tabindex="6">Terms of Use</a> : <a href="https://help.launchpad.net/Feedback"; accesskey="i" tabindex="7">Feedback</a> : <a href="https://answers.launchpad.net/launchpad-project/+faqs"; accesskey="j" tabindex="8">FAQ</a>
</li>
</ul>
</div>
=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt 2010-12-16 15:42:22 +0000
+++ lib/lp/app/templates/base-layout-macros.pt 2011-01-04 11:56:15 +0000
@@ -817,7 +817,7 @@
</div>
<div class="colophon">
- © 2004-2010
+ © 2004-2011
<a href="http://canonical.com/";>Canonical Ltd.</a>
•
<a tal:attributes="href string:${rooturl}legal">Terms of use</a>
