Stellarium Website

Merge lp:~alexwolf/stellarium-website/new-design-wiki-links into lp:~matthew-porpoisehead/stellarium-website/new-design

Proposed by Alexander Wolf on 2012-03-19

Status:	Superseded
Proposed branch:	lp:~alexwolf/stellarium-website/new-design-wiki-links
Merge into:	lp:~matthew-porpoisehead/stellarium-website/new-design
Diff against target:	43 lines (+9/-2) 1 file modified index.php (+9/-2)
To merge this branch:	bzr merge lp:~alexwolf/stellarium-website/new-design-wiki-links
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Matthew Gates		2012-03-19	Pending
Review via email: mp+98167@code.launchpad.net

This proposal supersedes a proposal from 2012-03-19.

Revision history for this message

Matthew Gates (matthew-porpoisehead) on 2012-03-20: Posted in a previous version of this proposal

review: Approve

47. By Alexander Wolf on 2012-03-19: change WIKI to User guide string
48. By Alexander Wolf on 2012-03-19: added link to scripting devel. documentation
49. By Alexander Wolf on 2012-03-19: update stellarium-website.pot
50. By Alexander Wolf on 2012-03-19: enable backward compatible mode fore hyperlinks
51. By Alexander Wolf on 2012-03-20: rolling back latest changes

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'index.php'
2	--- index.php 2012-03-18 21:46:20 +0000
3	+++ index.php 2012-03-19 10:17:19 +0000
4	@@ -104,7 +104,7 @@
5	<a href="%s">%s<span>0.10.2-1</span></a>
6	</div>
7	<div class="download pdf">
8	- <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">WIKI<span>%s</span></a>
9	+ <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">%s<span>%s</span></a>
10	</div>
11	</div>
12	</div>
13	@@ -117,6 +117,7 @@
14	$download_link_win32,
15	$download_link_guide,
16	q_('User guide'),
17	+ q_('User guide'),
18	q_('current'));
19
20	printf('
21	@@ -266,6 +267,9 @@
22	<li><a href="http://sourceforge.net/forum/forum.php?forum_id=278769">%s</a></li>
23	<li><a href="./wiki/">%s</a></li>
24	<li><a href="./wiki/index.php/FAQ">%s</a></li>
25	+ <li><a href="./wiki/index.php/Landscapes">%s</a></li>
26	+ <li><a href="./wiki/index.php/Scripts">%s</a></li>
27	+ <li><a href="./wiki/index.php/Plugins">%s</a></li>
28	<li><a href="./wiki/index.php/Category:User\'s_Guide">%s</a></li>
29	<li><a href="./doc/">%s</a></li>
30	<li><a href="https://answers.launchpad.net/stellarium">%s</a></li>
31	@@ -284,8 +288,11 @@
32	q_("forum"),
33	q_("wiki"),
34	q_("FAQ"),
35	+q_("landscapes"),
36	+q_("scripts"),
37	+q_("plugins"),
38	q_("user's guide"),
39	-q_("API"),
40	+q_("developers documentation"),
41	q_("get support"),
42	q_("report bugs, request new features"),
43	q_("older releases"),