Merge lp:~matthew.revell/launchpad/VAT-update into lp:launchpad
- VAT-update
- 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 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Graham Binns (community) | code | Approve | |
|
Review via email:
|
|||
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-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'lib/canonical/launchpad/tour/api' |
| 2 | --- lib/canonical/launchpad/tour/api 2010-01-08 20:39:15 +0000 |
| 3 | +++ lib/canonical/launchpad/tour/api 2011-01-05 15:32:12 +0000 |
| 4 | @@ -1,70 +1,70 @@ |
| 5 | -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 6 | -<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"> |
| 7 | -<head> |
| 8 | - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> |
| 9 | - <meta content="The Launchpad API and Python library (launchpadlib) give you direct access to your data in Launchpad." name="description"/> |
| 10 | - <meta content="canonical, launchpad, tour" name="keywords"/> |
| 11 | - <meta content="en-US" name="language"/> |
| 12 | - <title>Launchpad tour</title> |
| 13 | - <style media="all" type="text/css"> |
| 14 | - @import "launchpad-tour.css"; |
| 15 | - </style> |
| 16 | - <script type="text/javascript" src="jquery-1.2.6.pack.js"></script> |
| 17 | - <script type="text/javascript" src="launchpad-tour.js"></script> |
| 18 | - <script type="text/javascript" src="selector.js"></script> |
| 19 | -</head> |
| 20 | -<body> |
| 21 | - <div id="container"> |
| 22 | - <p class="page-number">8 of 11</p> |
| 23 | - <ul id="navigation-drop-down"> |
| 24 | - <li class="button-next"><a id="btnNext" href="feature-tracking" tabindex="1" accesskey="1" title="Read about spec tracking in Launchpad">Next</a></li> |
| 25 | - <li class="home"><a href="index" accesskey="2">Launchpad tour home</a></li> |
| 26 | - <li><a href="bugs" accesskey="3">Cross-project bug tracking</a></li> |
| 27 | - <li><a href="branch-hosting-tracking" accesskey="4">Code hosting and review</a></li> |
| 28 | - <li><a href="translation" accesskey="5">Web-based translation</a></li> |
| 29 | - <li><a href="community" accesskey="6">Mailing lists and teams</a></li> |
| 30 | - <li><a href="ppa" accesskey="7">Software distribution</a></li> |
| 31 | +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 32 | +<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US"> |
| 33 | +<head> |
| 34 | + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> |
| 35 | + <meta content="The Launchpad API and Python library (launchpadlib) give you direct access to your data in Launchpad." name="description"/> |
| 36 | + <meta content="canonical, launchpad, tour" name="keywords"/> |
| 37 | + <meta content="en-US" name="language"/> |
| 38 | + <title>Launchpad tour</title> |
| 39 | + <style media="all" type="text/css"> |
| 40 | + @import "launchpad-tour.css"; |
| 41 | + </style> |
| 42 | + <script type="text/javascript" src="jquery-1.2.6.pack.js"></script> |
| 43 | + <script type="text/javascript" src="launchpad-tour.js"></script> |
| 44 | + <script type="text/javascript" src="selector.js"></script> |
| 45 | +</head> |
| 46 | +<body> |
| 47 | + <div id="container"> |
| 48 | + <p class="page-number">8 of 11</p> |
| 49 | + <ul id="navigation-drop-down"> |
| 50 | + <li class="button-next"><a id="btnNext" href="feature-tracking" tabindex="1" accesskey="1" title="Read about spec tracking in Launchpad">Next</a></li> |
| 51 | + <li class="home"><a href="index" accesskey="2">Launchpad tour home</a></li> |
| 52 | + <li><a href="bugs" accesskey="3">Cross-project bug tracking</a></li> |
| 53 | + <li><a href="branch-hosting-tracking" accesskey="4">Code hosting and review</a></li> |
| 54 | + <li><a href="translation" accesskey="5">Web-based translation</a></li> |
| 55 | + <li><a href="community" accesskey="6">Mailing lists and teams</a></li> |
| 56 | + <li><a href="ppa" accesskey="7">Software distribution</a></li> |
| 57 | <li><a href="community-support" accesskey="8">Community support</a></li> |
| 58 | - <li class="current"><a href="api" accesskey="9">Beta: web services API</a></li> |
| 59 | - <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li> |
| 60 | - <li><a href="release-management" accesskey="b">Release management</a></li> |
| 61 | - <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li> |
| 62 | - </ul> |
| 63 | - <div id="page-intro-top"></div> |
| 64 | - <div id="page-intro"> |
| 65 | - <h1>API and Python library</h1> |
| 66 | - <p> |
| 67 | - <img src="images/api/main-image.jpg" alt="A mock-up of Python code using launchpadlib" /> |
| 68 | - </p> |
| 69 | - <p class="intro-text"> |
| 70 | + <li class="current"><a href="api" accesskey="9">Beta: web services API</a></li> |
| 71 | + <li><a href="feature-tracking" accesskey="a">Lightweight specifications</a></li> |
| 72 | + <li><a href="release-management" accesskey="b">Release management</a></li> |
| 73 | + <li><a href="join-launchpad" accesskey="c">Join Launchpad!</a></li> |
| 74 | + </ul> |
| 75 | + <div id="page-intro-top"></div> |
| 76 | + <div id="page-intro"> |
| 77 | + <h1>API and Python library</h1> |
| 78 | + <p> |
| 79 | + <img src="images/api/main-image.jpg" alt="A mock-up of Python code using launchpadlib" /> |
| 80 | + </p> |
| 81 | + <p class="intro-text"> |
| 82 | <strong>Create your own applications that work directly with Launchpad.</strong> Join the beta of our RESTful web services API. |
| 83 | - |
| 84 | -<br /><br /> |
| 85 | -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. |
| 86 | - </p> |
| 87 | - <div id="link-holder"><a href="https://help.launchpad.net/API">Get started with the Launchpad API ></a></div> |
| 88 | - </div> |
| 89 | - <div id="page-intro-bottom"></div> |
| 90 | + |
| 91 | +<br /><br /> |
| 92 | +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. |
| 93 | + </p> |
| 94 | + <div id="link-holder"><a href="https://help.launchpad.net/API">Get started with the Launchpad API ></a></div> |
| 95 | + </div> |
| 96 | + <div id="page-intro-bottom"></div> |
| 97 | <ul id="secondary-navigation"> |
| 98 | <li class="button-prev"> |
| 99 | <a href="community-support" title="Back to the user support tracking page" accesskey="d" tabindex="2">Back</a> |
| 100 | - </li> |
| 101 | - <li class="button-next"> |
| 102 | - <a href="feature-tracking" accesskey="e" tabindex="3" title="Read about spec tracking in Launchpad">Next</a> |
| 103 | - </li> |
| 104 | - </ul> |
| 105 | - <div id="further-information"> |
| 106 | - <div class="furthur-information-block"> |
| 107 | - <div class="furthur-information-block-top"></div> |
| 108 | - <div class="furthur-information-block-mid"> |
| 109 | - <div class="block"> |
| 110 | - <h3>What's available</h3> |
| 111 | - <h4>The Launchpad API frees your data and makes it easy to mould Launchpad to your workflow. </h4> |
| 112 | - <p class="screen-holder"> |
| 113 | - <img src="images/api/1.png" alt="News about what's new in the API" /> </p> |
| 114 | - <p> |
| 115 | + </li> |
| 116 | + <li class="button-next"> |
| 117 | + <a href="feature-tracking" accesskey="e" tabindex="3" title="Read about spec tracking in Launchpad">Next</a> |
| 118 | + </li> |
| 119 | + </ul> |
| 120 | + <div id="further-information"> |
| 121 | + <div class="furthur-information-block"> |
| 122 | + <div class="furthur-information-block-top"></div> |
| 123 | + <div class="furthur-information-block-mid"> |
| 124 | + <div class="block"> |
| 125 | + <h3>What's available</h3> |
| 126 | + <h4>The Launchpad API frees your data and makes it easy to mould Launchpad to your workflow. </h4> |
| 127 | + <p class="screen-holder"> |
| 128 | + <img src="images/api/1.png" alt="News about what's new in the API" /> </p> |
| 129 | + <p> |
| 130 | During the beta, we're exposing more and more of Launchpad through the API. Right now the API gives you access to: |
| 131 | - |
| 132 | + |
| 133 | </p> |
| 134 | <p> |
| 135 | <ul> |
| 136 | @@ -75,17 +75,17 @@ |
| 137 | </p> |
| 138 | |
| 139 | <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> |
| 140 | - |
| 141 | - |
| 142 | - |
| 143 | - </ul> |
| 144 | - </div> |
| 145 | + |
| 146 | + |
| 147 | + |
| 148 | + </ul> |
| 149 | + </div> |
| 150 | <div class="block odd"> |
| 151 | - <h3>Python library </h3> |
| 152 | - <h4>Using launchpadlib you can treat Launchpad data like any other Python object.</h4> |
| 153 | - <p class="screen-holder"> |
| 154 | - <img src="images/api/3.png" alt="Using launchpadlib" /> </p> |
| 155 | - <p> |
| 156 | + <h3>Python library </h3> |
| 157 | + <h4>Using launchpadlib you can treat Launchpad data like any other Python object.</h4> |
| 158 | + <p class="screen-holder"> |
| 159 | + <img src="images/api/3.png" alt="Using launchpadlib" /> </p> |
| 160 | + <p> |
| 161 | If you're a Python developer, you can access and manipulate data in Launchpad as though it were any other Python object.<p> |
| 162 | |
| 163 | <p><br /> |
| 164 | @@ -98,42 +98,42 @@ |
| 165 | <br /> |
| 166 | </p> |
| 167 | |
| 168 | - <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>. |
| 169 | - </p> |
| 170 | - </div> |
| 171 | - <div class="clear"></div> |
| 172 | - </div> |
| 173 | - <div class="furthur-information-block-bot"></div> |
| 174 | - </div> |
| 175 | - <div class="furthur-information-block singular"> |
| 176 | - <div class="furthur-information-block-top"></div> |
| 177 | - <div class="furthur-information-block-mid"> |
| 178 | + <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>. |
| 179 | + </p> |
| 180 | + </div> |
| 181 | + <div class="clear"></div> |
| 182 | + </div> |
| 183 | + <div class="furthur-information-block-bot"></div> |
| 184 | + </div> |
| 185 | + <div class="furthur-information-block singular"> |
| 186 | + <div class="furthur-information-block-top"></div> |
| 187 | + <div class="furthur-information-block-mid"> |
| 188 | <div class="block"> |
| 189 | - <h3>Simple account authentication</h3> |
| 190 | + <h3>Simple account authentication</h3> |
| 191 | <h4> |
| 192 | - Your application's users log into their own Launchpad account.</h4> |
| 193 | - <p class="screen-holder"> |
| 194 | + Your application's users log into their own Launchpad account.</h4> |
| 195 | + <p class="screen-holder"> |
| 196 | <img src="images/api/2.png" alt="The API's authentication page" /> |
| 197 | - </p> |
| 198 | + </p> |
| 199 | <p> |
| 200 | - 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> |
| 201 | - </div> |
| 202 | - <div class="clear"></div> |
| 203 | - <div class="furthur-information-block-bot"></div> |
| 204 | - </div> |
| 205 | - </div> |
| 206 | - </div> |
| 207 | + 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> |
| 208 | + </div> |
| 209 | + <div class="clear"></div> |
| 210 | + <div class="furthur-information-block-bot"></div> |
| 211 | + </div> |
| 212 | + </div> |
| 213 | + </div> |
| 214 | <ul id="footer-navigation"> |
| 215 | <li class="button-prev"> |
| 216 | <a href="community-support" title="Back to the user support tracking page" accesskey="f" tabindex="4">Back</a> |
| 217 | - </li> |
| 218 | - <li class="button-next" title="Read about spec tracking in Launchpad"> |
| 219 | - <a href="feature-tracking" accesskey="g" tabindex="5">Next</a> |
| 220 | - </li> |
| 221 | + </li> |
| 222 | + <li class="button-next" title="Read about spec tracking in Launchpad"> |
| 223 | + <a href="feature-tracking" accesskey="g" tabindex="5">Next</a> |
| 224 | + </li> |
| 225 | <li class="copyright"> |
| 226 | - © 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> |
| 227 | - </li> |
| 228 | - </ul> |
| 229 | - </div> |
| 230 | -</body> |
| 231 | + © 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> |
| 232 | + </li> |
| 233 | + </ul> |
| 234 | + </div> |
| 235 | +</body> |
| 236 | </html> |
| 237 | |
| 238 | === modified file 'lib/canonical/launchpad/tour/branch-hosting-tracking' |
| 239 | --- lib/canonical/launchpad/tour/branch-hosting-tracking 2010-04-07 17:47:21 +0000 |
| 240 | +++ lib/canonical/launchpad/tour/branch-hosting-tracking 2011-01-05 15:32:12 +0000 |
| 241 | @@ -127,7 +127,7 @@ |
| 242 | <a href="translation" accesskey="g" tabindex="5" title="Read about software translation in Launchpad">Next</a> |
| 243 | </li> |
| 244 | <li class="copyright"> |
| 245 | - © 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> |
| 246 | + © 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> |
| 247 | </li> |
| 248 | </ul> |
| 249 | </div> |
| 250 | |
| 251 | === modified file 'lib/canonical/launchpad/tour/bugs' |
| 252 | --- lib/canonical/launchpad/tour/bugs 2010-10-24 21:00:11 +0000 |
| 253 | +++ lib/canonical/launchpad/tour/bugs 2011-01-05 15:32:12 +0000 |
| 254 | @@ -134,7 +134,7 @@ |
| 255 | <a href="branch-hosting-tracking" accesskey="g" tabindex="5" title="Read about code hosting and review in Launchpad">Next</a> |
| 256 | </li> |
| 257 | <li class="copyright"> |
| 258 | - © 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> |
| 259 | + © 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> |
| 260 | </li> |
| 261 | </ul> |
| 262 | </div> |
| 263 | |
| 264 | === modified file 'lib/canonical/launchpad/tour/community' |
| 265 | --- lib/canonical/launchpad/tour/community 2010-01-08 20:39:15 +0000 |
| 266 | +++ lib/canonical/launchpad/tour/community 2011-01-05 15:32:12 +0000 |
| 267 | @@ -113,7 +113,7 @@ |
| 268 | <a href="ppa" accesskey="g" tabindex="5" title="Read about building and distributing Ubuntu packages">Next</a> |
| 269 | </li> |
| 270 | <li class="copyright"> |
| 271 | - © 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> |
| 272 | + © 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> |
| 273 | </li> |
| 274 | </ul> |
| 275 | </div> |
| 276 | |
| 277 | === modified file 'lib/canonical/launchpad/tour/community-support' |
| 278 | --- lib/canonical/launchpad/tour/community-support 2010-01-08 20:39:15 +0000 |
| 279 | +++ lib/canonical/launchpad/tour/community-support 2011-01-05 15:32:12 +0000 |
| 280 | @@ -106,7 +106,7 @@ |
| 281 | <a href="api" tabindex="5" accesskey="g">Next</a> |
| 282 | </li> |
| 283 | <li class="copyright"> |
| 284 | - © 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> |
| 285 | + © 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> |
| 286 | </li> |
| 287 | </ul> |
| 288 | </div> |
| 289 | |
| 290 | === modified file 'lib/canonical/launchpad/tour/feature-tracking' |
| 291 | --- lib/canonical/launchpad/tour/feature-tracking 2010-01-08 20:39:15 +0000 |
| 292 | +++ lib/canonical/launchpad/tour/feature-tracking 2011-01-05 15:32:12 +0000 |
| 293 | @@ -88,7 +88,7 @@ |
| 294 | <a href="release-management" accesskey="g" tabindex="5" title="Read about managing software releases">Next</a> |
| 295 | </li> |
| 296 | <li class="copyright"> |
| 297 | - © 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> |
| 298 | + © 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> |
| 299 | </li> |
| 300 | </ul> |
| 301 | </div> |
| 302 | |
| 303 | === modified file 'lib/canonical/launchpad/tour/index' |
| 304 | --- lib/canonical/launchpad/tour/index 2010-04-21 09:47:58 +0000 |
| 305 | +++ lib/canonical/launchpad/tour/index 2011-01-05 15:32:12 +0000 |
| 306 | @@ -174,7 +174,7 @@ |
| 307 | <a href="bugs" accesskey="l" tabindex="10" title="Read about bug tracking in Launchpad">Next</a> |
| 308 | </li> |
| 309 | <li class="copyright"> |
| 310 | - © 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> |
| 311 | + © 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> |
| 312 | </li> |
| 313 | </ul> |
| 314 | </div> |
| 315 | |
| 316 | === modified file 'lib/canonical/launchpad/tour/join-launchpad' |
| 317 | --- lib/canonical/launchpad/tour/join-launchpad 2010-04-07 17:47:21 +0000 |
| 318 | +++ lib/canonical/launchpad/tour/join-launchpad 2011-01-05 15:32:12 +0000 |
| 319 | @@ -74,7 +74,7 @@ |
| 320 | </ul><br /> |
| 321 | <p>To get going, register your project and select <em>Other/Proprietary</em> as its licence.</p><br /> |
| 322 | <p>Want to know more? <a href="mailto:commercial@launchpad.net">Get in touch</a>!</p><br /> |
| 323 | - <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> |
| 324 | + <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> |
| 325 | <p style="float: right;"><a href="https://launchpad.net/projects/+new">Register your project ></a></p><br /> |
| 326 | |
| 327 | </p> |
| 328 | @@ -114,7 +114,7 @@ |
| 329 | <a href="index" title="Return to the start of the Launchpad tour" accesskey="g" tabindex="5">Start</a> |
| 330 | </li> |
| 331 | <li class="copyright"> |
| 332 | - © 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> |
| 333 | + © 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> |
| 334 | </li> |
| 335 | </ul> |
| 336 | </div> |
| 337 | |
| 338 | === modified file 'lib/canonical/launchpad/tour/ppa' |
| 339 | --- lib/canonical/launchpad/tour/ppa 2010-04-07 17:47:21 +0000 |
| 340 | +++ lib/canonical/launchpad/tour/ppa 2011-01-05 15:32:12 +0000 |
| 341 | @@ -113,7 +113,7 @@ |
| 342 | <a href="community-support" accesskey="g" tabindex="5">Next</a> |
| 343 | </li> |
| 344 | <li class="copyright"> |
| 345 | - © 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> |
| 346 | + © 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> |
| 347 | </li> |
| 348 | </ul> |
| 349 | </div> |
| 350 | |
| 351 | === modified file 'lib/canonical/launchpad/tour/release-management' |
| 352 | --- lib/canonical/launchpad/tour/release-management 2010-01-08 20:39:15 +0000 |
| 353 | +++ lib/canonical/launchpad/tour/release-management 2011-01-05 15:32:12 +0000 |
| 354 | @@ -96,7 +96,7 @@ |
| 355 | <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> |
| 356 | </li> |
| 357 | <li class="copyright"> |
| 358 | - © 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> |
| 359 | + © 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> |
| 360 | </li> |
| 361 | </ul> |
| 362 | </div> |
| 363 | |
| 364 | === modified file 'lib/canonical/launchpad/tour/translation' |
| 365 | --- lib/canonical/launchpad/tour/translation 2010-04-07 17:47:21 +0000 |
| 366 | +++ lib/canonical/launchpad/tour/translation 2011-01-05 15:32:12 +0000 |
| 367 | @@ -113,7 +113,7 @@ |
| 368 | <a href="community" accesskey="g" tabindex="5" title="Read about mailing lists and teams in Launchpad">Next</a> |
| 369 | </li> |
| 370 | <li class="copyright"> |
| 371 | - © 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> |
| 372 | + © 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> |
| 373 | </li> |
| 374 | </ul> |
| 375 | </div> |
| 376 | |
| 377 | === modified file 'lib/lp/app/stories/basics/copyright.txt' |
| 378 | --- lib/lp/app/stories/basics/copyright.txt 2010-01-13 02:18:53 +0000 |
| 379 | +++ lib/lp/app/stories/basics/copyright.txt 2011-01-05 15:32:12 +0000 |
| 380 | @@ -5,11 +5,11 @@ |
| 381 | >>> browser.open('http://launchpad.dev/') |
| 382 | >>> browser.getLink('Take the tour').click() |
| 383 | >>> print extract_text(find_tag_by_id(browser.contents, 'footer-navigation')) |
| 384 | - Next...© 2004-2010 Canonical Ltd... |
| 385 | + Next...© 2004-2011 Canonical Ltd... |
| 386 | |
| 387 | The main template. |
| 388 | |
| 389 | >>> browser.open('http://launchpad.dev') |
| 390 | >>> print extract_text(find_tag_by_id(browser.contents, 'footer')) |
| 391 | - © 2004-2010 Canonical Ltd. |
| 392 | + © 2004-2011 Canonical Ltd. |
| 393 | ... |
| 394 | |
| 395 | === modified file 'lib/lp/app/templates/base-layout-macros.pt' |
| 396 | --- lib/lp/app/templates/base-layout-macros.pt 2010-12-21 18:48:13 +0000 |
| 397 | +++ lib/lp/app/templates/base-layout-macros.pt 2011-01-05 15:32:12 +0000 |
| 398 | @@ -234,7 +234,7 @@ |
| 399 | </div> |
| 400 | |
| 401 | <div class="colophon"> |
| 402 | - © 2004-2010 |
| 403 | + © 2004-2011 |
| 404 | <a href="http://canonical.com/">Canonical Ltd.</a> |
| 405 | • |
| 406 | <a tal:attributes="href string:${rooturl}legal">Terms of use</a> |
As discussed on IRC, the tour/api file is full of DOS line-endings. These need to be removed to avoid future pain.