8 files changed, 45 insertions, 19 deletions

diff --git a/docs/CUSTOM_WPS_FORMAT b/docs/CUSTOM_WPS_FORMAT
index b9959ef271..5162d2ea94 100644
--- a/docs/CUSTOM_WPS_FORMAT
+++ b/docs/CUSTOM_WPS_FORMAT
@@ -80,3 +80,21 @@ Example File
 That is, "tracknum - title [artist, album]", where most fields are only
 displayed if available. Could also be rendered as "filename" or
 "tracknum - title [artist]".
+
+Default
+-------
+If you don't use a default.wps file, you get the hardcoded wps layout.
+The default WPS screen is for player:
+
+%s%pp/%pe: %?ia<%ia - >%?it<%it|%fm>
+%pc/%pt
+
+and for recorder:
+
+%s%fp
+%it
+%id
+%ia
+%fb kbit %fv
+Time: %pc / %pt
+%pb
diff --git a/www/Makefile b/www/Makefile
index e1bade1d94..24fd9545cc 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,7 +1,9 @@
 ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -LL >$@
 
 SRC := $(wildcard *.t)
-OBJS := $(SRC:%.t=%.html) daily.shtml main.shtml index.shtml bugs.html status.shtml
+SOBJS := daily.shtml main.shtml index.shtml status.shtml \
+        bugs.shtml requests.shtml
+OBJS := $(SRC:%.t=%.html) $(SOBJS)
 
 .SUFFIXES: .t .html
 
@@ -33,8 +35,5 @@ index.shtml: main.shtml
 
 daily.shtml: daily.t
 
-bugs.html:
-        perl getbugs.pl > bugs.html
-
 clean:
         find . -name "*html" | xargs rm
diff --git a/www/foot.t b/www/foot.t
index 101f9a29c4..4061ba58dd 100644
--- a/www/foot.t
+++ b/www/foot.t
@@ -1,5 +1,5 @@
 <hr size=1 align="left" width="10%">
-<small><i>Page was last modified __DATE__</i> <a href=mailto:bjorn@haxx.se>Björn Stenberg</a></small>
+<small><i>Page was last modified __FILE_DATE__</i> <a href=mailto:bjorn@haxx.se>Björn Stenberg</a></small>
 </td></tr></table>
 </body>
 </html>
diff --git a/www/head.t b/www/head.t
index ee2a978f9a..e802b39866 100644
--- a/www/head.t
+++ b/www/head.t
@@ -43,8 +43,8 @@
 <a class="menulink" href="/daily.shtml">daily builds</a><br>
 <a class="menulink" href="/cvs.html">CVS</a><br>
 <a class="menulink" href="http://sourceforge.net/projects/rockbox/">sourceforge</a><br>
-<a class="menulink" href="http://sourceforge.net/tracker/?atid=439118&group_id=44306&func=browse">bug reports</a><br>
-<a class="menulink" href="http://sourceforge.net/tracker/?atid=439121&group_id=44306&func=browse">feature&nbsp;requests</a><br>
+<a class="menulink" href="bugs.shtml">bug reports</a><br>
+<a class="menulink" href="requests.shtml">feature&nbsp;requests</a><br>
 <a class="menulink" href="http://bjorn.haxx.se/isd200/">linux driver</a>
 
 <div align="right">
diff --git a/www/history.t b/www/history.t
index b0498f11ce..6198f3b96c 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,12 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<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>.
+
+<p><i>2002-08-06</i>: Battery charging added for the Recorders (players have hardware charging).
+
 <p><i>2002-08-02</i>: <a href="tshirt-contest">Rockbox T-Shirt Design Contest</a>
 
 <p><i>2002-07-28</i>: Configuration saving implemented for all models. Experimental saving to disk
diff --git a/www/irc/irclogs.pl b/www/irc/irclogs.pl
index d020c634e1..cf69d2cfb7 100755
--- a/www/irc/irclogs.pl
+++ b/www/irc/irclogs.pl
@@ -11,6 +11,7 @@ print "<table class=archive>\n";
 
 $lasty = 0;
 $lastm = 0;
+$count = 0;
 
 for ( @logs ) {
     $size = (stat("$_"))[7];
@@ -23,6 +24,7 @@ for ( @logs ) {
             $d = $3;
             $mname = ucfirst MonthNameEng($m);
             if ( $m != $lastm ) {
+                $count=0;
                 print "</tr><tr>\n" if $lastm != 0;
 #                if ( $m % 6 == 0 ) {
 #                    print "</tr><tr valign=top>\n";
@@ -33,6 +35,10 @@ for ( @logs ) {
 #            $lines = `wc -l $file` + 0;
 #            print "<li><a test href=\"$file\">$mname $d</a> <small>($lines lines)</small>\n";
             print "<td><a test href=\"$file\">$d</a></td>\n";
+            if ( ++$count > 15 ) {
+                print "</tr><tr><th></th>\n";
+                $count=0;
+            }
         }
     }
     #print "<li><a href=\"daily/$_\">$_</a> ($size bytes) $log\n";
diff --git a/www/main.t b/www/main.t
index 8579fc4600..e2453440a2 100644
--- a/www/main.t
+++ b/www/main.t
@@ -10,6 +10,9 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R
 
 <h2>News</h2>
 
+<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!
@@ -18,12 +21,6 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R
 
 <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>.
-
-<p><i>2002-08-06</i>: Battery charging added for the Recorders (players have hardware charging).
-
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
@@ -33,7 +30,7 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R
 
 <h2>Open bug reports</h2>
 <p>
-<!--#include file="bugs.html" -->
+<!--#include file="bugs.txt" -->
 <small><b>Note:</b> Don't file bug reports on daily builds. They are work in progress.</small>
 
 <h2>Roadmap</h2>
@@ -43,9 +40,9 @@ notice.
 
 <dl>
 <dt><b>Version 1.4</b>
-<dd> Autobuild playlists, Recording, Loadable fonts, Customizable WPS, Firmware loading (ROLO)
-<dt><b>Version 1.5</b>
-<dd> File/directory management
+<dd> Loadable fonts, Customizable WPS, Firmware loading (ROLO)
+<dt><b>Version 2.0</b>
+<dd> Recording, Autobuild playlists, File/directory management
 </dl>
 
 <h2>About the hardware</h2>
diff --git a/www/style.css b/www/style.css
index 20af1941ac..2f8631c816 100644
--- a/www/style.css
+++ b/www/style.css
@@ -86,7 +86,7 @@ PRE {
 }
 
 
-.changetable, .bugs, .dailymod, .buildstatus, .archive {
+.changetable, .bugs, .requests, .dailymod, .buildstatus, .archive, .buttontable {
  border: outset 2px #ffffff;
 }
 
@@ -94,7 +94,7 @@ PRE {
  vertical-align: top;
 }
 
-.changetable td, .bugs td, .archive td {
+.changetable td, .bugs td, .requests td, .archive td, .buttontable td {
  background-color: #c6d6f5;
  padding: 4px;
 }