1
0
mirror of git://projects.qi-hardware.com/ben-scans.git synced 2024-11-25 22:59:42 +02:00

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.
This commit is contained in:
Werner Almesberger 2010-08-04 22:23:57 -03:00
parent 0381184366
commit a339d67968
3 changed files with 8 additions and 3 deletions

View File

@ -1,6 +1,6 @@
.PHONY: all upload .PHONY: all upload
all: ../index.html all: ../test.html
# #
# remove once a better place for index.html has been found # 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.html: style.sh index.sh
. ./index.sh >$@ || { rm -f $@; exit 1; } . ./index.sh >$@ || { rm -f $@; exit 1; }
../test.html: style.sh index.sh
BASE=./ . ./index.sh >$@ || { rm -f $@; exit 1; }

View File

@ -44,7 +44,7 @@ texts3 "1.5 h" "10 h" "53 h"
scan_set ben-bottom-nobat "Battery and cover removed. Bottom up." scan_set ben-bottom-nobat "Battery and cover removed. Bottom up."
images2 images2
under_consideration planned
texts3 "4 h" "11.5 h" "53 h" texts3 "4 h" "11.5 h" "53 h"
scan_set ben-top "Complete device. From the top." 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." scan_set ben-dispbase-back "Display shell, base structure. Back side."
images2 images2
planned in_progress
texts3 "1 h" "3.75 h" "50 h" texts3 "1 h" "3.75 h" "50 h"
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

View File

@ -1,6 +1,8 @@
#!/bin/sh #!/bin/sh
if [ -z "$BASE" ]; then
BASE=http://projects.qi-hardware.com/index.php/p/ben-scans/source/tree/master/ BASE=http://projects.qi-hardware.com/index.php/p/ben-scans/source/tree/master/
fi
# ----- section --------------------------------------------------------------- # ----- section ---------------------------------------------------------------