Launchpad itself

Merge lp:~matthew.revell/launchpad/VAT-update into lp:launchpad

  1. VAT-update
  2. Merge into devel
Proposed by Matthew Revell
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 12168
Proposed branch: lp:~matthew.revell/launchpad/VAT-update
Merge into: lp:launchpad
Diff against target: 406 lines (+115/-115)
13 files modified
lib/canonical/launchpad/tour/api (+101/-101)
lib/canonical/launchpad/tour/branch-hosting-tracking (+1/-1)
lib/canonical/launchpad/tour/bugs (+1/-1)
lib/canonical/launchpad/tour/community (+1/-1)
lib/canonical/launchpad/tour/community-support (+1/-1)
lib/canonical/launchpad/tour/feature-tracking (+1/-1)
lib/canonical/launchpad/tour/index (+1/-1)
lib/canonical/launchpad/tour/join-launchpad (+2/-2)
lib/canonical/launchpad/tour/ppa (+1/-1)
lib/canonical/launchpad/tour/release-management (+1/-1)
lib/canonical/launchpad/tour/translation (+1/-1)
lib/lp/app/stories/basics/copyright.txt (+2/-2)
lib/lp/app/templates/base-layout-macros.pt (+1/-1)
To merge this branch: bzr merge lp:~matthew.revell/launchpad/VAT-update
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+45113@code.launchpad.net

Commit message

[bug=697206,697208] [r=gmb][ui=none] Changes the VAT rate quoted in the tour to 20%, following increase in UK VAT. Also updates the tour and site-wide footer to include 2011 in the copyright message.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) wrote :

As discussed on IRC, the tour/api file is full of DOS line-endings. These need to be removed to avoid future pain.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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-05 15:32:12 +0000
@@ -1,70 +1,70 @@
1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">2<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
3<head>3<head>
4 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />4 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
5 <meta content="The Launchpad API and Python library (launchpadlib) give you direct access to your data in Launchpad." name="description"/>5 <meta content="The Launchpad API and Python library (launchpadlib) give you direct access to your data in Launchpad." name="description"/>
6 <meta content="canonical, launchpad, tour" name="keywords"/>6 <meta content="canonical, launchpad, tour" name="keywords"/>
7 <meta content="en-US" name="language"/>7 <meta content="en-US" name="language"/>
8 <title>Launchpad tour</title>8 <title>Launchpad tour</title>
9 <style media="all" type="text/css">9 <style media="all" type="text/css">
10 @import "launchpad-tour.css";10 @import "launchpad-tour.css";
11 </style>11 </style>
12 <script type="text/javascript" src="jquery-1.2.6.pack.js"></script>12 <script type="text/javascript" src="jquery-1.2.6.pack.js"></script>
13 <script type="text/javascript" src="launchpad-tour.js"></script>13 <script type="text/javascript" src="launchpad-tour.js"></script>
14 <script type="text/javascript" src="selector.js"></script>14 <script type="text/javascript" src="selector.js"></script>
15</head>15</head>
16<body>16<body>
17 <div id="container">17 <div id="container">
18 <p class="page-number">8 of 11</p>18 <p class="page-number">8 of 11</p>
19 <ul id="navigation-drop-down">19 <ul id="navigation-drop-down">
20 <li class="button-next"><a id="btnNext" href="feature-tracking" tabindex="1" accesskey="1" title="Read about spec tracking in Launchpad">Next</a></li>20 <li class="button-next"><a id="btnNext" href="feature-tracking" tabindex="1" accesskey="1" title="Read about spec tracking in Launchpad">Next</a></li>
21 <li class="home"><a href="index" accesskey="2">Launchpad tour home</a></li>21 <li class="home"><a href="index" accesskey="2">Launchpad tour home</a></li>
22 <li><a href="bugs" accesskey="3">Cross-project bug tracking</a></li>22 <li><a href="bugs" accesskey="3">Cross-project bug tracking</a></li>
23 <li><a href="branch-hosting-tracking" accesskey="4">Code hosting and review</a></li>23 <li><a href="branch-hosting-tracking" accesskey="4">Code hosting and review</a></li>
24 <li><a href="translation" accesskey="5">Web-based translation</a></li>24 <li><a href="translation" accesskey="5">Web-based translation</a></li>
25 <li><a href="community" accesskey="6">Mailing lists and teams</a></li>25 <li><a href="community" accesskey="6">Mailing lists and teams</a></li>
26 <li><a href="ppa" accesskey="7">Software distribution</a></li>26 <li><a href="ppa" accesskey="7">Software distribution</a></li>
27 <li><a href="community-support" accesskey="8">Community support</a></li>27 <li><a href="community-support" accesskey="8">Community support</a></li>
28 <li class="current"><a href="api" accesskey="9">Beta: web services API</a></li>28 <li class="current"><a href="api" accesskey="9">Beta: web services API</a></li>
29 <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li>29 <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li>
30 <li><a href="release-management" accesskey="b">Release management</a></li>30 <li><a href="release-management" accesskey="b">Release management</a></li>
31 <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>31 <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li>
32 </ul>32 </ul>
33 <div id="page-intro-top"></div>33 <div id="page-intro-top"></div>
34 <div id="page-intro">34 <div id="page-intro">
35 <h1>API and Python library</h1>35 <h1>API and Python library</h1>
36 <p>36 <p>
37 <img src="images/api/main-image.jpg" alt="A mock-up of Python code using launchpadlib" />37 <img src="images/api/main-image.jpg" alt="A mock-up of Python code using launchpadlib" />
38 </p>38 </p>
39 <p class="intro-text">39 <p class="intro-text">
40 <strong>Create your own applications that work directly with Launchpad.</strong> Join the beta of our RESTful web services API.40 <strong>Create your own applications that work directly with Launchpad.</strong> Join the beta of our RESTful web services API.
4141
42<br /><br />42<br /><br />
43We've even done the hard work for you: use our LGPL Python library &mdash; <a href="https://help.launchpad.net/API/launchpadlib/">launchpadlib</a> &mdash; to manipulate data in Launchpad just like any other Python object.43We've even done the hard work for you: use our LGPL Python library &mdash; <a href="https://help.launchpad.net/API/launchpadlib/">launchpadlib</a> &mdash; to manipulate data in Launchpad just like any other Python object.
44 </p>44 </p>
45 <div id="link-holder"><a href="https://help.launchpad.net/API">Get started with the Launchpad API &gt;</a></div>45 <div id="link-holder"><a href="https://help.launchpad.net/API">Get started with the Launchpad API &gt;</a></div>
46 </div>46 </div>
47 <div id="page-intro-bottom"></div>47 <div id="page-intro-bottom"></div>
48 <ul id="secondary-navigation">48 <ul id="secondary-navigation">
49 <li class="button-prev">49 <li class="button-prev">
50 <a href="community-support" title="Back to the user support tracking page" accesskey="d" tabindex="2">Back</a>50 <a href="community-support" title="Back to the user support tracking page" accesskey="d" tabindex="2">Back</a>
51 </li>51 </li>
52 <li class="button-next">52 <li class="button-next">
53 <a href="feature-tracking" accesskey="e" tabindex="3" title="Read about spec tracking in Launchpad">Next</a>53 <a href="feature-tracking" accesskey="e" tabindex="3" title="Read about spec tracking in Launchpad">Next</a>
54 </li>54 </li>
55 </ul>55 </ul>
56 <div id="further-information">56 <div id="further-information">
57 <div class="furthur-information-block">57 <div class="furthur-information-block">
58 <div class="furthur-information-block-top"></div>58 <div class="furthur-information-block-top"></div>
59 <div class="furthur-information-block-mid">59 <div class="furthur-information-block-mid">
60 <div class="block">60 <div class="block">
61 <h3>What's available</h3>61 <h3>What's available</h3>
62 <h4>The Launchpad API frees your data and makes it easy to mould Launchpad to your workflow. </h4>62 <h4>The Launchpad API frees your data and makes it easy to mould Launchpad to your workflow. </h4>
63 <p class="screen-holder">63 <p class="screen-holder">
64 <img src="images/api/1.png" alt="News about what's new in the API" /> </p>64 <img src="images/api/1.png" alt="News about what's new in the API" /> </p>
65 <p>65 <p>
66 During the beta, we're exposing more and more of Launchpad through the API. Right now the API gives you access to:66 During the beta, we're exposing more and more of Launchpad through the API. Right now the API gives you access to:
6767
68 </p>68 </p>
69 <p>69 <p>
70 <ul>70 <ul>
@@ -75,17 +75,17 @@
75 </p>75 </p>
7676
77 <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>77 <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>
7878
7979
8080
81 </ul>81 </ul>
82 </div>82 </div>
83 <div class="block odd">83 <div class="block odd">
84 <h3>Python library </h3>84 <h3>Python library </h3>
85 <h4>Using launchpadlib you can treat Launchpad data like any other Python object.</h4>85 <h4>Using launchpadlib you can treat Launchpad data like any other Python object.</h4>
86 <p class="screen-holder">86 <p class="screen-holder">
87 <img src="images/api/3.png" alt="Using launchpadlib" /> </p>87 <img src="images/api/3.png" alt="Using launchpadlib" /> </p>
88 <p>88 <p>
89 If you're a Python developer, you can access and manipulate data in Launchpad as though it were any other Python object.<p>89 If you're a Python developer, you can access and manipulate data in Launchpad as though it were any other Python object.<p>
9090
91 <p><br />91 <p><br />
@@ -98,42 +98,42 @@
98 <br />98 <br />
99 </p>99 </p>
100100
101 <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 &gt;</a>.101 <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 &gt;</a>.
102 </p>102 </p>
103 </div>103 </div>
104 <div class="clear"></div>104 <div class="clear"></div>
105 </div>105 </div>
106 <div class="furthur-information-block-bot"></div>106 <div class="furthur-information-block-bot"></div>
107 </div>107 </div>
108 <div class="furthur-information-block singular">108 <div class="furthur-information-block singular">
109 <div class="furthur-information-block-top"></div>109 <div class="furthur-information-block-top"></div>
110 <div class="furthur-information-block-mid">110 <div class="furthur-information-block-mid">
111 <div class="block">111 <div class="block">
112 <h3>Simple account authentication</h3>112 <h3>Simple account authentication</h3>
113 <h4>113 <h4>
114 Your application's users log into their own Launchpad account.</h4>114 Your application's users log into their own Launchpad account.</h4>
115 <p class="screen-holder">115 <p class="screen-holder">
116 <img src="images/api/2.png" alt="The API's authentication page" />116 <img src="images/api/2.png" alt="The API's authentication page" />
117 </p>117 </p>
118 <p>118 <p>
119 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>119 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>
120 </div>120 </div>
121 <div class="clear"></div>121 <div class="clear"></div>
122 <div class="furthur-information-block-bot"></div>122 <div class="furthur-information-block-bot"></div>
123 </div>123 </div>
124 </div>124 </div>
125 </div>125 </div>
126 <ul id="footer-navigation">126 <ul id="footer-navigation">
127 <li class="button-prev">127 <li class="button-prev">
128 <a href="community-support" title="Back to the user support tracking page" accesskey="f" tabindex="4">Back</a>128 <a href="community-support" title="Back to the user support tracking page" accesskey="f" tabindex="4">Back</a>
129 </li>129 </li>
130 <li class="button-next" title="Read about spec tracking in Launchpad">130 <li class="button-next" title="Read about spec tracking in Launchpad">
131 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>131 <a href="feature-tracking" accesskey="g" tabindex="5">Next</a>
132 </li>132 </li>
133 <li class="copyright">133 <li class="copyright">
134 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>134 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
135 </li>135 </li>
136 </ul>136 </ul>
137 </div>137 </div>
138</body>138</body>
139</html>139</html>
140140
=== 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-05 15:32:12 +0000
@@ -127,7 +127,7 @@
127 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>127 <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a>
128 </li>128 </li>
129 <li class="copyright">129 <li class="copyright">
130 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>130 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
131 </li>131 </li>
132 </ul>132 </ul>
133 </div>133 </div>
134134
=== 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-05 15:32:12 +0000
@@ -134,7 +134,7 @@
134 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>134 <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a>
135 </li>135 </li>
136 <li class="copyright">136 <li class="copyright">
137 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>137 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
138 </li>138 </li>
139 </ul>139 </ul>
140 </div>140 </div>
141141
=== 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-05 15:32:12 +0000
@@ -113,7 +113,7 @@
113 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>113 <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a>
114 </li>114 </li>
115 <li class="copyright">115 <li class="copyright">
116 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>116 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
117 </li>117 </li>
118 </ul>118 </ul>
119 </div>119 </div>
120120
=== 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-05 15:32:12 +0000
@@ -106,7 +106,7 @@
106 <a href="api" tabindex="5" accesskey="g">Next</a>106 <a href="api" tabindex="5" accesskey="g">Next</a>
107 </li>107 </li>
108 <li class="copyright">108 <li class="copyright">
109 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>109 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
110 </li>110 </li>
111 </ul>111 </ul>
112 </div>112 </div>
113113
=== 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-05 15:32:12 +0000
@@ -88,7 +88,7 @@
88 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>88 <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a>
89 </li>89 </li>
90 <li class="copyright">90 <li class="copyright">
91 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>91 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
92 </li>92 </li>
93 </ul>93 </ul>
94 </div>94 </div>
9595
=== 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-05 15:32:12 +0000
@@ -174,7 +174,7 @@
174 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>174 <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a>
175 </li>175 </li>
176 <li class="copyright">176 <li class="copyright">
177 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>177 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="i" tabindex="7">Terms of Use</a> &#124; <a href="https://help.launchpad.net/Feedback" accesskey="j" tabindex="8">Feedback</a> &#124; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="k" tabindex="9">FAQ</a>
178 </li>178 </li>
179 </ul>179 </ul>
180 </div>180 </div>
181181
=== 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-05 15:32:12 +0000
@@ -74,7 +74,7 @@
74 </ul><br />74 </ul><br />
75 <p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br />75 <p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br />
76 <p>Want to know more? <a href="mailto:commercial@launchpad.net">Get in touch</a>!</p><br />76 <p>Want to know more? <a href="mailto:commercial@launchpad.net">Get in touch</a>!</p><br />
77 <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>77 <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>
78 <p style="float: right;"><a href="https://launchpad.net/projects/+new">Register your project &gt;</a></p><br />78 <p style="float: right;"><a href="https://launchpad.net/projects/+new">Register your project &gt;</a></p><br />
7979
80 </p>80 </p>
@@ -114,7 +114,7 @@
114 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>114 <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a>
115 </li>115 </li>
116 <li class="copyright">116 <li class="copyright">
117 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>117 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
118 </li>118 </li>
119 </ul>119 </ul>
120 </div>120 </div>
121121
=== 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-05 15:32:12 +0000
@@ -113,7 +113,7 @@
113 <a href="community-support" accesskey="g" tabindex="5">Next</a>113 <a href="community-support" accesskey="g" tabindex="5">Next</a>
114 </li>114 </li>
115 <li class="copyright">115 <li class="copyright">
116 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>116 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
117 </li>117 </li>
118 </ul>118 </ul>
119 </div>119 </div>
120120
=== 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-05 15:32:12 +0000
@@ -96,7 +96,7 @@
96 <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>96 <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>
97 </li>97 </li>
98 <li class="copyright">98 <li class="copyright">
99 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>99 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
100 </li>100 </li>
101 </ul>101 </ul>
102 </div>102 </div>
103103
=== 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-05 15:32:12 +0000
@@ -113,7 +113,7 @@
113 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>113 <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a>
114 </li>114 </li>
115 <li class="copyright">115 <li class="copyright">
116 &copy; 2004-2010 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>116 &copy; 2004-2011 Canonical Ltd. <a href="https://help.launchpad.net/Legal" accesskey="h" tabindex="6">Terms of Use</a> &#58; <a href="https://help.launchpad.net/Feedback" accesskey="i" tabindex="7">Feedback</a> &#58; <a href="https://answers.launchpad.net/launchpad-project/+faqs" accesskey="j" tabindex="8">FAQ</a>
117 </li>117 </li>
118 </ul>118 </ul>
119 </div>119 </div>
120120
=== modified file 'lib/lp/app/stories/basics/copyright.txt'
--- lib/lp/app/stories/basics/copyright.txt 2010-01-13 02:18:53 +0000
+++ lib/lp/app/stories/basics/copyright.txt 2011-01-05 15:32:12 +0000
@@ -5,11 +5,11 @@
5 >>> browser.open('http://launchpad.dev/')5 >>> browser.open('http://launchpad.dev/')
6 >>> browser.getLink('Take the tour').click()6 >>> browser.getLink('Take the tour').click()
7 >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation'))7 >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation'))
8 Next...&copy; 2004-2010 Canonical Ltd...8 Next...&copy; 2004-2011 Canonical Ltd...
99
10The main template.10The main template.
1111
12 >>> browser.open('http://launchpad.dev')12 >>> browser.open('http://launchpad.dev')
13 >>> print extract_text(find_tag_by_id(browser.contents, 'footer'))13 >>> print extract_text(find_tag_by_id(browser.contents, 'footer'))
14 &copy; 2004-2010 Canonical Ltd.14 &copy; 2004-2011 Canonical Ltd.
15 ...15 ...
1616
=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt 2010-12-21 18:48:13 +0000
+++ lib/lp/app/templates/base-layout-macros.pt 2011-01-05 15:32:12 +0000
@@ -234,7 +234,7 @@
234 </div>234 </div>
235235
236 <div class="colophon">236 <div class="colophon">
237 &copy; 2004-2010237 &copy; 2004-2011
238 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>238 <a href="http://canonical.com/">Canonical&nbsp;Ltd.</a>
239 &nbsp;&bull;&nbsp;239 &nbsp;&bull;&nbsp;
240 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>240 <a tal:attributes="href string:${rooturl}legal">Terms of use</a>