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

Proposed by Alexander Wolf
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
Reviewer Review Type Date Requested Status
Matthew Gates Pending
Review via email: mp+98167@code.launchpad.net

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

To post a comment you must log in.
Revision history for this message
Matthew Gates (matthew-porpoisehead) : Posted in a previous version of this proposal
review: Approve
47. By Alexander Wolf

change WIKI to User guide string

48. By Alexander Wolf

added link to scripting devel. documentation

49. By Alexander Wolf

update stellarium-website.pot

50. By Alexander Wolf

enable backward compatible mode fore hyperlinks

51. By Alexander Wolf

rolling back latest changes

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'index.php'
--- index.php 2012-03-18 21:46:20 +0000
+++ index.php 2012-03-19 10:17:19 +0000
@@ -104,7 +104,7 @@
104 <a href="%s">%s<span>0.10.2-1</span></a>104 <a href="%s">%s<span>0.10.2-1</span></a>
105 </div>105 </div>
106 <div class="download pdf">106 <div class="download pdf">
107 <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">WIKI<span>%s</span></a>107 <a href="http://www.stellarium.org/wiki/index.php/Stellarium_User_Guide">%s<span>%s</span></a>
108 </div>108 </div>
109 </div>109 </div>
110 </div>110 </div>
@@ -117,6 +117,7 @@
117 $download_link_win32,117 $download_link_win32,
118 $download_link_guide,118 $download_link_guide,
119 q_('User guide'),119 q_('User guide'),
120 q_('User guide'),
120 q_('current'));121 q_('current'));
121122
122printf(' 123printf('
@@ -266,6 +267,9 @@
266 <li><a href="http://sourceforge.net/forum/forum.php?forum_id=278769">%s</a></li>267 <li><a href="http://sourceforge.net/forum/forum.php?forum_id=278769">%s</a></li>
267 <li><a href="./wiki/">%s</a></li>268 <li><a href="./wiki/">%s</a></li>
268 <li><a href="./wiki/index.php/FAQ">%s</a></li> 269 <li><a href="./wiki/index.php/FAQ">%s</a></li>
270 <li><a href="./wiki/index.php/Landscapes">%s</a></li>
271 <li><a href="./wiki/index.php/Scripts">%s</a></li>
272 <li><a href="./wiki/index.php/Plugins">%s</a></li>
269 <li><a href="./wiki/index.php/Category:User\'s_Guide">%s</a></li>273 <li><a href="./wiki/index.php/Category:User\'s_Guide">%s</a></li>
270 <li><a href="./doc/">%s</a></li>274 <li><a href="./doc/">%s</a></li>
271 <li><a href="https://answers.launchpad.net/stellarium">%s</a></li>275 <li><a href="https://answers.launchpad.net/stellarium">%s</a></li>
@@ -284,8 +288,11 @@
284q_("forum"),288q_("forum"),
285q_("wiki"),289q_("wiki"),
286q_("FAQ"),290q_("FAQ"),
291q_("landscapes"),
292q_("scripts"),
293q_("plugins"),
287q_("user's guide"),294q_("user's guide"),
288q_("API"),295q_("developers documentation"),
289q_("get support"),296q_("get support"),
290q_("report bugs, request new features"),297q_("report bugs, request new features"),
291q_("older releases"),298q_("older releases"),

Subscribers

People subscribed via source and target branches

to all changes: