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
=== modified file 'themes/ubuntudeveloperportal/footer.php'
--- themes/ubuntudeveloperportal/footer.php 2012-11-14 21:51:56 +0000
+++ themes/ubuntudeveloperportal/footer.php 2012-11-27 17:35:27 +0000
@@ -13,7 +13,6 @@
13 <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>13 <li><a href="http://juju.ubuntu.com/docs">Documentation</a></li>
14 <li><a href="/resources/videos/">Videos</a></li>14 <li><a href="/resources/videos/">Videos</a></li>
15 <li><a href="http://uistage.jujucharms.com:8080/">Web UI demo site</a></li>15 <li><a href="http://uistage.jujucharms.com:8080/">Web UI demo site</a></li>
16
17 </ul>16 </ul>
18 <ul>17 <ul>
19 <li><a href="/community">Community</a></li>18 <li><a href="/community">Community</a></li>
@@ -25,7 +24,7 @@
25 <li><a href="https://launchpad.net/charms">Charms</a></li>24 <li><a href="https://launchpad.net/charms">Charms</a></li>
26 </ul>25 </ul>
27 </nav>26 </nav>
28 <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>27 <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>
29 </div>28 </div>
30</footer>29</footer>
3130
@@ -37,13 +36,13 @@
3736
38<script type="text/javascript">37<script type="text/javascript">
39var _gaq = _gaq || [];38var _gaq = _gaq || [];
40 39
41/* Save to developer.ubuntu.com profile */ 40/* Save to developer.ubuntu.com profile */
42_gaq.push(['_setAccount', 'UA-1018242-33']);41_gaq.push(['_setAccount', 'UA-1018242-33']);
43_gaq.push(['_setDomainName', '.ubuntu.com']);42_gaq.push(['_setDomainName', '.ubuntu.com']);
44_gaq.push(['_trackPageview']);43_gaq.push(['_trackPageview']);
4544
46/* Save to www.ubuntu.com profile */ 45/* Save to www.ubuntu.com profile */
47_gaq.push(['b._setAccount', 'UA-1018242-4']);46_gaq.push(['b._setAccount', 'UA-1018242-4']);
48_gaq.push(['b._setDomainName', '.ubuntu.com']);47_gaq.push(['b._setDomainName', '.ubuntu.com']);
49_gaq.push(['b._trackPageview']);48_gaq.push(['b._trackPageview']);
@@ -58,4 +57,4 @@
58<?php wp_footer(); ?>57<?php wp_footer(); ?>
5958
60</body>59</body>
61</html>
62\ No newline at end of file60\ No newline at end of file
61</html>

Subscribers

People subscribed via source and target branches

to all changes: