MAAS Website

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

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