cryptonas/cryptonas
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

404-page improved

Browse source 
name of the template included in html source code as comment
validation results: non-empty diff files will not be removed
test case for 404 fixed
This commit is contained in:
lars 2005-07-22 10:54:12 +00:00
parent c621a89f3f
commit 2e8acce842
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cryptobox.conf.d/usr/lib/cryptobox/validate.sh
View file

@ -62,12 +62,15 @@ create_summary()
local DIFF_FILE=${a%.desc}.diff
if [ -s "$DIFF_FILE" ]
then cat "$SUMMARY_TEMPLATE_DIR/result-error"
cat "$DIFF_FILE"
cat "$DIFF_FILE" | sed 's/\$/<br\/>/'
else cat "$SUMMARY_TEMPLATE_DIR/result-ok"
echo "no differences found"
fi
cat "$SUMMARY_TEMPLATE_DIR/single_footer"
rm "$DIFF_FILE" "$a"
# remove description file
rm "$a"
# remove if empty
[ -e "$DIFF_FILE" -a ! -s "$DIFF_FILE"] && rm "$DIFF_FILE"
done
cat "$SUMMARY_TEMPLATE_DIR/footer"
}

2
cryptobox.conf.d/usr/share/cryptobox/templates/main.cs
View file

@ -1,6 +1,8 @@
<?cs include:TemplateDir + '/macros.cs' ?>
<?cs include:TemplateDir + '/header.cs' ?>
<!-- this cryptobox template follows: <?cs var:Data.Action ?> -->
<?cs if:Data.Error ?>
<?cs include:TemplateDir + '/error.cs' ?>
<?cs else ?>

7
cryptobox.conf.d/usr/share/cryptobox/test-cases/1-init/005-file_not_found_404/output
View file

@ -1,7 +0,0 @@
Data.Config.IP=192.168.0.23
Data.Config.Language=de
Data.Config.TimeOut=30
Data.Status.Config=0
Data.Status.InitRunning=0
Data.Status.IP=192.168.0.23
Data.Status.Mounted=0

14
cryptobox.conf.d/var/www/errors/err404.html
View file

@ -9,8 +9,18 @@
</head>
<body>
<h1>Error 404 - page not found!</h1>
<p>Please go to the <a href="/cryptobox" title="CryptoBox">CryptoBox-Interface</a></p>
<div id="main">
<div id="head">
<h1>CryptoBox</h1>
</div>
<div id="content">
<div id="words">
<h1>Error 404 - page not found!</h2>
<p>Please go to the <a href="/cryptobox" title="CryptoBox">CryptoBox-Interface</a></p>
</div>
</div>
</div>
</body>
</html>