Updated web

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

10 files changed, 64 insertions, 65 deletions

diff --git a/docs/CUSTOM_WPS_FORMAT b/docs/CUSTOM_WPS_FORMAT
index 242ef02950..1d696b7e40 100644
--- a/docs/CUSTOM_WPS_FORMAT
+++ b/docs/CUSTOM_WPS_FORMAT
@@ -89,7 +89,7 @@ If you haven't selected a .wps file in the .rockbox directory, you get the
 hardcoded wps layout. The default WPS screen is for player:
 
 %s%pp/%pe: %?ia<%ia - >%?it<%it|%fm>
-%pc/%pt
+%pc%pb%pt
 
 and for recorder:
 
@@ -100,3 +100,4 @@ and for recorder:
 %fb kbit %fv
 Time: %pc / %pt
 %pb
+%pm
diff --git a/www/Makefile b/www/Makefile
index 24fd9545cc..035ada8ab6 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -24,6 +24,8 @@ all: $(OBJS)
 	@(cd download; $(MAKE))
 	@(cd manual; $(MAKE))
 	@(cd manual-1.2; $(MAKE))
+	@(cd fonts; $(MAKE))
+	@(cd lang; $(MAKE))
 	@(cd tshirt-contest; $(MAKE))
 
 main.html: main.t activity.html
diff --git a/www/dailymod.pl b/www/dailymod.pl
index 0af1d48c79..f1a7a557be 100755
--- a/www/dailymod.pl
+++ b/www/dailymod.pl
@@ -17,19 +17,14 @@ sub list {
     print "</ul>\n";
 }
 
-print "<table class=dailymod><tr><td>\n";
-print "<h3>player-old</h3>\n";
-print "<p>This version is for old Archos Jukebox 5000, 6000 models with ROM firmware older than 4.50:\n";
+print "<table class=rockbox><tr><th>player-old</th><th>player</th><th>recorder</th></tr>\n";
+print "<tr><td>This version is for old Archos Jukebox 5000, 6000 models with ROM firmware older than 4.50:\n";
 &list("playerold");
 
-print "</td><td>\n";
-print "<h3>player</h3>\n";
-print "<p>This version is for Archos Jukebox 5000/6000 with ROM firmware 4.50 or later, and all Studio models:\n";
+print "</td><td>This version is for Archos Jukebox 5000/6000 with ROM firmware 4.50 or later, and all Studio models:\n";
 &list("player");
 
-print "</td><td>\n";
-print "<h3>recorder</h3>\n";
-print "<p>This version is for all Archos Jukebox Recorder models:\n";
+print "</td><td>This version is for all Archos Jukebox Recorder models:\n";
 &list("recorder");
 
 print "</td></tr></table>\n";
diff --git a/www/docs/Makefile b/www/docs/Makefile
index 266663c85d..838f22f078 100644
--- a/www/docs/Makefile
+++ b/www/docs/Makefile
@@ -37,6 +37,12 @@ custom_wps_format.raw: $(DOCS)/CUSTOM_WPS_FORMAT $(TXT2HTML)
 custom_wps_format.html: custom_wps_format.t custom_wps_format.raw $(TXT2HTML)
 	$(ACTION) $<
 
+custom_cfg_format.raw: $(DOCS)/CUSTOM_CFG_FORMAT $(TXT2HTML)
+	$(TXT2HTML) < $< > $@
+
+custom_cfg_format.html: custom_cfg_format.t custom_cfg_format.raw $(TXT2HTML)
+	$(ACTION) $<
+
 how_to_compile.raw: $(DOCS)/README $(TXT2HTML)
 	$(TXT2HTML) < $< > $@
 
diff --git a/www/download/index.t b/www/download/index.t
index 7580335d0f..7cc9b791bb 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -2,69 +2,57 @@
 #define DOWNLOAD_PAGE
 #include "head.t"
 
-<h2>Changes for version 1.3</h2>
+<h2>Latest version: 1.4</h2>
 
-<p>Please read the <a href="rockbox-1.3-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
+<p>Please read the <a href="rockbox-1.4-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
 
 <p>
-<table><tr valign="top"><td>
-<h3>player-old</h3>
-<p>This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50.
+<table class=rockbox><tr>
+<th>player-old</th>
+<th>player</th>
+<th>recorder</th>
+</tr><tr>
+<td>
+This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50.
 
 <ul>
-<li><a href="rockbox-1.3-player-old.mod">rockbox-1.3-player-old.mod</a>
+<li><a href="rockbox-1.4-player-old.zip">rockbox-1.4-player-old.zip</a>
 </ul>
 
 </td><td>
-
-<h3>player</h3>
-<p>This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models.
+This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models.
 
 <ul>
-<li><a href="rockbox-1.3-player.mod">rockbox-1.3-player.mod</a>
+<li><a href="rockbox-1.4-player-new.zip">rockbox-1.4-player-new.zip</a>
 </ul>
 
 </td><td>
-
-<h3>recorder</h3>
-<p>This version is for all Archos Jukebox Recorder models.
+This version is for all Archos Jukebox Recorder models.
 
 <ul>
-<li><a href="rockbox-1.3-recorder.ajz">rockbox-1.3-recorder.ajz</a>
+<li><a href="rockbox-1.4-recorder.zip">rockbox-1.4-recorder.zip</a>
 </ul>
 
 </td></tr></table>
 
 <h3>Source code</h3>
 <ul>
-<li><a href="rockbox-1.3.tar.gz">rockbox-1.3.tar.gz</a>
+<li><a href="rockbox-1.4.tar.gz">rockbox-1.4.tar.gz</a>
 </ul>
 
-<h3>User interface simulators</h3>
-
-<p>
+<h3>Auxiliary files</h3>
 <ul>
-<li><a href="rockbox-1.3-player-sim">player simulator 1.3 for linux-x86</a>
-<li><a href="rockbox-1.3-recorder-sim">recorder simulator 1.3 for linux-x86</a>
-<li><a href="rockbox-1.2-player-sim.exe">player simulator 1.2 for win32</a>
-<li><a href="rockbox-1.2-recorder-sim.exe">recorder simulator 1.2 for win32</a>
+<li><a href="/lang/">Languages</a>
+<li><a href="/fonts/">Fonts</a>
 </ul>
 
-<p>The simulators browse a directory called 'archos' in the directory they are started from. Create it and copy some mp3 files there. The buttons are simulated on the numeric keypad:
-<dl>
-<dt><b>Player</b>
-<dd>4/6 = prev/next, 8 = play, 2 = stop, enter = menu, + = on
-
-<dt><b>Recorder</b>
-<dd>4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys, +/enter = on/off
-</dl>
-
 <h2>Installation</h2>
-<p>Rename your current archos.mod (if any) in the root of your archos, then copy the rockbox archos.mod there. Make sure it's called "archos.mod" (5000,6000,Studio) or "ajbrec.ajz" (Recorder).
 
-<p>To remove the Rockbox firmware, just reverse the process: Rename the rockbox archos.mod file and replace it with your original firmware file. If you had no firmware file, just renaming or removing the rockbox file is sufficient.
+<p>Unpack the zip archive in the root of your Archos disk. Make sure you 'eject' (unmount) the usb disk before you unplug it.
+
+<h2>Uninstallation</h2>
 
-<p>(Note that some models cannot shut off while the power adapter is plugged in.)
+<p>If you ever want to remove the Rockbox firmware, simply delete archos.mod (player) or ajbrec.ajz (recorder) from the root of your Archos disk.
 
 <h2>Bug reports</h2>
 
diff --git a/www/head.t b/www/head.t
index a96099f1f2..6a33f1fc17 100644
--- a/www/head.t
+++ b/www/head.t
@@ -27,14 +27,14 @@
 &nbsp;<a href="/"><img src="/rockbox100.png" width=99 height=30 border=0></a>&nbsp;<br>
 
 <p align="right">
-<a class="menulink" href="/">main page</a><br>
+<a class="menulink" href="/">home</a><br>
 <a class="menulink" href="/download/">download</a><br>
 <a class="menulink" href="/screenshots.html">screen&nbsp;shots</a><br>
-<a class="menulink" href="/daily.shtml">daily builds</a><br>
 <a class="menulink" href="/docs/">documentation</a><br>
 <a class="menulink" href="/mail/">mailing lists</a><br>
 <a class="menulink" href="/irc/">IRC</a><br>
 <a class="menulink" href="/internals/">photos</a><br>
+<a class="menulink" href="/daily.shtml">daily builds</a><br>
 <a class="menulink" href="/mods/">hardware mods</a><br>
 <a class="menulink" href="/requests.shtml">feature&nbsp;requests</a><br>
 <a class="menulink" href="/bugs.shtml">bug reports</a><br>
@@ -45,11 +45,11 @@
 <form action="http://www.google.com/search">
 <input name=as_q size=12><br>
 <input value="Search" type=submit>
-<input type=hidden name=as_oq value=rockbox>
-<input type=hidden name=as_sitesearch value="bjorn.haxx.se">
-</form></div>
+<input type=hidden name=as_sitesearch value="rockbox.haxx.se">
+</form>
+<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=44306&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"></a>
+</div>
 
-<a href="http://sourceforge.net"><img src="http://sourceforge.net/ sflogo.php?group_id=44306&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"></a>
 </td>
 <td>
 
diff --git a/www/history.t b/www/history.t
index 6198f3b96c..1dd1fd7ee1 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,14 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2002-09-13</i>: We took a big step and converted to an entirely new font system for the Recorder. Please bear with us as we smoothen out the initial quirks.
+
+<p><i>2002-09-03</i>: ROLO, the Rockbox Loader has been integrated into the CVS, allowing Archos or other Rockbox firmware being loaded by simply selecting the file!
+
+<p><i>2002-09-02</i>: <a href="http://rockbox.haxx.se/tshirt-contest/vote.html">Vote for your favourite tshirt designs!</a>
+
+<p><i>2002-08-28</i>: Version 1.3 is released. <a href="download/">Go fetch</a>.
+
 <p><i>2002-08-09</i>: Version 1.2 is released. <a href="download/">Download it here</a>.
 
 <p><i>2002-08-06</i>: Web site moved to new domain: <strong>rockbox.haxx.se</strong>.
diff --git a/www/lock.t b/www/lock.t
index 9793a995f5..dbe8d0767d 100644
--- a/www/lock.t
+++ b/www/lock.t
@@ -7,12 +7,14 @@ Part. Error
 Pls Chck HD
 </pre>
 
-<p>We are still not 100% sure why it happens. Theories range from
+<p>We are still not 100% sure why it happened. Theories range from
 low-power conditions to accidental chip select failure.
 It has also happened for normal users,
-using the standard Archos-supplied firmware, although it's more frequent for
+using the standard Archos-supplied firmware, although it was more frequent for
 us developers.
 
+<p>Note: None of us developers have experienced this problem since march 2002.
+
 <p>We do however know how to unlock the disk:
 
 <h2>Windows/DOS unlock</h2>
@@ -35,6 +37,10 @@ us developers.
 
 <p>Big thanks to Magnus Andersson for discovering the Fujitsu (lack of) user password!
 
+<p>There is also a program for win32,
+<a href="http://www.ws64.com/archos/ArchosUnlock.exe">ArchosUnlock.exe</a>,
+that creates a linux boot disk with the below mentioned patched isd200 driver.
+
 <h2>Linux unlock</h2>
 
 <p>For those of us using Linux, we have written 
diff --git a/www/main.t b/www/main.t
index e2453440a2..0ca940a722 100644
--- a/www/main.t
+++ b/www/main.t
@@ -3,24 +3,17 @@
 #define MAIN_PAGE
 #include "head.t"
 
-<h2>Purpose</h2>
+<h2>What is Rockbox?</h2>
 
-<p>The purpose of this project is to write an Open Source replacement
-firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>Recorder</i> MP3 players.
+<p>Rockbox is an Open Source replacement firmware for the Archos Jukebox 5000, 6000, Studio and Recorder MP3 players.
 
 <h2>News</h2>
 
+<p><i>2002-10-11</i>: Version 1.4 is released. <a href="download/">Grab it</a>.
+
 <p><i>2002-09-19</i>: We now support multiple languages. You can help by translating Rockbox to your language. No programming skills required.
 <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2002-09/0856.shtml">See instructions here</a>
 
-<p><i>2002-09-13</i>: We took a big step and converted to an entirely new font system for the Recorder. Please bear with us as we smoothen out the initial quirks.
-
-<p><i>2002-09-03</i>: ROLO, the Rockbox Loader has been integrated into the CVS, allowing Archos or other Rockbox firmware being loaded by simply selecting the file!
-
-<p><i>2002-09-02</i>: <a href="http://rockbox.haxx.se/tshirt-contest/vote.html">Vote for your favourite tshirt designs!</a>
-
-<p><i>2002-08-28</i>: Version 1.3 is released. <a href="download/">Go fetch</a>.
-
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
diff --git a/www/style.css b/www/style.css
index b132f3d9a3..d03f993947 100644
--- a/www/style.css
+++ b/www/style.css
@@ -86,7 +86,7 @@ PRE {
 }
 
 
-.changetable, .bugs, .requests, .dailymod, .buildstatus, .archive, .buttontable {
+.rockbox, .changetable, .bugs, .requests, .dailymod, .buildstatus, .archive, .buttontable {
  border: outset 2px #ffffff;
 }
 
@@ -94,7 +94,7 @@ PRE {
  vertical-align: top;
 }
 
-.changetable td, .bugs td, .requests td, .archive td, .buttontable td {
+.rockbox td, .changetable td, .bugs td, .requests td, .archive td, .buttontable td {
  background-color: #c6d6f5;
  padding: 4px;
 }