Merge lp:~marcoceppi/juju-website/footer-fix into lp:~juju-web/juju-website/trunk

Proposed by Marco Ceppi
Status: Merged
Merged at revision: 8
Proposed branch: lp:~marcoceppi/juju-website/footer-fix
Merge into: lp:~juju-web/juju-website/trunk
Diff against target: 44 lines (+5/-6)
1 file modified
themes/ubuntudeveloperportal/footer.php (+5/-6)
To merge this branch: bzr merge lp:~marcoceppi/juju-website/footer-fix
Reviewer Review Type Date Requested Status
Marco Ceppi Approve
Review via email: mp+136469@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Marco Ceppi (marcoceppi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'themes/ubuntudeveloperportal/footer.php'
2--- themes/ubuntudeveloperportal/footer.php 2012-11-14 21:51:56 +0000
3+++ themes/ubuntudeveloperportal/footer.php 2012-11-27 17:35:27 +0000
4@@ -13,7 +13,6 @@
5 <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
6 <li><a href="/resources/videos/">Videos</a></li>
7 <li><a href="http://uistage.jujucharms.com:8080/">Web UI demo site</a></li>
8-
9 </ul>
10 <ul>
11 <li><a href="/community">Community</a></li>
12@@ -25,7 +24,7 @@
13 <li><a href="https://launchpad.net/charms">Charms</a></li>
14 </ul>
15 </nav>
16- <p>&copy; <?php echo date('Y'); ?> Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd. <a class="link-bug" href="https://bugs.launchpad.net/ubuntudeveloperportal/+filebug">Report a bug on this site</a></p>
17+ <p>&copy; <?php echo date('Y'); ?> Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd. <a class="link-bug" href="https://bugs.launchpad.net/juju-website/+filebug">Report a bug on this site</a></p>
18 </div>
19 </footer>
20
21@@ -37,13 +36,13 @@
22
23 <script type="text/javascript">
24 var _gaq = _gaq || [];
25-
26-/* Save to developer.ubuntu.com profile */
27+
28+/* Save to developer.ubuntu.com profile */
29 _gaq.push(['_setAccount', 'UA-1018242-33']);
30 _gaq.push(['_setDomainName', '.ubuntu.com']);
31 _gaq.push(['_trackPageview']);
32
33-/* Save to www.ubuntu.com profile */
34+/* Save to www.ubuntu.com profile */
35 _gaq.push(['b._setAccount', 'UA-1018242-4']);
36 _gaq.push(['b._setDomainName', '.ubuntu.com']);
37 _gaq.push(['b._trackPageview']);
38@@ -58,4 +57,4 @@
39 <?php wp_footer(); ?>
40
41 </body>
42-</html>
43\ No newline at end of file
44+</html>

Subscribers

People subscribed via source and target branches

to all changes: