minor bug in validate.sh

userdocexport adapted to new image directory
navigation link for user documentation fixed

cbox-tree.d/usr/share/cryptobox/templates/nav.cs

@@ -14,6 +14,6 @@
 
 <a href="<?cs call:getSelfURL('action=init_ask','action') ?>" title="Ersteinrichtung">Initialisierung</a>
 <a href="<?cs call:getSelfURL('action=show_log','action') ?>" title="Ereignis-Protokoll">Protokoll</a>
-<a href="<?cs call:getSelfURL('action=doc&page=CryptoBox','action') ?>" title="Nutzer-Handbuch">Hilfe</a>
+<a href="<?cs call:getSelfURL('action=doc','action') ?>" title="Nutzer-Handbuch">Hilfe</a>
 <a href="<?cs call:getSelfURL('action=shutdown_ask','action') ?>" title="Herunterfahren">Herunterfahren</a>
 

tools/userdocexport.sh

@@ -11,9 +11,6 @@ PAGES="CryptoBox CryptoBoxDev CryptoBoxKonzept CryptoBoxEn"
 WIKI_HOST="https://systemausfall.org"
 # the trailing slash is important
 WIKI_URL="/wikis/howto/"
-# header and footer
-HEADER_FILE="$ROOT_DIR/tools/doc_header.inc"
-FOOTER_FILE="$ROOT_DIR/tools/doc_footer.inc"
 
 CBOX_CGI="/cryptobox?action=doc\&page="
 

validation/validate.sh

@@ -107,13 +107,13 @@ import_style()
 # get the stylesheet file and images
 # change the stylesheet link
 {
-	[ -d "VALIDATE_REPORT_DIR/img" ] && rm -r "$VALIDATE_REPORT_DIR/img"
-	mkdir -p "$VALIDATE_REPORT_DIR/img"
+	[ -d "$VALIDATE_REPORT_DIR/cryptobox-img" ] && rm -r "$VALIDATE_REPORT_DIR/cryptobox-img"
+	mkdir -p "$VALIDATE_REPORT_DIR/cryptobox-img"
 	[ -e "$VALIDATE_REPORT_DIR/cryptobox.css" ] && rm "$VALIDATE_REPORT_DIR/cryptobox.css"
 	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox.css" http://$VALIDATE_HOST_IP:$VALIDATE_HTTP_PORT/cryptobox.css
 	# extract image file names
-	grep "url(img/" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(img/\(.*\)).*$#\1#' | while read a
-		do	wget -q -O "$VALIDATE_REPORT_DIR/img/$a" "http://$VALIDATE_HOST_IP:$VALIDATE_HTTP_PORT/img/$a"
+	grep "url(/cryptobox-img/" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(/cryptobox-img/\(.*\)).*$#\1#' | while read a
+		do	wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-img/$a" "http://$VALIDATE_HOST_IP:$VALIDATE_HTTP_PORT/cryptobox-img/$a"
 	  done
 	
 	# change the stylesheet link in every html file in REPORT_DIR