[Tux4kids-commits] r1502 - in tux4kids-web/htdocs: . tuxmath tuxtype

Matthew McSpadden mmcspadden-guest at alioth.debian.org
Thu Sep 10 16:13:59 UTC 2009


Author: mmcspadden-guest
Date: 2009-09-10 16:13:59 +0000 (Thu, 10 Sep 2009)
New Revision: 1502

Removed:
   tux4kids-web/htdocs/tuxmath/debdown.php
   tux4kids-web/htdocs/tuxmath/macdown.php
   tux4kids-web/htdocs/tuxmath/sourcedown.php
   tux4kids-web/htdocs/tuxmath/windown.php
Modified:
   tux4kids-web/htdocs/dev.php
   tux4kids-web/htdocs/howto.php
   tux4kids-web/htdocs/index.php
   tux4kids-web/htdocs/mail.php
   tux4kids-web/htdocs/projects.php
   tux4kids-web/htdocs/svn.php
   tux4kids-web/htdocs/tuxmath/download.php
   tux4kids-web/htdocs/tuxtype/download.php
Log:
Modifying how the web browsers display the content. Modified the order of downloads on the downloads pages. Changed descriptions on the projects page.

Modified: tux4kids-web/htdocs/dev.php
===================================================================
--- tux4kids-web/htdocs/dev.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/dev.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,6 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4kids - Developers</title>
 	</head>
 <body>
@@ -21,44 +19,55 @@
 			</div>
 			<div class="col2">
 			<b>General information</b><br />
-			Tux4Kids programs are written in C and use Simple DirectMedia Layer (SDL) for the graphics. The programs are portable, running on Linux, Windows, Mac OSX, and BeOS. They are internationalized into many languages, and developers should keep the needs of non-English speakers in mind.<br />
-			Most development happens on Linux, and the tools for development are readily available on any modern Linux distribution. However, it should also be possible to develop on other platforms.<br />
+			Tux4Kids programs are written in C and use Simple DirectMedia Layer (SDL) for the graphics. The programs are portable, running
+			on Linux, Windows, Mac OSX, and BeOS. They are internationalized into many languages, and developers should keep the needs of
+			non-English speakers in mind.<br />
+			Most development happens on Linux, and the tools for development are readily available on any modern Linux distribution.
+			However, it should also be possible to develop on other platforms.<br />
 			<br />
 			
 			<b>Documentation for major tools and libraries</b><br />
 			<a href="http://www.libsdl.org/">SDL</a> (see in particular the DocWiki link)<br />
-			<font style="font-size: 10px;">We also use SDL_image (graphics files), SDL_mixer (sound), SDL_ttf (fonts), and will soon add SDL_net (network). Documentation for these is available on the DocWiki.</font><br /> 
+			<font style="font-size: 10px;">We also use SDL_image (graphics files), SDL_mixer (sound), SDL_ttf (fonts), and will soon add
+			SDL_net (network). Documentation for these is available on the DocWiki.</font><br /> 
 			<a href="http://svnbook.red-bean.com/">Subversion</a> (see in particular Chapter 2, "Basic Usage")<br />
 			<a href="http://www.gnu.org/software/gettext/">libintl/gettext</a> (for internationalization, aka translation)<br />
 			<a href="http://www.gnu.org/software/automake/">Automake</a> (build system)<br />
-			<a href="http://www.cmake.org/cmake/help/documentation.html">CMake</a> (an alternative build system, used especially for our Mac OSX releases of TuxMath but working on other platforms, too)<br />
+			<a href="http://www.cmake.org/cmake/help/documentation.html">CMake</a> (an alternative build system, used especially for our
+			Mac OSX releases of TuxMath but working on other platforms, too)<br />
 			<br />
 			
 			<b>SVN checkout (TuxMath and TuxTyping)</b><br />
-			The SVN site is hosted on <a href="http://tux4kids.alioth.debian.org/">Alioth</a> (please do not download the SourceForge SVN tree, it could be out of date). You can do an "anonymous" checkout in the following way:<br />
+			The SVN site is hosted on <a href="http://tux4kids.alioth.debian.org/">Alioth</a> (please do not download the SourceForge SVN
+			tree, it could be out of date). You can do an "anonymous" checkout in the following way:<br />
 			<kbd>svn co svn://svn.debian.org/tux4kids/</kbd><br />
-			This will get you the source code, but you won\'t be able to check in your modifications, because you need to have an account on Alioth.<br /><br />
-			To get a fully-functional SVN checkout, <a href="http://alioth.debian.org">apply for an Alioth account</a> and wait for administrator approval. Once you have approval, do the checkout in the following way:<br />
+			This will get you the source code, but you won\'t be able to check in your modifications, because you need to have an account
+			on Alioth.<br /><br />
+			To get a fully-functional SVN checkout, <a href="http://alioth.debian.org">apply for an Alioth account</a> and wait for administrator
+			approval. Once you have approval, do the checkout in the following way:<br />
 			<kbd>svn co svn+ssh://fred-guest@svn.debian.org/svn/tux4kids</kbd><br />
-			assuming your user name is "fred-guest". You will have to supply your password (perhaps more than once; note you can upload an SSH key to Alioth and bypass the requirement to type the password each time you make a commit).<br />
-			With this checkout, you can use the full functionality of SVN and distribute your improvements to all the developers. If you started developing with an anonymous checkout, you can manually copy any changes over to the new directory created with your Alioth account and check them in.<br />
+			assuming your user name is "fred-guest". You will have to supply your password (perhaps more than once; note you can upload an
+			SSH key to Alioth and bypass the requirement to type the password each time you make a commit).<br />
+			With this checkout, you can use the full functionality of SVN and distribute your improvements to all the developers. If you
+			started developing with an anonymous checkout, you can manually copy any changes over to the new directory created with your
+			Alioth account and check them in.<br />
 			<br />
-
-               <b>Copyright</b><br />
-               Tux4kids software is released under the GPL2. By commiting your code you agree to distribute your work under this license as well. Please state so in the headers of the source files, including svg images. Thanks!
-               <br />
+      <b>Copyright</b><br />
+      Tux4kids software is released under the GPL2. By commiting your code you agree to distribute your work under this
+			license as well. Please state so in the headers of the source files, including svg images. Thanks!
+      <br />
 			<br />
-			
-			<b>Mailing lists</b><br />
-			In addition to the mailing lists available from the link to the left, note that the TuxMath mailing list is hosted <a href="https://lists.sourceforge.net/lists/listinfo/tuxmath-devel">here</a>.<br />
-			<br />
-			
+							
 			<b>Development and coding tips</b><br />
 			<ul>
-			<li>Installing the required libraries (from distributor packages on Linux): be sure to install the "dev" versions as well, so that you have the header files.</li>
+			<li>Installing the required libraries (from distributor packages on Linux): be sure to install the "dev" versions as well, so
+			that you have the header files.</li>
 			<li>Documentation about compiling is available in the "doc" directory in trunk.</li>
-			<li>SVN branches: if your work is "disruptive" (meaning it\'s a fairly large change in core aspects of the code), consider working in a branch.  You can then make regular commits without disrupting trunk.<br />
-			However, it is dangerous to work for very long in a branch:  odds are high that your work will be incompatible (in either small or large ways) with other ongoing development, your work will not get the kind of oversight that trunk gets, and in any event your work is not useful until you merge to trunk.  For these reasons you should merge to trunk at any available opportunity.<br />
+			<li>SVN branches: if your work is "disruptive" (meaning it\'s a fairly large change in core aspects of the code), consider
+			working in a branch.  You can then make regular commits without disrupting trunk.<br />
+			However, it is dangerous to work for very long in a branch:  odds are high that your work will be incompatible (in either small
+			or large ways) with other ongoing development, your work will not get the kind of oversight that trunk gets, and in any event
+			your work is not useful until you merge to trunk.  For these reasons you should merge to trunk at any available opportunity.<br />
 			If your work is not disruptive, it may be advisable to work directly in trunk.</li>
 			<li>Please keep the changelog (in the doc/ directory) updated!</li>
 			<li>For information about preparing strings appropriately for internationalization, see
@@ -67,11 +76,9 @@
 			
 			<b>Graphics</b><br />
 			Because of the impending support for <a href="http://en.wikipedia.org/wiki/Scalable_Vector_Graphics">SVG</a>, we <i>strongly</i> prefer that any new graphics files be created in SVG format. We can generate PNG files as needed from the SVGs.
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
+</html>
\ No newline at end of file

Modified: tux4kids-web/htdocs/howto.php
===================================================================
--- tux4kids-web/htdocs/howto.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/howto.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,12 +1,6 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
-	<title>Tux4kids - Home</title>';
-
-include ('includes/header.php');
-
-echo'
+<?php include ('includes/pageheader.php');?>
+	<title>Tux4kids - Home</title>
+<?php include ('includes/header.php');?>
 			<div class="col1">
 				<ul class="menu">
 					<li><a href="index.php"><span>Home</span></a></li>
@@ -24,12 +18,11 @@
 				<br />
 				
 				<font style="font-size: 10px;">Note - Please DO NOT use a WYSIWYG program. Those add bloat to the code and
-				they would not work well with what I\'ve
+				they would not work well with what we've
 				written into the site so far.</font><br />
 				<br />
-				We are using PHP to generate the xhtml code. Because of this please note that any use of the \' in text must be
-				preceeded by a \ to display properly. Watch for the contractions. Also, unless you are running a web server
-				with php enabled, you will need to upload it to test it, since a browser cannot handle php on it\'s own. Also
+				We are using PHP includes to generate some of the xhtml code, while the rest is normal xhtml code. Unless you are running
+				a web server with php enabled, you will need to upload it to test it, since a browser cannot handle php on it's own. Also
 				for the record, most of the formatting is done by CSS in the css directory.<br />
 				<br />
 				
@@ -60,7 +53,7 @@
 				<br />
 				The href points to the file and anything between the tags becomes a link. Text will turn blue and underlined,
 				and pictures will let you click on them. You can use a relative file path or an asolute file path here, relative
-				is prefered. If you do not know what a relative file path is, please don\'t change anything on the website, 
+				is prefered. If you do not know what a relative file path is, please don't change anything on the website, 
 				just email me what you want up there. <br />
 				<br />
 				
@@ -77,5 +70,4 @@
 		</div>
 	</div>
 </body>
-</html>';
-?>
\ No newline at end of file
+</html>
\ No newline at end of file

Modified: tux4kids-web/htdocs/index.php
===================================================================
--- tux4kids-web/htdocs/index.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/index.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,6 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4Kids - Home</title>
 	</head>
 <body>
@@ -21,9 +19,13 @@
 			</div>
 			<div class="col2">
 				<font style="font-size: 18px;">Welcome to Tux4Kids!</font><br />
-				Tux4Kids develops high-quality software for kids, with the goal of combining fun and learning into an irresistable package. Our software is free: you can download it for use at home or onto hundreds of computers in a school. We support all major platforms, including Windows, Macintosh, and Linux/Unix. Our programs are used by people around the globe, and they have been translated into dozens of different languages. As open-source software, these programs can be freely extended or customized, and they are supported by active communities of volunteer developers.
+				Tux4Kids develops high-quality software for kids, with the goal of combining fun and learning into an irresistable package.
+				Our software is free: you can download it for use at home or onto hundreds of computers in a school. We support all major
+				platforms, including Windows, Macintosh, and Linux/Unix. Our programs are used by people around the globe, and they have
+				been translated into dozens of different languages. As open-source software, these programs can be freely extended or
+				customized, and they are supported by active communities of volunteer developers.
 				<br />
-				Whether you\'re a parent, a teacher, or a kid, give Tux4Kids software a try!<br />
+				Whether you're a parent, a teacher, or a kid, give Tux4Kids software a try!<br />
 				<br />
 				<table class="front">
 					<tr>
@@ -31,7 +33,7 @@
 					</tr>
 					<tr>
 						<td>
-						Tux4Kids has been accepted as a participating organization for this year\'s Google Summer of Code. We are very excited
+						Tux4Kids has been accepted as a participating organization for this year's Google Summer of Code. We are very excited
 						about another phase of productive coding. All three Tux4Kids programs (Tux Paint, Tux Math and Tux Typing) will take part
 						again this year. The GSoC site has full information, including the list of particating organizations and their applications for
 						students. The list of "Ideas" for Tux4Kids is on the GSoC site. The student application period is 23 March to 03 April.
@@ -45,7 +47,7 @@
 					</tr>
 					<tr>
 						<td>
-						Tux4Kids has submitted its application to participate in Google\'s Summer of Code again for 2009. We will be informed on
+						Tux4Kids has submitted its application to participate in Google's Summer of Code again for 2009. We will be informed on
 						March 18 whether our application has been accepted. Further information will be posted at that time.
 						</td>
 					</tr>
@@ -70,11 +72,9 @@
 						</td>
 					</tr>
 				</table>
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
\ No newline at end of file
+</html>
\ No newline at end of file

Modified: tux4kids-web/htdocs/mail.php
===================================================================
--- tux4kids-web/htdocs/mail.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/mail.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,6 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4kids - Mailing Lists</title>
 	</head>
 <body>
@@ -20,7 +18,8 @@
 				<img src="images/pow-fusionforge.png" alt="Fusion Forge" />
 			</div>
 			<div class="col2">
-				Tux4Kids has 11 active mailing lists. Different mailing lists are used for different purposes.<br />
+				Mailing lists are the best way to keep up with what is going on with the Tux4Kids projects. Tux4Kids has 11 active mailing
+				lists. Different mailing lists are used for different purposes. See the descriptions below.<br />
 				<br />
 				<b>General Tux4Kids List: (not project-specific)</b>
 				<ul>
@@ -54,11 +53,9 @@
 					<li><a href="http://lists.alioth.debian.org/mailman/listinfo/tux4kids-commits">Tux4kids-commits</a> - CVG commit logs</li>
 					<li><a href="https://lists.sourceforge.net/lists/listinfo/tuxpaint-cvs">Tuxpaint-cvs</a> - CVS commit logs for Tux Paint project</li>
 				</ul>
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
\ No newline at end of file
+</html>
\ No newline at end of file

Modified: tux4kids-web/htdocs/projects.php
===================================================================
--- tux4kids-web/htdocs/projects.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/projects.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,7 +1,5 @@
-<?php
-include ('includes/pageheader.php');
-echo'
-	<title>Tux4kids - Projects</title>
+<?php include ('includes/pageheader.php');?>
+	<title>Tux4Kids - Projects</title>
 	</head>
 <body>
 	<div align="center">
@@ -9,24 +7,23 @@
 			<div class="col1">
 				<ul class="menu">
 					<li><a href="index.php"><span>Home</span></a></li>
-					<li><a href="projects.php" class="active"><span>Projects</span></a></li>
+					<li><a href="" class="active"><span>Projects</span></a></li>
 					<li><a href="dev.php"><span>For Developers</span></a></li>
-					<li><a href="mail.php"><span>Mailing Lists</span></a></li>
+					<li><a href="http://alioth.debian.org/mail/?group_id=31080"><span>Mailing Lists</span></a></li>
 					<li><a href="svn.php"><span>SVN Repository</span></a></li>
-					<li><a href="https://alioth.debian.org/forum/?group_id=31080"><span>Forums</span></a></li>
+					<li><a href="http://alioth.debian.org/forum/?group_id=31080"><span>Forums</span></a></li>
 				</ul>
-				<br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
-				<br /><br /><br /><br /><br /><br /><br /><br />
-				<img src="images/pow-fusionforge.png" alt="Fusion Forge" />
 			</div>
 			<div class="col2">
 				<table>
 					<tr>
 						<td align="center">
-							<a href="http://tux4kids.alioth.debian.org/tuxmath/index.php"><img src="images/tm_title.png" /></a>
+							<a href="http://tux4kids.alioth.debian.org/newsitetest/tuxmath/index.php"><img src="images/tm_title.png" /></a>
 						</td>
 						<td>
-							<a href="http://tux4kids.alioth.debian.org/tuxmath/index.php">Tux, of Math Command</a>, a.k.a. TuxMath, helps kids hone their arithmetic skills while they defend penguins from incoming comets. Kids can also explore the asteroid belt with only their factoring abilities to bring them through safely!
+							<a href="http://tux4kids.alioth.debian.org/newsitetest/tuxmath/index.php">Tux, of Math Command</a>, AKA TuxMath, lets kids hone their arithmetic
+							skills while they defend penguins from incoming comets, or offers them a chance to explore the asteroid belt with only their factoring abilities
+							to bring them through safely!
 						</td>
 					</tr>
 					<tr>
@@ -35,24 +32,22 @@
 						</td>
 						<td>
 							Partnering with New Breed Software, Tux4Kids helps bring you <a href="http://www.tuxpaint.org/">Tux Paint</a>. This remarkable drawing program
-							empowers kids to be creative in an environment complete with magic tools and sound effects.  							
+							empowers kids to be creative in an environment complete with magic tools and sound effects. 							
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<a href="http://tux4kids.alioth.debian.org/tuxtype/index.php"><img src="images/tt_title.png" /></a>
+							<a href="http://tux4kids.alioth.debian.org/newsitetest/tuxtype/index.php"><img src="images/tt_title.png" /></a>
 						</td>
 						<td>
-							<a href="http://tux4kids.alioth.debian.org/tuxtype/index.php">TuxTyping</a>
-							Tux the penguin is hungry, and loves to eat fish. But Tux can only catch the fish if you type the right letters in time! Can you help Tux?
+							<a href="http://tux4kids.alioth.debian.org/newsitetest/tuxtype/index.php">TuxTyping</a> Tux the penguin is hungry, and loves to eat fish. But Tux
+							can only catch the fish if you type the right letters in time! Can you help Tux?
 						</td>
 					</tr>
 				</table>
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
\ No newline at end of file
+</html>
\ No newline at end of file

Modified: tux4kids-web/htdocs/svn.php
===================================================================
--- tux4kids-web/htdocs/svn.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/svn.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,6 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4kids - SVN</title>
 	</head>
 <body>
@@ -39,11 +37,9 @@
 				With this checkout, you can use the full functionality of SVN and distribute your improvements to all the developers. If you started developing with an
 				anonymous checkout, you can manually copy any changes over to the new directory created with your Alioth account and check them in.<br />
 				<br />
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
\ No newline at end of file
+</html>
\ No newline at end of file

Deleted: tux4kids-web/htdocs/tuxmath/debdown.php
===================================================================
--- tux4kids-web/htdocs/tuxmath/debdown.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxmath/debdown.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,45 +0,0 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
-	<title>Tux4kids &raquo; Tuxmath &raquo; Downloads</title>';
-
-include ('includes/header.php');
-
-echo'
-			<div class="col1">
-				<ul class="menu">
-					<li><a href="index.php"><span>Home</span></a></li>
-					<li><a href="download.php" class="active"><span>Download</span></a></li>
-					<li><a href="screens.php"><span>Screenshots</span></a></li>
-					<li><a href="help.php"><span>Get help</span></a></li>
-					<li><a href="other.php"><span>Other Projects</span></a></li>
-					<li><a href="http://www.tux4kids.com"><span>About Tux4Kids</span></a></li>
-				</ul>
-			</div>
-			<div class="col2">
-				<table class="downloads">
-					<tr>
-						<td width="50px">
-							<img src="images/linux-ubuntu.gif" alt="Ubuntu Logo" />
-						</td>
-						<th>
-							<font>Debian based Linux</font>
-						</th>
-					</tr>
-					<tr>
-						<td colspan="2">
-							If you run Debian simply open a terminal and run<br />
-							<br />
-							<font class="command">aptitude install tuxmath tuxtype tuxtype-data-nonfree</font>
-						</td>
-					</tr>
-				</table>
-			</div>
-		</div>
-	</div>
-</body>
-</html>';
-?>
-
-

Modified: tux4kids-web/htdocs/tuxmath/download.php
===================================================================
--- tux4kids-web/htdocs/tuxmath/download.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxmath/download.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,7 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4kids &raquo; Tuxtype &raquo; Downloads</title>
 	</head>
 <body>
@@ -24,21 +21,6 @@
 			<div class="col2">
 				<table class="dow">
 					<tr>
-						<th colspan="2">
-						Debian-based Linux
-						</th>
-					</tr>
-					<tr>
-						<td width="48px"><img src="images/linux-ubuntu.gif" alt="Ubuntu Logo" align="top" /></td>
-						<td>If you run Debian simply open a terminal and run<br />
-						<kbd>aptitude install tuxmath tuxtype tuxtype-data-nonfree</kbd></td>
-					</tr>
-				</table>
-				<br />
-				
-				
-				<table class="dow">
-					<tr>
 						<th colspan="2" width="700px">Windows 2000, XP, Vista</th>
 						<td>
 							<a href="https://alioth.debian.org/frs/download.php/2972/tuxmath-1.7.2-win32-installer.exe"><img src="images/dbutton.png" alt="Download"></a>
@@ -46,11 +28,9 @@
 					</tr>
 					<tr>
 						<td width="48px"><img src="images/windows.gif" alt="Windows Logo" align="top" /></td>
-						<td>Here you can download the installer for ever hated, and yet still most popular OS around, Windows.</td>
+						<td>Here you can download the installer for Microsoft Windows.</td>
 					</tr>
 				</table><br /><br />
-				
-				
 				<table class="dow">
 					<tr>
 						<th colspan="2" width="700px">Apple Mac OS X</th>
@@ -65,6 +45,18 @@
 				</table><br /><br />
 				<table class="dow">
 					<tr>
+						<th colspan="2">
+						Debian-based Linux
+						</th>
+					</tr>
+					<tr>
+						<td width="48px"><img src="images/linux-ubuntu.gif" alt="Ubuntu Logo" align="top" /></td>
+						<td>If you run Debian simply open a terminal and run<br />
+						<kbd>aptitude install tuxmath tuxtype tuxtype-data-nonfree</kbd></td>
+					</tr>
+				</table><br /><br />
+				<table class="dow">
+					<tr>
 						<th colspan=2" width="700px">Source</th>
 						<td>
 							<a href="https://alioth.debian.org/frs/download.php/2971/tuxmath_w_fonts-1.7.2.tar.gz"><img src="images/dbutton.png" alt="Download"></a>
@@ -78,11 +70,9 @@
 				
 				
 				If you are looking for earlier (or newer!) releases check out our <a href="https://alioth.debian.org/frs/?group_id=31080">released files</a> page.
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
+</html>

Deleted: tux4kids-web/htdocs/tuxmath/macdown.php
===================================================================
--- tux4kids-web/htdocs/tuxmath/macdown.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxmath/macdown.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,44 +0,0 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
-	<title>Tux4kids &raquo; Tuxmath &raquo; Downloads</title>';
-
-include ('includes/header.php');
-
-echo'
-			<div class="col1">
-				<ul class="menu">
-					<li><a href="index.php"><span>Home</span></a></li>
-					<li><a href="download.php" class="active"><span>Download</span></a></li>
-					<li><a href="screens.php"><span>Screenshots</span></a></li>
-					<li><a href="help.php"><span>Get help</span></a></li>
-					<li><a href="other.php"><span>Other Projects</span></a></li>
-					<li><a href="http://www.tux4kids.com"><span>About Tux4Kids</span></a></li>
-				</ul>
-			</div>
-			<div class="col2">
-				<table class="downloads">
-					<tr>
-						<td width="50px">
-							<img src="images/macosx.gif" alt="Mac OS X Logo" />
-						</td>
-						<th>
-							<font>Mac dmg files</font>
-						</th>
-					</tr>
-					<tr>
-						<td colspan="2">
-							Either you love it or your hate it, but it is unfrogettable Mac OS X
-						</td>
-					</tr>
-				</table>
-				<br />
-				<a href="https://alioth.debian.org/frs/download.php/2765/tuxmath-1.7.1-macosx.dmg">
-				<img src="images/dbutton.png"></a>
-			</div>
-		</div>
-	</div>
-</body>
-</html>';
-?>
\ No newline at end of file

Deleted: tux4kids-web/htdocs/tuxmath/sourcedown.php
===================================================================
--- tux4kids-web/htdocs/tuxmath/sourcedown.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxmath/sourcedown.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,45 +0,0 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
-	<title>Tux4kids &raquo; Tuxmath &raquo; Downloads</title>';
-
-include ('includes/header.php');
-
-echo'
-			<div class="col1">
-				<ul class="menu">
-					<li><a href="index.php"><span>Home</span></a></li>
-					<li><a href="download.php" class="active"><span>Download</span></a></li>
-					<li><a href="screens.php"><span>Screenshots</span></a></li>
-					<li><a href="help.php"><span>Get help</span></a></li>
-					<li><a href="other.php"><span>Other Projects</span></a></li>
-					<li><a href="http://www.tux4kids.com"><span>About Tux4Kids</span></a></li>
-				</ul>
-			</div>
-			<div class="col2">
-				<table class="downloads">
-					<tr>
-						<td width="50px">
-							<img src="images/gear.gif" alt="Gears" />
-						</td>
-						<th>
-							<font>Source</font>
-						</th>
-					</tr>
-					<tr>
-						<td colspan="2">
-							For your frustration and enjoyment we give you the foundation of open source software, the source code itself. Whether
-							you are a developer or a DIYer you\'ll find the latest releases of the source code right here.
-						</td>
-					</tr>
-				</table>
-				<br />
-				<a href="http://alioth.debian.org/frs/download.php/2971/tuxmath_w_fonts-1.7.2.tar.gz">
-				<img src="images/dbutton.png"></a>
-			</div>
-		</div>
-	</div>
-</body>
-</html>';
-?>
\ No newline at end of file

Deleted: tux4kids-web/htdocs/tuxmath/windown.php
===================================================================
--- tux4kids-web/htdocs/tuxmath/windown.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxmath/windown.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,44 +0,0 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
-	<title>Tux4kids &raquo; Tuxmath &raquo; Downloads</title>';
-
-include ('includes/header.php');
-
-echo'
-			<div class="col1">
-				<ul class="menu">
-					<li><a href="index.php"><span>Home</span></a></li>
-					<li><a href="download.php" class="active"><span>Download</span></a></li>
-					<li><a href="screens.php"><span>Screenshots</span></a></li>
-					<li><a href="help.php"><span>Get help</span></a></li>
-					<li><a href="other.php"><span>Other Projects</span></a></li>
-					<li><a href="http://www.tux4kids.com"><span>About Tux4Kids</span></a></li>
-				</ul>
-			</div>
-			<div class="col2">
-				<table class="downloads">
-					<tr>
-						<td width="50px">
-							<img src="images/windows.gif" alt="Windows Logo" />
-						</td>
-						<th>
-							<font>Windows Installer</font>
-						</th>
-					</tr>
-					<tr>
-						<td colspan="2">
-							Here you can download the installer for ever hated, and yet still most popular OS around, Windows. 
-						</td>
-					</tr>
-				</table>
-				<br />
-				<a href="http://alioth.debian.org/frs/download.php/2972/tuxmath-1.7.2-win32-installer.exe">
-				<img src="images/dbutton.png"></a>
-			</div>
-		</div>
-	</div>
-</body>
-</html>';
-?>
\ No newline at end of file

Modified: tux4kids-web/htdocs/tuxtype/download.php
===================================================================
--- tux4kids-web/htdocs/tuxtype/download.php	2009-09-10 15:53:14 UTC (rev 1501)
+++ tux4kids-web/htdocs/tuxtype/download.php	2009-09-10 16:13:59 UTC (rev 1502)
@@ -1,7 +1,4 @@
-<?php
-include ('includes/pageheader.php');
-
-echo'
+<?php include ('includes/pageheader.php');?>
 	<title>Tux4kids &raquo; Tuxtype &raquo; Downloads</title>
 	</head>
 <body>
@@ -22,23 +19,8 @@
 				<img src="images/pow-fusionforge.png" alt="Fusion Forge" />
 			</div>
 			<div class="col2">
-			
 				<table class="dow">
 					<tr>
-						<th colspan="2">
-						Debian-based Linux
-						</th>
-					</tr>
-					<tr>
-						<td width="48px"><img src="images/linux-ubuntu.gif" alt="Ubuntu Logo" align="top" /></td>
-						<td>If you run Debian simply open a terminal and run<br />
-						<kbd>aptitude install tuxmath tuxtype tuxtype-data-nonfree</kbd></td>
-					</tr>
-				</table>
-				<br />
-				
-				<table class="dow">
-					<tr>
 						<th colspan="2" width="700px">Windows 2000, XP, Vista</th>
 						<td>
 							<a href="https://alioth.debian.org/frs/download.php/3049/tuxtype-1.7.5-win32-installer.exe"><img src="images/dbutton.png" alt="Download"></a>
@@ -49,8 +31,6 @@
 						<td>Here you can download the installer for ever hated, and yet still most popular OS around, Windows.</td>
 					</tr>
 				</table><br /><br />
-				
-				
 				<table class="dow">
 					<tr>
 						<th colspan="2" width="700px">Apple Mac OS X</th>
@@ -63,9 +43,20 @@
 						<td>Either you love it or your hate it, but it is unforgettable Mac OS X.</td>
 					</tr>
 				</table><br /><br />
-				
 				<table class="dow">
 					<tr>
+						<th colspan="2">
+						Debian-based Linux
+						</th>
+					</tr>
+					<tr>
+						<td width="48px"><img src="images/linux-ubuntu.gif" alt="Ubuntu Logo" align="top" /></td>
+						<td>If you run Debian simply open a terminal and run<br />
+						<kbd>aptitude install tuxmath tuxtype tuxtype-data-nonfree</kbd></td>
+					</tr>
+				</table><br /><br />
+				<table class="dow">
+					<tr>
 						<th colspan=2" width="700px">Source</th>
 						<td>
 							<a href="https://alioth.debian.org/frs/download.php/3051/tuxtype_w_fonts-1.7.5.tar.gz"><img src="images/dbutton.png" alt="Download"></a>
@@ -77,11 +68,9 @@
 					</tr>
 				</table><br /><br />
 					If you are looking for earlier (or newer!) releases check out our <a href="https://alioth.debian.org/frs/?group_id=31080">released files</a> page.
-			</div>';
-include ('includes/header.php');
-echo'
+			</div>
+<?php include ('includes/header.php');?>
 		</div>
 	</div>
 </body>
-</html>';
-?>
+</html>




More information about the Tux4kids-commits mailing list