Widelands Website

Merge lp:~franku/widelands-website/little_navi_changes into lp:widelands-website

  1. little_navi_changes
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 399
Proposed branch: lp:~franku/widelands-website/little_navi_changes
Merge into: lp:widelands-website
Diff against target: 29 lines (+3/-2)
1 file modified
templates/navigation.html (+3/-2)
To merge this branch: bzr merge lp:~franku/widelands-website/little_navi_changes
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+276625@code.launchpad.net

Description of the change

Just a few changes to the navigation bar:

- Spelling Francaise -> Francais
- Added wiki/history
- modified Development/docs to directly show the documentation. Prior this link pointed to a small page containing only the link to the real documentation.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

I haven't tested this, but code LTGM :)

review: Approve
Revision history for this message
SirVer (sirver) wrote :

Sorry for the delay. This is deployed now. Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/navigation.html'
2--- templates/navigation.html 2013-06-30 12:11:48 +0000
3+++ templates/navigation.html 2015-11-04 09:03:00 +0000
4@@ -36,6 +36,7 @@
5 <li><a href="{% url wiki_article "Creating Game Content" %}">Creating Game Content</a></li>
6 <li><a href="{% url wiki_article "The Widelands Project" %}">The Widelands Project</a></li>
7 <li><a href="/wiki/list/">List Of All Pages</a></li>
8+ <li><a href="/wiki/history/">Recent changes</a></li>
9 </ul>
10 </li>
11 <li><a href="{% url pybb_index %}">Forums</a>
12@@ -46,7 +47,7 @@
13 <li><a href="{% url pybb_forum 4 %}">Editor Forum</a></li>
14 <li><a href="{% url pybb_forum 5 %}">[Deutsch] - Spielerforum</a></li>
15 <li><a href="{% url pybb_forum 6 %}">[Español] - Foro de jugadores</a></li>
16- <li><a href="{% url pybb_forum 7 %}">[Française] - Forum de joueurs</a></li>
17+ <li><a href="{% url pybb_forum 7 %}">[Français] - Forum de joueurs</a></li>
18 <li><a href="{% url pybb_forum 13 %}">[English] - Player Forum</a></li>
19 <li><a href="{% url pybb_forum 9 %}">Graphic Development</a></li>
20 <li><a href="{% url pybb_forum 10 %}">Sound &amp; Music Development</a></li>
21@@ -59,7 +60,7 @@
22 <ul>
23 <li><a href="{% url wiki_article "Contribute" %}">Contribute</a></li>
24 <li><a href="{% url developers %}">Widelands Development Team</a></li>
25- <li><a href="/docs/" target="_blank">Documentation</a></li>
26+ <li><a href="/docs/wl/" target="_blank">Documentation</a></li>
27 <li><a href="https://bugs.launchpad.net/widelands" target="_blank">Widelands Bugtracker</a></li>
28 <li><a href="https://bugs.launchpad.net/widelands-website" target="_blank">Website Bugtracker</a></li>
29 </ul>

Subscribers

People subscribed via source and target branches