better HTML

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1551 a1c6a512-1295-4272-9138-f99709370657

9 files changed, 187 insertions, 61 deletions

diff --git a/www/manual/index.t b/www/manual/index.t
index 7a427c88c4..6cb6a28c0a 100644
--- a/www/manual/index.t
+++ b/www/manual/index.t
@@ -1,4 +1,6 @@
+#define _PAGE_ The Rockbox Users Manual
+#include "head.t"
 
-Rockbox Users Manual
-
-<a href="rec-boot.html">Recorder</a> <a href="play-boot.html">Player</a>
+<p>
+Booting up: <a href="rec-boot.html">Recorder</a> <a href="play-boot.html">Player</a>
+<p>
diff --git a/www/manual/play-boot.t b/www/manual/play-boot.t
index 9c567c4e79..e7996e43ec 100644
--- a/www/manual/play-boot.t
+++ b/www/manual/play-boot.t
@@ -1,6 +1,12 @@
-
+#define _PAGE_ Rockbox Boots Up
+#include "head.t"
+<p>
 When Rockbox boots up, it'll display the text "Rockbox" for a short time, and
 then it'll jump right into the <a href="play-dir.html">dir browser</a> showing
 the root (toplevel) directory of your Archos.
+<p>
+[screen dump of boot]
+<p>
+[screen dump of toplevel dir]
 
-[screen dump of boot] [screen dump of toplevel dir]
+#include "foot.t"
diff --git a/www/manual/play-dir.t b/www/manual/play-dir.t
index 1eb0ebe50f..d6dda5d5f0 100644
--- a/www/manual/play-dir.t
+++ b/www/manual/play-dir.t
@@ -1,19 +1,33 @@
+#define _PAGE_ Rockbox Directory Browser
+#include "head.t"
+<p>
 In the dir browser, you will see the files and directories that are put in the
 directory you are currently browsing.
-
+<p>
 [screen dump]
-
+<p>
 If you have enabled 'mp3/m3u filter' in the global settings, only files ending
 with .mp3 or .m3u will be displayed in the browser.
-
+<p>
 Buttons:
-
- -      Move upwards in the list, if it already is on the topmost entry, you'll
-        see the cursor moved to the last entry in the list.
- +      Move downwards in the list, if it already is on the last entry, you'll
+<table>
+<tr><td>-</td><td>
+      Move upwards in the list, if it already is on the topmost entry, you'll
+      see the cursor moved to the last entry in the list.
+</td></tr>
+<tr><td> +</td><td>
+        Move downwards in the list, if it already is on the last entry, you'll
         see the cursor moved to the first entry in the list.
- STOP   Move "up" one directory level to the parent directory.
- PLAY   If the cursor is now on a line of a directory, the browser will switch
+</td></tr>
+<tr><td>
+ STOP
+</td><td>
+   Move "up" one directory level to the parent directory.
+</td></tr>
+<tr><td>
+ PLAY
+</td><td>
+   If the cursor is now on a line of a directory, the browser will switch
         into browsing that directory. If the cursor is on a line with a file,
         special actions are peformed depending on the file type. If the file
         is an mp3 file, it'll jump into the <a href="play-wps.html">WPS</a>
@@ -23,6 +37,16 @@ Buttons:
         the list. If you have 'shuffle' selected in the global settings, the
         playlist will be shuffled directly after having been loaded, otherwise
         it'll be played in a straight top-to-bottom fashion.
- ON     If there is an mp3 playing, this'll switch back the
+</td></tr>
+<tr><td>
+ ON 
+</td><td>
+    If there is an mp3 playing, this'll switch back the
         <a href="play-wps.html">WPS</a>.
- MENU   Switches to the <a href="play-menu.html">main menu</a>.
+</td></tr>
+<tr><td>
+ MENU 
+</td><td>
+  Switches to the <a href="play-menu.html">main menu</a>.
+</td></tr>
+</table>
diff --git a/www/manual/play-menu.t b/www/manual/play-menu.t
index d18062a93c..e9e4fe95b2 100644
--- a/www/manual/play-menu.t
+++ b/www/manual/play-menu.t
@@ -1,13 +1,18 @@
+#define _PAGE_ Rockbox Main Menu
+#include "head.t"
+<p>
 The main menu offers:
-
+<p>
 [screen dump]
-
+<p>
 Sound Settings -
-
+<p>
 General Settings -
-
+<p>
 Info -
-
+<p>
 Version -
-
+<p>
 (Debug? -)
+
+#include "foot.t"
diff --git a/www/manual/play-wps.t b/www/manual/play-wps.t
index 4dea445985..2a9ff4ce36 100644
--- a/www/manual/play-wps.t
+++ b/www/manual/play-wps.t
@@ -1,12 +1,37 @@
+#define _PAGE_ Rockbox WPS
+#include "head.t"
+<p>
 The While Playing Screen shows info about what is currently played and can
 only be seen while there is actual music playback.
-
+<p>
 [screen dump]
-
+<p>
 [explain screen info]
-
- MENU+STOP Toggle key lock ON/OFF
- PLAY   Toggle PAUSE/PLAY
- ON     Switch to the <a href="rec-dir.html">dir browser</a>.
- STOP   Stop playback
- MENU   Switches to the <a href="rec-menu.html">main menu</a>.
+<p>
+<table>
+<tr><td>
+ MENU+STOP
+</td><td>
+ Toggle key lock ON/OFF
+</td></tr>
+<tr><td>
+ PLAY
+</td><td>
+   Toggle PAUSE/PLAY
+</td></tr>
+<tr><td>
+ ON 
+</td><td>
+    Switch to the <a href="play-dir.html">dir browser</a>.
+</td></tr>
+<tr><td>
+ STOP
+</td><td>
+   Stop playback
+</td></tr>
+<tr><td>
+ MENU
+</td><td>
+   Switches to the <a href="play-menu.html">main menu</a>.
+</td></tr>
+</table>
diff --git a/www/manual/rec-boot.t b/www/manual/rec-boot.t
index 024d1646c0..047848ce22 100644
--- a/www/manual/rec-boot.t
+++ b/www/manual/rec-boot.t
@@ -1,6 +1,10 @@
-
+#define _PAGE_ Rockbox Boots Up
+#include "head.t"
+<p>
 When Rockbox boots up, it'll display the Rockbox logo for a short time, and
 then it'll jump right into the <a href="rec-dir.html">dir browser</a> showing
 the root (toplevel) directory of your Archos.
-
-[screen dump of boot] [screen dump of toplevel dir]
+<p>
+[screen dump of boot]
+<p>
+[screen dump of toplevel dir]
diff --git a/www/manual/rec-dir.t b/www/manual/rec-dir.t
index ef8a2bb3dc..05abc776f3 100644
--- a/www/manual/rec-dir.t
+++ b/www/manual/rec-dir.t
@@ -1,24 +1,41 @@
+#define _PAGE_ Rockbox Directory Browser
+#include "head.t"
+<p>
 In the dir browser, you will see the files and directories that are put in the
 directory you are currently browsing. You will see tiny symbols on the left
 side of each entry that shows what kind of entry it is.
-
+<p>
 [screen dump]
-
+<p>
 [ ] = mp3 file
-
+<p>
 [ ] = m3u file
-
+<p>
 If you have enabled 'mp3/m3u filter' in the global settings, only files ending
 with .mp3 or .m3u will be displayed in the browser.
-
+<p>
 Buttons:
-
- UP     Move upwards in the list, if it already is on the topmost entry, you'll
+<p>
+<table>
+<tr>
+<td> UP </td>
+<td>
+     Move upwards in the list, if it already is on the topmost entry, you'll
         see the cursor moved to the last entry in the list.
- DOWN   Move downwards in the list, if it already is on the last entry, you'll
+</td></tr>
+<tr>
+<td>DOWN</td>
+<td>
+   Move downwards in the list, if it already is on the last entry, you'll
         see the cursor moved to the first entry in the list.
- LEFT   Move "up" one directory level to the parent directory.
- RIGHT  If the cursor is now on a line of a directory, the browser will switch
+</td></tr>
+<tr>
+<td> LEFT</td>
+<td>   Move "up" one directory level to the parent directory.
+</td></tr>
+<tr>
+<td> RIGHT</td>
+<td>  If the cursor is now on a line of a directory, the browser will switch
         into browsing that directory. If the cursor is on a line with a file,
         special actions are peformed depending on the file type. If the file
         is an mp3 file, it'll jump into the <a href="rec-wps.html">WPS</a> and
@@ -28,9 +45,33 @@ Buttons:
         the list. If you have 'shuffle' selected in the global settings, the
         playlist will be shuffled directly after having been loaded, otherwise
         it'll be played in a straight top-to-bottom fashion.
- PLAY   The same as RIGHT
- ON     If there is an mp3 playing, this'll switch back the WPS.
- OFF    If there is an mp3 playing, this stops playback.
- F1     Switches to the <a href="rec-menu.html">main menu</a>.
+</td></tr>
+<tr><td>
+ PLAY
+</td><td>
+   The same as RIGHT
+</td></tr>
+<tr><td>
+ ON
+</td><td>
+ If there is an mp3 playing, this'll switch back the WPS.
+</td></tr>
+<tr><td>
+ OFF
+</td><td>
+    If there is an mp3 playing, this stops playback.
+</td></tr>
+<tr><td>
+ F1
+</td><td>
+ Switches to the <a href="rec-menu.html">main menu</a>.
+</td></tr>
+<tr><td>
  F2
+</td></tr>
+<tr><td>
  F3
+</td></tr>
+</table>
+
+#include "foot.t"
diff --git a/www/manual/rec-menu.t b/www/manual/rec-menu.t
index 66d2542105..6a7204b473 100644
--- a/www/manual/rec-menu.t
+++ b/www/manual/rec-menu.t
@@ -1,17 +1,26 @@
+#define _PAGE_ Rockbox Main Menu
+#include "head.t"
 The main menu offers:
-
+<p>
 [screen dump]
 
+<p>
 Sound Settings -
 
+<p>
 General Settings -
 
+<p>
 Games -
 
+<p>
 Screensavers -
 
+<p>
 Info -
 
+<p>
 Version -
 
+<p>
 (Debug? -)
diff --git a/www/manual/rec-wps.t b/www/manual/rec-wps.t
index 9faac1a821..cd892a2337 100644
--- a/www/manual/rec-wps.t
+++ b/www/manual/rec-wps.t
@@ -1,18 +1,28 @@
+#define _PAGE_ Rockbox WPS
+#include "head.t"
+<p>
 The While Playing Screen shows info about what is currently played and can
 only be seen while there is actual music playback.
-
+<p>
 [screen dump]
-
+<p>
 [explain screen info]
+<p>
+<table>
+
+<tr><td> F1 + DOWN </td><td> Toggle key lock ON/OFF </td></tr>
+<tr><td> UP</td><td> Increase volume </td></tr>
+<tr><td> DOWN </td><td>  Decrease volume </td></tr>
+<tr><td> LEFT </td><td>  Move to previous song</td></tr>
+<tr><td> RIGHT </td><td> Move to next song </td></tr>
+<tr><td> PLAY </td><td> Toggle PAUSE/PLAY </td></tr>
+<tr><td> ON </td><td> Switch to the <a href="rec-dir.html">dir browser</a> </td></tr>
+<tr><td>  OFF </td><td> Stop playback </td></tr>
+<tr><td> F1  </td><td    Switches to the <a href="rec-menu.html">main menu</a></td></tr>
+<tr><td> F2 </td></tr>
+<tr><td> F3 </td></tr>
+</table>
+
+#include "foot.t"
+
 
- F1 + DOWN  Toggle key lock ON/OFF
- UP     Increase volume
- DOWN   Decrease volume
- LEFT   Move to previous song
- RIGHT  Move to next song
- PLAY   Toggle PAUSE/PLAY
- ON     Switch to the <a href="rec-dir.html">dir browser</a>.
- OFF    Stop playback
- F1     Switches to the <a href="rec-menu.html">main menu</a>.
- F2
- F3