From: Amos Jeffries Date: Sat, 19 Sep 2009 09:15:45 +0000 (+1200) Subject: Make Directory Listing template generic X-Git-Tag: SQUID_3_2_0_1~705 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24baabce57fedf3e0de44cc5639b8f7f51b465b7;p=thirdparty%2Fsquid.git Make Directory Listing template generic --- diff --git a/errors/Makefile.am b/errors/Makefile.am index 51b52e5b78..81c314b61e 100644 --- a/errors/Makefile.am +++ b/errors/Makefile.am @@ -28,7 +28,7 @@ ERROR_TEMPLATES = \ templates/ERR_UNSUP_HTTPVERSION \ templates/ERR_READ_TIMEOUT \ templates/ERR_ICAP_FAILURE \ - templates/ERR_FTP_LISTING \ + templates/ERR_DIR_LISTING \ templates/ERR_FTP_FORBIDDEN \ templates/ERR_ACCESS_DENIED \ templates/ERR_FORWARDING_DENIED \ diff --git a/errors/errorpage.css b/errors/errorpage.css index d7ba8bf0cc..8cfa802c8c 100644 --- a/errors/errorpage.css +++ b/errors/errorpage.css @@ -66,11 +66,11 @@ pre { font-family:sans-serif; } -/* special event: FTP directory listing */ -#ftplisting tr.entry td.icon,td.filename,td.size,td.date { +/* special event: FTP / Gopher directory listing */ +#dirlisting tr.entry td.icon,td.filename,td.size,td.date { border-bottom: groove; } -#ftplisting td.size { +#dirlisting td.size { width: 50px; text-align: right; padding-right: 5px; diff --git a/errors/list b/errors/list index 87465ac508..01d0e8dac7 100644 --- a/errors/list +++ b/errors/list @@ -3,13 +3,13 @@ ERR_CACHE_ACCESS_DENIED ERR_CACHE_MGR_ACCESS_DENIED ERR_CANNOT_FORWARD ERR_CONNECT_FAIL +ERR_DIR_LISTING ERR_DNS_FAIL ERR_ESI ERR_FORWARDING_DENIED ERR_FTP_DISABLED ERR_FTP_FAILURE ERR_FTP_FORBIDDEN -ERR_FTP_LISTING ERR_FTP_NOT_FOUND ERR_FTP_PUT_CREATED ERR_FTP_PUT_ERROR diff --git a/errors/templates/ERR_FTP_LISTING b/errors/templates/ERR_DIR_LISTING similarity index 86% rename from errors/templates/ERR_FTP_LISTING rename to errors/templates/ERR_DIR_LISTING index 8d56843184..adb763d8d1 100644 --- a/errors/templates/ERR_FTP_LISTING +++ b/errors/templates/ERR_DIR_LISTING @@ -1,7 +1,7 @@ -FTP Directory: %U +Directory: %U
-

FTP Directory: %U/

+

Directory: %U/

@@ -22,7 +22,7 @@ body 
%z
- +
Parent Directory Parent Directory (Root Directory)