From a339d67968b3a71533f2be8dd6a04f2b360c942b Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Wed, 4 Aug 2010 22:23:57 -0300
Subject: [PATCH] Work around the problem of not being able to just put
 index.html into Qi, and have the brower interpret it as HTML when browsing
 the repository through the Web interface: generate a test.html by default,
 with local paths, and generate the real index.html, with remote URLs, when
 uploading.

- web/style.sh: only set BASE if not set already in the environment
- web/Makefile: added test.html target and made it the default
- web/index.sh: ben-dispbase-back-100um is running now, switch to "in progress"
- web/index.sh: switched 100 um ben-bottom-nobat scan from "under
  consideration" to "planned". In fact, it's the next in line.
---
 web/Makefile | 5 ++++-
 web/index.sh | 4 ++--
 web/style.sh | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/Makefile b/web/Makefile
index 5f84322..bdadca9 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -1,6 +1,6 @@
 .PHONY:		all upload
 
-all:		../index.html
+all:		../test.html
 
 #
 # remove once a better place for index.html has been found
@@ -12,3 +12,6 @@ upload:		../index.html
 
 ../index.html:	style.sh index.sh
 		. ./index.sh >$@ || { rm -f $@; exit 1; }
+
+../test.html:	style.sh index.sh
+		BASE=./ . ./index.sh >$@ || { rm -f $@; exit 1; }
diff --git a/web/index.sh b/web/index.sh
index 58594ce..05ab5e5 100755
--- a/web/index.sh
+++ b/web/index.sh
@@ -44,7 +44,7 @@ texts3 "1.5 h" "10 h" "53 h"
 
 scan_set ben-bottom-nobat "Battery and cover removed. Bottom up."
 images2
-under_consideration
+planned
 texts3 "4 h" "11.5 h" "53 h"
 
 scan_set ben-top "Complete device. From the top."
@@ -91,7 +91,7 @@ texts3 "4 h" "12 h" "58 h"
 
 scan_set ben-dispbase-back "Display shell, base structure. Back side."
 images2
-planned
+in_progress
 texts3 "1 h" "3.75 h" "50 h"
 
 # -----------------------------------------------------------------------------
diff --git a/web/style.sh b/web/style.sh
index 182e386..a4911b0 100644
--- a/web/style.sh
+++ b/web/style.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 
+if [ -z "$BASE" ]; then
 BASE=http://projects.qi-hardware.com/index.php/p/ben-scans/source/tree/master/
+fi
 
 # ----- section ---------------------------------------------------------------