WEB: More work in intro_header.tpl merge

scummvm · Jan 16, 2016 · 6efb66a · 6efb66a
1 parent 628ee9c
commit 6efb66a
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 24 deletions.
diff --git a/lang/lang.ini b/lang/lang.ini
@@ -137,6 +137,34 @@ The clever part about this: ScummVM just replaces the executables shipped
 with the games, allowing you to play them on systems for which they were
 never designed!
 """
+introHeaderContentP2 = """
+ScummVM supports many adventure games, including LucasArts
+SCUMM games (such as <i>Monkey Island</i> 1-3,
+<i>Day of the Tentacle</i>, <i>Sam &amp; Max</i>, ...),
+many of Sierra's AGI and SCI games (such as
+<i>King's Quest</i> 1-6, <i>Space Quest</i> 1-5, ...),
+<i>Discworld</i> 1 and 2, <i>Simon the Sorcerer</i>
+1 and 2, <i>Beneath A Steel Sky</i>,
+<i>Lure of the Temptress</i>, <i>Broken Sword</i> 1 and 2,
+<i>Flight of the Amazon Queen</i>, <i>Gobliiins</i> 1-3,
+<i>The Legend of Kyrandia</i> 1-3, many of
+Humongous Entertainment's children's SCUMM games
+(including <i>Freddi Fish</i> and <i>Putt Putt</i> games)
+and many more.
+"""
+introHeaderContentP3 = """
+You can find a full list with details on which games are
+supported and how well on the
+<a href="compatibility/">compatibility page</a>.
+ScummVM is continually improving, so check back often.
+Among the systems on which you can play those games are Windows, Linux, Mac OS X,
+Dreamcast, PocketPC, PalmOS, AmigaOS, BeOS, OS/2, PSP, PS2, SymbianOS and many more...
+"""
+introHeaderContentP4 = """
+Our forum and IRC channel, <a href="irc://irc.freenode.net/scummvm"> #scummvm on
+irc.freenode.net</a>, are open for comments and suggestions. Please read our
+<a href="faq/">FAQ</a> before posting.
+"""
 
 # LinksPage.php
 linksTitle = "Links"

diff --git a/templates/intro_header.tpl b/templates/intro_header.tpl
@@ -11,7 +11,7 @@
 		<div class="rbtop">
 			<div>
 				<p>
-					{include file='shadowed_text.tpl' text='{#introHeaderScreenshots#}' shadowcolor='#fff' textcolor='#356a02'}
+					{include file='shadowed_text.tpl' text=#introHeaderScreenshots# shadowcolor='#fff' textcolor='#356a02'}
 				</p>
 			</div>
 		</div>
@@ -35,7 +35,7 @@
 		<div class="rbtop">
 			<div>
 				<p>
-					{include file='shadowed_text.tpl' text='{#introHeaderWhatIs#}' shadowcolor='#fff' textcolor='#356a02'}
+					{include file='shadowed_text.tpl' text=#introHeaderWhatIs# shadowcolor='#fff' textcolor='#356a02'}
 				</p>
 			</div>
 		</div>
@@ -45,32 +45,13 @@
 					{#introHeaderContentP1#}
 				</p>
 				<p>
-					ScummVM supports many adventure games, including LucasArts
-					SCUMM games (such as <i>Monkey Island</i> 1-3,
-					<i>Day of the Tentacle</i>, <i>Sam &amp; Max</i>, ...),
-					many of Sierra's AGI and SCI games (such as
-					<i>King's Quest</i> 1-6, <i>Space Quest</i> 1-5, ...),
-					<i>Discworld</i> 1 and 2, <i>Simon the Sorcerer</i>
-					1 and 2, <i>Beneath A Steel Sky</i>,
-					<i>Lure of the Temptress</i>, <i>Broken Sword</i> 1 and 2,
-					<i>Flight of the Amazon Queen</i>, <i>Gobliiins</i> 1-3,
-					<i>The Legend of Kyrandia</i> 1-3, many of
-					Humongous Entertainment's children's SCUMM games
-					(including <i>Freddi Fish</i> and <i>Putt Putt</i> games)
-					and many more.
+					{#introHeaderContentP2#}
 				</p>
 				<p>
-					You can find a full list with details on which games are
-					supported and how well on the
-					<a href="compatibility/">compatibility page</a>.
-					ScummVM is continually improving, so check back often.
-					Among the systems on which you can play those games are Windows, Linux, Mac OS X,
-					Dreamcast, PocketPC, PalmOS, AmigaOS, BeOS, OS/2, PSP, PS2, SymbianOS and many more...
+					{#introHeaderContentP3#}
 				</p>
 				<p>
-					Our forum and IRC channel, <a href="irc://irc.freenode.net/scummvm"> #scummvm on
-					irc.freenode.net</a>, are open for comments and suggestions. Please read our
-					<a href="faq/">FAQ</a> before posting.
+					{#introHeaderContentP4#}
 				</p>
 			</div>
 		</div>