Merge lp:~rvb/maas-website/mw-links-updates into lp:maas-website

Proposed by Raphaël Badin
Status: Merged
Merged at revision: 13
Proposed branch: lp:~rvb/maas-website/mw-links-updates
Merge into: lp:maas-website
Diff against target: 31 lines (+5/-2)
1 file modified
footer.php (+5/-2)
To merge this branch: bzr merge lp:~rvb/maas-website/mw-links-updates
Reviewer Review Type Date Requested Status
Jorge Castro Pending
Review via email: mp+198352@code.launchpad.net

Commit message

Update links in footer. Add MAAS favicon.

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
=== added file 'favicon.ico'
0Binary files favicon.ico 1970-01-01 00:00:00 +0000 and favicon.ico 2013-12-10 09:20:46 +0000 differ0Binary files favicon.ico 1970-01-01 00:00:00 +0000 and favicon.ico 2013-12-10 09:20:46 +0000 differ
=== modified file 'footer.php'
--- footer.php 2013-09-17 23:41:08 +0000
+++ footer.php 2013-12-10 09:20:46 +0000
@@ -5,12 +5,15 @@
5 <div>5 <div>
6 <nav role="navigation" class="clearfix">6 <nav role="navigation" class="clearfix">
7 <ul>7 <ul>
8 <li><a href="https://maas.ubuntu.com/docs/install.html">Get started</a></li>8 <li><a href="https://maas.ubuntu.com/docs/orientation.html">Overview</a></li>
9 <li><a href="https://maas.ubuntu.com/docs/install.html">Setting up a MAAS server</a></li>
9 <?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>10 <?php wp_list_pages('sort_column=menu_order&title_li=&depth=2&child_of=7'); ?>
10 </ul>11 </ul>
11 <ul>12 <ul>
12 <li><a href="/resources">Resources</a></li>13 <li><a href="/resources">Resources</a></li>
13 <li><a href="http://maas.ubuntu.com/docs">Documentation</a></li>14 <li><a href="http://maas.ubuntu.com/docs">Documentation</a></li>
15 <li><a href="http://maas.ubuntu.com/docs/api.html">API Documentation</a></li>
16 <li><a href="http://maas.ubuntu.com/docs/maascli.html">CLI Documentation</a></li>
14 17
15 </ul>18 </ul>
16 <ul>19 <ul>
@@ -23,7 +26,7 @@
23 <ul class="last">26 <ul class="last">
24 <li><a href="https://launchpad.net/maas">Code</a></li>27 <li><a href="https://launchpad.net/maas">Code</a></li>
25 <li><a href="https://launchpad.net/~maas-maintainers/+contactuser">Contact Us</a>28 <li><a href="https://launchpad.net/~maas-maintainers/+contactuser">Contact Us</a>
26 <li><a href="https://jenkins.qa.ubuntu.com/job/maas-trunk/">MAAS Jenkins Status</a>29 <li><a href="https://jenkins.qa.ubuntu.com/view/Maas/">MAAS Jenkins Status</a>
27 </ul>30 </ul>
28 </nav>31 </nav>
29 <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/maas-website/+filebug">Report a bug on this site</a></p>32 <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/maas-website/+filebug">Report a bug on this site</a></p>

Subscribers

People subscribed via source and target branches

to all changes: