Updates

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

11 files changed, 105 insertions, 38 deletions

diff --git a/www/bugs.t b/www/bugs.t
new file mode 100644
index 0000000000..d1a952c07b
--- /dev/null
+++ b/www/bugs.t
@@ -0,0 +1,26 @@
+#define _PAGE_ Open bug reports
+#include "head.t"
+
+<!--#include file="bugs.txt" -->
+
+<h2>Submitting new bug reports</h2>
+
+<h3>Rules for bug reporting:</h3>
+
+<ol>
+<li> Don't file bug reports on unreleased code (CVS/daily builds). Write a mail to the <a href="/mail/">mailing list</a> instead.
+<li> Check that the bug hasn't already been reported
+<li> Always include the following information in your bug report:
+  <ul>
+  <li> Which exact model Archos you have (as printed on the unit)
+  <li> Which exact ROM firmware version you have
+  <li> Which exact Rockbox version you are using
+  <li> A link to the data that malfunctions, if applicable (IMPORTANT!)
+  </ul>
+<li>If you have a Sourceforge account, log in before you file the report.
+<li>If you don't have a SF account, sign the report with your email.
+</ol>
+
+<p><a href="http://sourceforge.net/tracker/?func=add&group_id=44306&atid=439118">Click here to submit a new bug report</a>.
+
+#include "foot.t"
diff --git a/www/download/index.t b/www/download/index.t
index 09dea704ca..7580335d0f 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -40,27 +40,6 @@
 <li><a href="rockbox-1.3.tar.gz">rockbox-1.3.tar.gz</a>
 </ul>
 
-
-<h3>Screen shots (from 1.2 simulator)</h3>
-
-<p>
-<table><tr valign=top>
-<td><img src="pboot-1.2.png" alt="Player simulator">
-<br>Player boot screen</td>
-
-<td><img src="boot-1.2.png" alt="Recorder simulator">
-<br>Recorder boot screen</td>
-
-<td><img src="dir-1.2.png" alt="Dir browser"><br>Recorder dir browser</td>
-
-<td><img src="wps-1.2.png" alt="WPS"><br>Recorder "While Playing Screen"</td>
-</tr><tr valign=top>
-<td><img src="tetris-1.2.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>
@@ -89,10 +68,8 @@
 
 <h2>Bug reports</h2>
 
-<p>Please use our
-<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.
+<p>Please use our <a href="/bugs.html">bug page</a>
+for all bug reports and feature requests.
 
 <p>If you are interested in helping with the development of Rockbox, please join the mailing list.
 
diff --git a/www/head.t b/www/head.t
index e802b39866..014e81a127 100644
--- a/www/head.t
+++ b/www/head.t
@@ -29,22 +29,15 @@
 <p align="right">
 <a class="menulink" href="/">main page</a><br>
 <a class="menulink" href="/download/">download</a><br>
-<a class="menulink" href="/manual/">manual</a><br>
-<a class="menulink" href="/docs/faq.html">FAQ</a><br>
-<a class="menulink" href="/tshirt-contest/">t-shirt contest</a><br>
-<a class="menulink" href="/notes.html">research notes</a><br>
-<a class="menulink" href="/docs/">data sheets</a><br>
-<a class="menulink" href="/schematics/">schematics</a><br>
-<a class="menulink" href="/mods/">hardware mods</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="/tools.html">tools</a><br>
 <a class="menulink" href="/internals/">photos</a><br>
-<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="bugs.shtml">bug reports</a><br>
-<a class="menulink" href="requests.shtml">feature&nbsp;requests</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>
 <a class="menulink" href="http://bjorn.haxx.se/isd200/">linux driver</a>
 
 <div align="right">
diff --git a/www/indexbot.t b/www/indexbot.t
new file mode 100644
index 0000000000..a450cde5c6
--- /dev/null
+++ b/www/indexbot.t
@@ -0,0 +1 @@
+#include "foot.t"
diff --git a/www/indextop.t b/www/indextop.t
new file mode 100644
index 0000000000..31a6025960
--- /dev/null
+++ b/www/indextop.t
@@ -0,0 +1,2 @@
+#define _PAGE_ Rockbox mailing lists
+#include "head.t"
diff --git a/www/mailbot.t b/www/mailbot.t
new file mode 100644
index 0000000000..a450cde5c6
--- /dev/null
+++ b/www/mailbot.t
@@ -0,0 +1 @@
+#include "foot.t"
diff --git a/www/mailtop.t b/www/mailtop.t
new file mode 100644
index 0000000000..f4db8ecc62
--- /dev/null
+++ b/www/mailtop.t
@@ -0,0 +1,2 @@
+#define _PAGE_ Rockbox mail archive
+#include "head.t"
diff --git a/www/requests.t b/www/requests.t
new file mode 100644
index 0000000000..2d7a004308
--- /dev/null
+++ b/www/requests.t
@@ -0,0 +1,19 @@
+#define _PAGE_ Open feature requests
+#include "head.t"
+
+<!--#include file="requests.txt" -->
+
+<h2>Submitting a new feature request</h2>
+
+<h3>Rules for feature requests:</h3>
+
+<ol>
+<li> Check that the feature hasn't already been requested
+<li> Check that the feature hasn't already been implemented (download the latest daily build and/or search the mail list archive)
+<li>If you have a Sourceforge account, log in before you file the request.
+<li>If you don't have a SF account, sign the request with your email.
+</ol>
+
+<p><a href="http://sourceforge.net/tracker/?func=add&group_id=44306&atid=439121">Click here to submit a new feature request</a>.
+
+#include "foot.t"
diff --git a/www/screenshots.t b/www/screenshots.t
new file mode 100644
index 0000000000..6e78ca0fc8
--- /dev/null
+++ b/www/screenshots.t
@@ -0,0 +1,24 @@
+#define _PAGE_ Screen shots
+#include "head.t"
+
+<h2>Version 1.2</h2>
+<p>Images are from the UI simulators and differ slightly from target.
+
+<p>
+<table><tr valign=top>
+<td><img src="download/pboot-1.2.png" alt="Player simulator">
+<br>Player boot screen</td>
+
+<td><img src="download/boot-1.2.png" alt="Recorder simulator">
+<br>Recorder boot screen</td>
+
+<td><img src="download/dir-1.2.png" alt="Dir browser"><br>Recorder dir browser</td>
+
+<td><img src="download/wps-1.2.png" alt="WPS"><br>Recorder "While Playing Screen"</td>
+</tr><tr valign=top>
+<td><img src="download/tetris-1.2.png" alt="Tetris"><br>Tetris (recorder only)</td>
+<td><img src="download/sokoban.png" alt="Sokoban"><br>Sokoban (recorder only)</td>
+<td><img src="download/bounce.png" alt="Bounce"><br>Bouncing text (recorder only)</td>
+</tr></table>
+
+#include "foot.t"
diff --git a/www/status.t b/www/status.t
new file mode 100644
index 0000000000..8ca5b99d8e
--- /dev/null
+++ b/www/status.t
@@ -0,0 +1,17 @@
+#define _PAGE_ Development status
+#define STATUS_PAGE
+#include "head.t"
+
+<h2>Recent CVS activity</h2>
+<p>
+<!--#include file="lastcvs.link" -->
+
+<h2>CVS compile status</h2>
+<p>
+<!--#include virtual="buildstatus.link" -->
+
+<h2>Open bug reports</h2>
+<p>
+<!--#include file="bugs.txt" -->
+
+#include "foot.t"
diff --git a/www/style.css b/www/style.css
index 2f8631c816..b132f3d9a3 100644
--- a/www/style.css
+++ b/www/style.css
@@ -98,3 +98,8 @@ PRE {
  background-color: #c6d6f5;
  padding: 4px;
 }
+
+.fixed td {
+ background-color: #aae8aa;
+ padding: 4px;
+}