From: Amos Jeffries Date: Sat, 28 Feb 2009 11:14:03 +0000 (+1300) Subject: Merge language-specific CSS directly into templates. X-Git-Tag: SQUID_3_2_0_1~1147^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b28135aa077fb5c9c2d8ae40e41907e152e8e28;p=thirdparty%2Fsquid.git Merge language-specific CSS directly into templates. This makes translated files display non-LTR languages correctly in Squid without CSS support. --- diff --git a/errors/errorpage.css b/errors/errorpage.css index 328794f11e..d7ba8bf0cc 100644 --- a/errors/errorpage.css +++ b/errors/errorpage.css @@ -18,10 +18,6 @@ html body { color: #1e1e1e; } -/* Language Specific Basics */ -body -:lang(fa) { direction: rtl; font-size: 100%; font-family: Tahoma, Roya, sans-serif; float: right; } - /* Page displayed title area */ #titles { margin-left: 15px; diff --git a/errors/templates/ERR_ACCESS_DENIED b/errors/templates/ERR_ACCESS_DENIED index 5b446a8c35..f7cb85c0bf 100644 --- a/errors/templates/ERR_ACCESS_DENIED +++ b/errors/templates/ERR_ACCESS_DENIED @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_CACHE_ACCESS_DENIED b/errors/templates/ERR_CACHE_ACCESS_DENIED index 92f8e94eb3..8c0f5dcbb1 100644 --- a/errors/templates/ERR_CACHE_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_ACCESS_DENIED @@ -2,7 +2,13 @@ ERROR: Cache Access Denied - +
diff --git a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED index d22fdab377..895d5513c8 100644 --- a/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED +++ b/errors/templates/ERR_CACHE_MGR_ACCESS_DENIED @@ -2,7 +2,13 @@ ERROR: Cache Manager Access Denied - +

ERROR

diff --git a/errors/templates/ERR_CANNOT_FORWARD b/errors/templates/ERR_CANNOT_FORWARD index 0b5113e780..61fc48ca22 100644 --- a/errors/templates/ERR_CANNOT_FORWARD +++ b/errors/templates/ERR_CANNOT_FORWARD @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +
diff --git a/errors/templates/ERR_CONNECT_FAIL b/errors/templates/ERR_CONNECT_FAIL index 0c19884db6..baa4b85443 100644 --- a/errors/templates/ERR_CONNECT_FAIL +++ b/errors/templates/ERR_CONNECT_FAIL @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_DNS_FAIL b/errors/templates/ERR_DNS_FAIL index da2d334c0a..f9fa11b175 100644 --- a/errors/templates/ERR_DNS_FAIL +++ b/errors/templates/ERR_DNS_FAIL @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_ESI b/errors/templates/ERR_ESI index c2789e4cea..0053f40ed8 100644 --- a/errors/templates/ERR_ESI +++ b/errors/templates/ERR_ESI @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FORWARDING_DENIED b/errors/templates/ERR_FORWARDING_DENIED index 8c5169c6d6..d17265c429 100644 --- a/errors/templates/ERR_FORWARDING_DENIED +++ b/errors/templates/ERR_FORWARDING_DENIED @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FTP_DISABLED b/errors/templates/ERR_FTP_DISABLED index 5e590b9402..8d81a946eb 100644 --- a/errors/templates/ERR_FTP_DISABLED +++ b/errors/templates/ERR_FTP_DISABLED @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FTP_FAILURE b/errors/templates/ERR_FTP_FAILURE index 0461dfcbf9..2e1a7cd45b 100644 --- a/errors/templates/ERR_FTP_FAILURE +++ b/errors/templates/ERR_FTP_FAILURE @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FTP_FORBIDDEN b/errors/templates/ERR_FTP_FORBIDDEN index ef833b5bcd..0251a16036 100644 --- a/errors/templates/ERR_FTP_FORBIDDEN +++ b/errors/templates/ERR_FTP_FORBIDDEN @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FTP_LISTING b/errors/templates/ERR_FTP_LISTING index 727a6e9a17..e642625e35 100644 --- a/errors/templates/ERR_FTP_LISTING +++ b/errors/templates/ERR_FTP_LISTING @@ -2,7 +2,13 @@ FTP Directory: %U - +

FTP Directory: %U/

diff --git a/errors/templates/ERR_FTP_NOT_FOUND b/errors/templates/ERR_FTP_NOT_FOUND index 0d64df0b8b..e4d592bbc2 100644 --- a/errors/templates/ERR_FTP_NOT_FOUND +++ b/errors/templates/ERR_FTP_NOT_FOUND @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_FTP_PUT_CREATED b/errors/templates/ERR_FTP_PUT_CREATED index e10ada13bb..21bc6c5944 100644 --- a/errors/templates/ERR_FTP_PUT_CREATED +++ b/errors/templates/ERR_FTP_PUT_CREATED @@ -2,7 +2,13 @@ FTP PUT Successful: File Created - +

Operation successful

diff --git a/errors/templates/ERR_FTP_PUT_ERROR b/errors/templates/ERR_FTP_PUT_ERROR index 32a972d69f..d3f6110f31 100644 --- a/errors/templates/ERR_FTP_PUT_ERROR +++ b/errors/templates/ERR_FTP_PUT_ERROR @@ -2,7 +2,13 @@ ERROR: FTP upload failed - +

ERROR

diff --git a/errors/templates/ERR_FTP_PUT_MODIFIED b/errors/templates/ERR_FTP_PUT_MODIFIED index 6c4f708a52..88f8c9d21e 100644 --- a/errors/templates/ERR_FTP_PUT_MODIFIED +++ b/errors/templates/ERR_FTP_PUT_MODIFIED @@ -2,7 +2,13 @@ FTP PUT Successful: File Updated - +

Operation successful

diff --git a/errors/templates/ERR_FTP_UNAVAILABLE b/errors/templates/ERR_FTP_UNAVAILABLE index d697bc33aa..b4a8200208 100644 --- a/errors/templates/ERR_FTP_UNAVAILABLE +++ b/errors/templates/ERR_FTP_UNAVAILABLE @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_ICAP_FAILURE b/errors/templates/ERR_ICAP_FAILURE index 27eaed6238..dc16d87100 100644 --- a/errors/templates/ERR_ICAP_FAILURE +++ b/errors/templates/ERR_ICAP_FAILURE @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_INVALID_REQ b/errors/templates/ERR_INVALID_REQ index 18b644ce72..2c1bfb25b7 100644 --- a/errors/templates/ERR_INVALID_REQ +++ b/errors/templates/ERR_INVALID_REQ @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_INVALID_RESP b/errors/templates/ERR_INVALID_RESP index 88084a4f1b..5f4ec19fc0 100644 --- a/errors/templates/ERR_INVALID_RESP +++ b/errors/templates/ERR_INVALID_RESP @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_INVALID_URL b/errors/templates/ERR_INVALID_URL index c0a07ee481..d255ff4764 100644 --- a/errors/templates/ERR_INVALID_URL +++ b/errors/templates/ERR_INVALID_URL @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_LIFETIME_EXP b/errors/templates/ERR_LIFETIME_EXP index 126cfd41c4..ca8be5c5b9 100644 --- a/errors/templates/ERR_LIFETIME_EXP +++ b/errors/templates/ERR_LIFETIME_EXP @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_NO_RELAY b/errors/templates/ERR_NO_RELAY index 6a44957f12..4aafe57951 100644 --- a/errors/templates/ERR_NO_RELAY +++ b/errors/templates/ERR_NO_RELAY @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_ONLY_IF_CACHED_MISS b/errors/templates/ERR_ONLY_IF_CACHED_MISS index 248da077f7..452d652ee5 100644 --- a/errors/templates/ERR_ONLY_IF_CACHED_MISS +++ b/errors/templates/ERR_ONLY_IF_CACHED_MISS @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_READ_ERROR b/errors/templates/ERR_READ_ERROR index 273bacfa4b..d637373616 100644 --- a/errors/templates/ERR_READ_ERROR +++ b/errors/templates/ERR_READ_ERROR @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_READ_TIMEOUT b/errors/templates/ERR_READ_TIMEOUT index 85e77e6c28..c6c2ba3250 100644 --- a/errors/templates/ERR_READ_TIMEOUT +++ b/errors/templates/ERR_READ_TIMEOUT @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_SECURE_CONNECT_FAIL b/errors/templates/ERR_SECURE_CONNECT_FAIL index 6fa00397f3..15ed66e054 100644 --- a/errors/templates/ERR_SECURE_CONNECT_FAIL +++ b/errors/templates/ERR_SECURE_CONNECT_FAIL @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_SHUTTING_DOWN b/errors/templates/ERR_SHUTTING_DOWN index 96281b32a4..882ea7420c 100644 --- a/errors/templates/ERR_SHUTTING_DOWN +++ b/errors/templates/ERR_SHUTTING_DOWN @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_SOCKET_FAILURE b/errors/templates/ERR_SOCKET_FAILURE index 4a459bd606..de6d7c4205 100644 --- a/errors/templates/ERR_SOCKET_FAILURE +++ b/errors/templates/ERR_SOCKET_FAILURE @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_TOO_BIG b/errors/templates/ERR_TOO_BIG index 8241c5af37..42bb626104 100644 --- a/errors/templates/ERR_TOO_BIG +++ b/errors/templates/ERR_TOO_BIG @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_UNSUP_HTTPVERSION b/errors/templates/ERR_UNSUP_HTTPVERSION index 6e45d232e1..66bc2f5840 100644 --- a/errors/templates/ERR_UNSUP_HTTPVERSION +++ b/errors/templates/ERR_UNSUP_HTTPVERSION @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_UNSUP_REQ b/errors/templates/ERR_UNSUP_REQ index fa6ca73de8..10d72f61a0 100644 --- a/errors/templates/ERR_UNSUP_REQ +++ b/errors/templates/ERR_UNSUP_REQ @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_URN_RESOLVE b/errors/templates/ERR_URN_RESOLVE index 6172122fd4..a10359ffa5 100644 --- a/errors/templates/ERR_URN_RESOLVE +++ b/errors/templates/ERR_URN_RESOLVE @@ -2,7 +2,13 @@ ERROR: The requested URN not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_WRITE_ERROR b/errors/templates/ERR_WRITE_ERROR index 41d5f99e60..e05254884a 100644 --- a/errors/templates/ERR_WRITE_ERROR +++ b/errors/templates/ERR_WRITE_ERROR @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/ERR_ZERO_SIZE_OBJECT b/errors/templates/ERR_ZERO_SIZE_OBJECT index 1dac029835..6050489b53 100644 --- a/errors/templates/ERR_ZERO_SIZE_OBJECT +++ b/errors/templates/ERR_ZERO_SIZE_OBJECT @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR

diff --git a/errors/templates/generic b/errors/templates/generic index 4ee05eca71..fe9e218579 100644 --- a/errors/templates/generic +++ b/errors/templates/generic @@ -2,7 +2,13 @@ ERROR: The requested URL could not be retrieved - +

ERROR