Changes

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

9 files changed, 107 insertions, 57 deletions

diff --git a/www/Makefile b/www/Makefile
index 250c848584..059f3f2c94 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,7 +1,7 @@
 ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -LL >$@
 
 SRC := $(wildcard *.t)
-OBJS := $(SRC:%.t=%.html) daily.shtml
+OBJS := $(SRC:%.t=%.html) daily.shtml main.shtml index.shtml
 
 .SUFFIXES: .t .html
 
@@ -23,5 +23,10 @@ all: $(OBJS)
 
 main.html: main.t activity.html
 
+main.shtml: main.t activity.html
+
+index.shtml: main.shtml
+        ln -s main.shtml index.shtml
+
 daily.shtml: daily.t
 
diff --git a/www/cvs.t b/www/cvs.t
index ac7e5dea62..b743573a44 100644
--- a/www/cvs.t
+++ b/www/cvs.t
@@ -66,6 +66,7 @@ of the Rockbox project
 
 <p><tt>cvs commit -m "This is my change comment" <b>filename</b></tt>
 
+<p><strong>Note:</strong> Before checking in modifications, test-build all targets (player, player-old, recorder, player-sim, recorder-sim) to make sure your changes don't break anything.
 
 <h2>Updating your repository</h2>
 
@@ -105,6 +106,16 @@ those on the remote repository. This is called "status":
 
 <p><tt>cvs status | grep Status | grep -v Up-to-date</tt>
 
+<h2>Producing a diff of your changes</h2>
+
+<p>If you want to see how your local files differ from the CVS repository,
+you can ask CVS to show you:
+
+<p><tt>cvs diff -u [files(s)]</tt>
+
+<p>The <tt>-u</tt> selects the "unified" diff format, which is preferrable
+when working with source code.
+
 <h2>What Happens in the Repository?</h2>
 <p>
  Subscribe to the rockbox-cvs list to get mails sent to you for every commit
diff --git a/www/daily.t b/www/daily.t
index be4ccb6e22..c8c7e992e5 100644
--- a/www/daily.t
+++ b/www/daily.t
@@ -24,7 +24,6 @@ They are <i>not</i> official releases, they are in fact almost guaranteed to not
 
 <p><b>Note 1:</b> You must rename the file to "archos.mod" ("ajbrec.ajz" for the recorder) before copying it to the root of your archos.
 
-<p><b>Note 2:</b> The Recorder version does not fully work yet, due to unfinished drivers. It runs, but cannot play music.
 
 <h2>CVS compile status</h2>
 
diff --git a/www/dailymod.pl b/www/dailymod.pl
index 5648cdbd11..0af1d48c79 100755
--- a/www/dailymod.pl
+++ b/www/dailymod.pl
@@ -17,7 +17,7 @@ sub list {
     print "</ul>\n";
 }
 
-print "<table border=1><tr valign=\"top\"><td>\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";
 &list("playerold");
diff --git a/www/download/index.t b/www/download/index.t
index 8a74aa41a5..777e5aa9c7 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -2,42 +2,78 @@
 #define DOWNLOAD_PAGE
 #include "head.t"
 
-<h2>Version 1.0</h2>
+<h2>Version 1.1</h2>
 
-<p>This first version is more a proof-of-concept than a serious replacement for the stock firmware.
-Read the <a href="rockbox-1.0-notes.txt">release notes</a>.
+<p>Recorder support, playlists and scrolling are the main new features of this version. Read the <a href="rockbox-1.1-notes.txt">release notes</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.
 
 <ul>
-<li><a href="rockbox-1.0-player-old.zip">rockbox-1.0-player-old.zip</a>
+<li><a href="rockbox-1.1-player-old.mod">rockbox-1.1-player-old.mod</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.
 
 <ul>
-<li><a href="rockbox-1.0-player.zip">rockbox-1.0-player.zip</a>
+<li><a href="rockbox-1.1-player.mod">rockbox-1.1-player.mod</a>
 </ul>
 
+<p><b>Bug</b>: Bass and treble adjustment does not work.
+
+</td><td>
+
 <h3>recorder</h3>
-<p>Version 1.0 does not support the Recorder. Future versions will.
+<p>This version is for all Archos Jukebox Recorder models.
+
+<ul>
+<li><a href="rockbox-1.1-recorder.ajz">rockbox-1.1-recorder.ajz</a>
+</ul>
+
+<p><b>Bug</b>: MP3 playback only works on Recorder 20, not 6 or 10. PLAY key is not detected, use RIGHT.
+
+</td></tr></table>
+
 
 <h3>Source code</h3>
 <ul>
-<li><a href="rockbox-1.0.tar.gz">rockbox-1.0.tar.gz</a>
+<li><a href="rockbox-1.1.tar.gz">rockbox-1.1.tar.gz</a>
 </ul>
 
+<h3>Screen shots (from simulator)</h3>
+
+<p>
+<table><tr>
+<td><img src="player-sim.png" alt="Player simulator">
+<br>Player boot screen</td>
+
+<td><img src="recorder-sim.png" alt="Recorder simulator">
+<br>Recorder boot screen</td>
+
+<td><img src="browser.png" alt="File browser"><br>Recorder file browser</td>
+
+<td><img src="id3.png" alt="ID3 display"><br>Recorder ID3 display</td>
+</tr><tr>
+<td><img src="tetris.png" alt="Tetris"><br>Tetris (recorder only)</td>
+<td><img src="sokoban.png" alt="Sokoban"><br>Sokoban (recorder only)</td>
+<td><img src="bounce.png" alt="Bounce"><br>Bouncing text (recorder only)</td>
+</tr></table>
+
+
 <h3>User interface simulators</h3>
-<p><img src="player-sim.png" alt="Player simulator">
-<img src="recorder-sim.png" alt="Recorder simulator">
 
+<p>
 <ul>
-<li><a href="player-sim-1.0">player simulator 1.0 for linux</a> (42880 bytes)
+<li><a href="player-sim-1.1">player simulator 1.1 for linux-x86</a> (48300 bytes)
 (if you don't have libgcc_s.so.1, get it <a href="libgcc_s.so.1">here</a>)
-<li><a href="recorder-sim-1.0">recorder simulator 1.0 for linux</a> (51976 bytes)
-<li><a href="recorder-sim-1.0.exe">recorder simulator 1.0 for win32</a> (167936 bytes)
+<li><a href="recorder-sim-1.1">recorder simulator 1.1 for linux-x86</a> (98184 bytes)
+<li><a href="player-sim-1.1.exe">player simulator 1.1 for win32</a> (126976 bytes)
+<li><a href="recorder-sim-1.1.exe">recorder simulator 1.1 for win32</a> (172032 bytes)
 </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:
@@ -46,11 +82,11 @@ Read the <a href="rockbox-1.0-notes.txt">release notes</a>.
 <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
+<dd>4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys, +/enter = on/off
 </dl>
 
 <h2>Installation</h2>
-<p>Unzip the archive. Rename your current archos.mod (if any) in the root of your archos, then copy the rockbox archos.mod there.
+<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.
 
@@ -59,7 +95,7 @@ Read the <a href="rockbox-1.0-notes.txt">release notes</a>.
 <h2>Bug reports</h2>
 
 <p>Please use our
-<a href="http://sourceforge.net/projects/rockbox/">Sourceforge page</a>
+<a href="http://sourceforge.net/tracker/?group_id=44306&atid=439118">Sourceforge page</a>
 for all bug reports and feature requests. If you have a sourceforge account,
 please log in first so we have a name to connect to the report.
 
diff --git a/www/head.t b/www/head.t
index c573491e2f..748c051caa 100644
--- a/www/head.t
+++ b/www/head.t
@@ -33,7 +33,7 @@
 <a class="menulink" href="/rockbox/docs/">data sheets</a><br>
 <a class="menulink" href="/rockbox/schematics/">schematics</a><br>
 <a class="menulink" href="/rockbox/mods/">hardware mods</a><br>
-<a class="menulink" href="http://bjorn.haxx.se/rockbox/mail.cgi">mail list archive</a><br>
+<a class="menulink" href="http://bjorn.haxx.se/rockbox/mail/">mailing list</a><br>
 <a class="menulink" href="/rockbox/irc/">IRC</a><br>
 <a class="menulink" href="/rockbox/tools.html">tools</a><br>
 <a class="menulink" href="/rockbox/internals/">photos</a><br>
diff --git a/www/history.t b/www/history.t
index d1902c53d8..1f5421100a 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,12 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2002-06-19</i>: Recorder sound support checked into CVS. Good news: No background noise!
+
+<p><i>2002-06-10</i>: Playlist and scroll support added. Testing for release v1.1.
+
+<p><i>2002-06-07</i>: The ATA driver now works for the Recorder models too.
+
 <p><i>2002-06-01</i>: Version 1.0 is released! <a href="download/">Download it here</a>.
 
 <p><i>2002-06-01</i>: Web site has been down three days due to a major power loss.
diff --git a/www/main.t b/www/main.t
index 4e3ad64d50..057cceab7b 100644
--- a/www/main.t
+++ b/www/main.t
@@ -16,17 +16,24 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R
 
 <p><i>2002-06-19</i>: Version 1.1 is released. <a href="download/">Download it here</a>.
 
-<p><i>2002-06-19</i>: Recorder sound support checked into CVS. Good news: No background noise!
-
-<p><i>2002-06-10</i>: Playlist and scroll support added. Testing for release v1.1.
-
-<p><i>2002-06-07</i>: The ATA driver now works for the Recorder models too.
-
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
-<p>We have a mailing list: rockbox@cool.haxx.se.
-To subscribe, send a message to <a href="mailto:majordomo@cool.haxx.se">majordomo@cool.haxx.se</a> with the words "subscribe rockbox" in the body.
+<h2>Recent CVS activity</h2>
+<p>
+<!--#include file="last5.html" -->
+
+<h2>Open bug reports</h2>
+<p>
+<!--#include file="bugs.html" -->
+<small><b>Note:</b> Don't file bug reports on daily builds. They are work in progress.</small>
+
+<h2>Vacations</h2>
+<p>Parts of the core team is currently away on vacation:
+<ul>
+<li>Björn Stenberg (Zagor): Back friday july 5, reads mail
+<li>Daniel Stenberg (Bagder): Back thursday july 25, does not read mail
+</ul>
 
 <h2>Roadmap</h2>
 <p>This is a rough indication of which features we plan/expect/hope to be
@@ -60,31 +67,4 @@ The first thing this version does after boot is to look for a file called
 If it exists, it is loaded into RAM and started.
 This is how firmware upgrades are loaded.
 
-<h2>Dreams</h2>
-<p>Ok, forget about reality, what could we do with this?
-
-<ul>
-<li>All those simple mp3-play features we sometimes miss:
- <ul>
- <li>No pause between songs
- <li>Mid-song resume
- <li>Mid-playlist resume
- <li>No-scan playlists
- <li>Unlimited playlist size
- <li>Autobuild playlists (such as "all songs in this directory tree")
- <li>Auto-continue play in the next directory
- <li>Current folder and all sub-folder random play
- <li>Full disk random play
- <li>REAL random (if press back it goes to the previous song that was played)
- <li>Multi song queue (folder queue)
-</ul>
-<li>Faster scroll speed
-<li>Archos Recorder support. Most of the hardware is the same, but the display and some other things differ.
-<li>All kinds of cool features done from the wire remote control, including controlling your Archos from your car radio (req hw mod)
-<li>Ogg Vorbis support [unverified: the MAS is somewhat programmable, but enough?]
-<li>Support for megabass switch (req hw mod) [unverified: I just saw the DAC docs shows how to do it switchable. we need a free port pin to be able to switch]
-<li>Player control via USB [unverified]
-<li>Memory expansion? [doubtful: the current DRAM chip only has 10 address lines. we'd have to pull off one heck of a hw mod to expand that]
-</ul>
-
 #include "foot.t"
diff --git a/www/style.css b/www/style.css
index eaad1e3833..8bc9965091 100644
--- a/www/style.css
+++ b/www/style.css
@@ -42,7 +42,7 @@ A {
 
 .bgbox {
  left-border-width: 1px;
- border-color: black;
+ border-color: #000000;
 }
 
 .menulink {
@@ -56,7 +56,7 @@ A {
 }
 
 .buildwarn {
- background-color: yellow;
+ background-color: #ffff00;
  width: 3em;
 }
 
@@ -66,5 +66,18 @@ A {
 }
 
 .gccwarn {
+ color: #ff4040;
+}
+
+.gccerror {
  color: #ff0000;
-}
\ No newline at end of file
+}
+
+.changetable, .bugs, .dailymod {
+ border: outset 2px #ffffff;
+}
+
+.changetable td, .bugs td {
+ background-color: #c6d6f5;
+ padding: 4px;
+}