From 3a73092a73b8b48454ed666897be933cfc7b6fa0 Mon Sep 17 00:00:00 2001 From: lars Date: Sun, 4 Dec 2005 20:19:41 +0000 Subject: [PATCH] renamed cryptobox-data to cryptobox-misc (images and css) --- cbox-tree.d/etc/cryptobox/cryptobox.conf | 2 +- .../antlogo100px.png | Bin .../antlogo100px_green.png | Bin .../antlogo100px_red.png | Bin .../{cryptobox-data => cryptobox-misc}/backg.gif | Bin .../cryptobox.css | 0 .../{cryptobox-data => cryptobox-misc}/list.gif | Bin .../screenshots/de_config.png | Bin .../screenshots/de_init.png | Bin .../screenshots/de_mount.png | Bin .../screenshots/de_w98_login.png | Bin .../screenshots/de_w98_network_drive.png | Bin .../screenshots/de_w98_not_logged_in.png | Bin .../screenshots/en_config.png | Bin .../screenshots/en_mount.png | Bin .../screenshots/en_w98_login.png | Bin .../screenshots/en_w98_network_drive.png | Bin .../screenshots/en_w98_not_logged_in.png | Bin .../{cryptobox-data => cryptobox-misc}/smile.png | Bin .../{cryptobox-data => cryptobox-misc}/smile4.png | Bin .../somerights20.gif | Bin scripts/userdocexport.sh | 6 +++--- scripts/validate.sh | 13 ++++++------- 23 files changed, 10 insertions(+), 11 deletions(-) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/antlogo100px.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/antlogo100px_green.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/antlogo100px_red.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/backg.gif (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/cryptobox.css (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/list.gif (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_config.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_init.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_mount.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_w98_login.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_w98_network_drive.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/de_w98_not_logged_in.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/en_config.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/en_mount.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/en_w98_login.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/en_w98_network_drive.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/screenshots/en_w98_not_logged_in.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/smile.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/smile4.png (100%) rename cbox-tree.d/var/www/{cryptobox-data => cryptobox-misc}/somerights20.gif (100%) diff --git a/cbox-tree.d/etc/cryptobox/cryptobox.conf b/cbox-tree.d/etc/cryptobox/cryptobox.conf index 3b5777e..16d92b0 100644 --- a/cbox-tree.d/etc/cryptobox/cryptobox.conf +++ b/cbox-tree.d/etc/cryptobox/cryptobox.conf @@ -8,7 +8,7 @@ SCAN_DEVICES="hda hdb hdc hdd hde hdf hdg scd0 scd1 scd2 scd3 sg sda sdb sdc sdd # web interface HTML_TEMPLATE_DIR=/usr/share/cryptobox/templates -STYLESHEET_URL=/cryptobox-data/cryptobox.css +STYLESHEET_URL=/cryptobox-misc/cryptobox.css # directories LANGUAGE_DIR=/usr/share/cryptobox/lang diff --git a/cbox-tree.d/var/www/cryptobox-data/antlogo100px.png b/cbox-tree.d/var/www/cryptobox-misc/antlogo100px.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/antlogo100px.png rename to cbox-tree.d/var/www/cryptobox-misc/antlogo100px.png diff --git a/cbox-tree.d/var/www/cryptobox-data/antlogo100px_green.png b/cbox-tree.d/var/www/cryptobox-misc/antlogo100px_green.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/antlogo100px_green.png rename to cbox-tree.d/var/www/cryptobox-misc/antlogo100px_green.png diff --git a/cbox-tree.d/var/www/cryptobox-data/antlogo100px_red.png b/cbox-tree.d/var/www/cryptobox-misc/antlogo100px_red.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/antlogo100px_red.png rename to cbox-tree.d/var/www/cryptobox-misc/antlogo100px_red.png diff --git a/cbox-tree.d/var/www/cryptobox-data/backg.gif b/cbox-tree.d/var/www/cryptobox-misc/backg.gif similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/backg.gif rename to cbox-tree.d/var/www/cryptobox-misc/backg.gif diff --git a/cbox-tree.d/var/www/cryptobox-data/cryptobox.css b/cbox-tree.d/var/www/cryptobox-misc/cryptobox.css similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/cryptobox.css rename to cbox-tree.d/var/www/cryptobox-misc/cryptobox.css diff --git a/cbox-tree.d/var/www/cryptobox-data/list.gif b/cbox-tree.d/var/www/cryptobox-misc/list.gif similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/list.gif rename to cbox-tree.d/var/www/cryptobox-misc/list.gif diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_config.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_config.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_config.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_config.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_init.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_init.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_init.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_init.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_mount.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_mount.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_mount.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_mount.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_login.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_login.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_login.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_login.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_network_drive.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_network_drive.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_network_drive.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_network_drive.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_not_logged_in.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_not_logged_in.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/de_w98_not_logged_in.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/de_w98_not_logged_in.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/en_config.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/en_config.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/en_config.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/en_config.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/en_mount.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/en_mount.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/en_mount.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/en_mount.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_login.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_login.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_login.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_login.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_network_drive.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_network_drive.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_network_drive.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_network_drive.png diff --git a/cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_not_logged_in.png b/cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_not_logged_in.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/screenshots/en_w98_not_logged_in.png rename to cbox-tree.d/var/www/cryptobox-misc/screenshots/en_w98_not_logged_in.png diff --git a/cbox-tree.d/var/www/cryptobox-data/smile.png b/cbox-tree.d/var/www/cryptobox-misc/smile.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/smile.png rename to cbox-tree.d/var/www/cryptobox-misc/smile.png diff --git a/cbox-tree.d/var/www/cryptobox-data/smile4.png b/cbox-tree.d/var/www/cryptobox-misc/smile4.png similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/smile4.png rename to cbox-tree.d/var/www/cryptobox-misc/smile4.png diff --git a/cbox-tree.d/var/www/cryptobox-data/somerights20.gif b/cbox-tree.d/var/www/cryptobox-misc/somerights20.gif similarity index 100% rename from cbox-tree.d/var/www/cryptobox-data/somerights20.gif rename to cbox-tree.d/var/www/cryptobox-misc/somerights20.gif diff --git a/scripts/userdocexport.sh b/scripts/userdocexport.sh index 9593324..6bb660f 100755 --- a/scripts/userdocexport.sh +++ b/scripts/userdocexport.sh @@ -35,7 +35,7 @@ LANGUAGES="de en" DEST_DIR="$ROOT_DIR/cbox-tree.d/usr/share/doc/cryptobox/html" OFFLINE_DIR="$ROOT_DIR/live-cd-tree.d/_offline/doc" -IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-img" +IMAGE_DIR="$ROOT_DIR/cbox-tree.d/var/www/cryptobox-misc" TMP_DIR=/tmp/$(basename $0)-$$.d HEADER_FILE=doc_header.inc @@ -91,7 +91,7 @@ for LANG in $LANGUAGES; do #wget --quiet --ignore-tags=a --no-clobber --page-requisites --convert-links --no-directories --base="$WIKI_HOST$WIKI_URL" --directory-prefix="$TMP_DIR" --html-extension --force-html --input-file="$TMP_FILE" || { echo "Downloading requisites for ($PAGE_SRC) failed!"; exit 1; } echo " adjusting links for images ..." - sed -i "s#='[^']*/cryptobox-img/\([^']*\)'#='/cryptobox-img/\1'#g" "$TMP_FILE" + sed -i "s#='[^']*/cryptobox-misc/\([^']*\)'#='/cryptobox-misc/\1'#g" "$TMP_FILE" echo " adjusting wiki links ..." # redirect wiki links to cryptobox cgi @@ -112,7 +112,7 @@ for LANG in $LANGUAGES; do sed -i "s%=\"$CBOX_CGI\([^\"#]*\)%=\"\1.html%g" "$offline_file" # do it twice - this should not be necessary sed -i "s%=\"$CBOX_CGI\([^#\"]*\)%=\"\1.html%g" "$offline_file" - sed -i "s#='/cryptobox-img#='../../../var/www/cryptobox-img#g" "$offline_file" + sed -i "s#='/cryptobox-misc#='../../../var/www/cryptobox-misc#g" "$offline_file" # split language specific part of moin link and replace it by current language for TLANG in $LANGUAGES diff --git a/scripts/validate.sh b/scripts/validate.sh index 2cc643b..fee79a3 100755 --- a/scripts/validate.sh +++ b/scripts/validate.sh @@ -86,18 +86,17 @@ function import_style() # get the stylesheet file and images # change the stylesheet link { - [ -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_DEFAULT/cryptobox.css + [ -d "$VALIDATE_REPORT_DIR/cryptobox-misc" ] && rm -r "$VALIDATE_REPORT_DIR/cryptobox-misc" + mkdir -p "$VALIDATE_REPORT_DIR/cryptobox-misc" + wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-misc/cryptobox.css" http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-misc/cryptobox.css # extract image file names - 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_DEFAULT/cryptobox-img/$a" + grep "url(" "$VALIDATE_REPORT_DIR/cryptobox.css" | sed 's#^.*url(\(.*\)).*$#\1#' | while read a + do wget -q -O "$VALIDATE_REPORT_DIR/cryptobox-misc/$a" "http://$VALIDATE_HOST_IP_DEFAULT/cryptobox-misc/$a" done # change the stylesheet link in every html file in REPORT_DIR find "$VALIDATE_REPORT_DIR" -type f -name \*.html | while read a - do sed -i '/stylesheet/s#href=\"/cryptobox.css\"#href=\"../cryptobox.css\"#g' "$a" + do sed -i '/stylesheet/s#href=\"/cryptobox-misc/cryptobox.css\"#href=\"../cryptobox-misc/cryptobox.css\"#g' "$a" done }