Skip to content

Commit 9ca7ef8

Browse files
serghey-rodinserghey-rodin
committed
Merge pull request hestiacp#143 from square-orange/web-skel-cleanup
Web skel template cleanup. Thanks to Jason Hanes
2 parents 1d88007 + 3e3e95f commit 9ca7ef8

File tree

12 files changed

+63
-90
lines changed

12 files changed

+63
-90
lines changed

‎install/debian/templates/web/skel/document_errors/403.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
33
<title>403 &mdash; Forbidden</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="You do not have permission to view this"/>
5+
<meta name="description" content="403 - Forbidden"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
21-
2220
<h1>403</h1>
2321
<h2>Forbidden</h2>
2422
<div>
25-
Unfortunately, you do not have permission to view this
23+
You do not have permission to view this page.
2624
</div>
2725
</body>
28-
2926
</html>

‎install/debian/templates/web/skel/document_errors/404.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>404 &mdash; Not Found</title>
3+
<title>404 &mdash; Page Not Found</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, page not found"/>
5+
<meta name="description" content="404 - Page Not Found"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
2120
<h1>404</h1>
2221
<h2>Page Not Found</h2>
2322
<div>
24-
It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
25-
You can start again from the <a href="http://%domain%/">home</a> or go back to <a href="javascript:%20history.go(-1)">previous page</a>.
23+
The page you were trying to reach does not exist. Or, maybe it has moved.
24+
You can start again from <a href="http://%domain%/">home</a> or go back to the <a href="javascript:%20history.go(-1)">previous page</a>.
2625
</div>
2726
</body>
2827
</html>

‎install/debian/templates/web/skel/document_errors/50x.html‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>500 &mdash; Internal Sever Error</title>
3+
<title>500 &mdash; Internal Server Error</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
5+
<meta name="description" content="500 - Internal Server Error"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
21-
2220
<h1>500</h1>
2321
<h2>Internal Server Error</h2>
2422
<div>
25-
Sorry, something went wrong :(
23+
Something went wrong. Please try your request again.
2624
</div>
2725
</body>
28-
2926
</html>

‎install/debian/templates/web/suspend/index.html‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>SUSPEND</title>
3+
<title>Website Suspended</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
5+
<meta name="description" content="This website has been suspended."/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:84px; color:#99A7AF; margin: 70px 0 0 0;}
9-
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
9+
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: 15px 0 25px;}
1010
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
1111
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
@@ -15,13 +15,11 @@
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
20-
<h1>SUSPEND</h1>
21-
<h2>This site has been suspended</h2>
19+
<h1>SUSPENDED</h1>
20+
<h2>This website has been suspended.</h2>
2221
<div>
23-
Please contact technical support departament.
22+
Please contact the technical support department.
2423
</div>
2524
</body>
26-
2725
</html>

‎install/rhel/templates/web/skel/document_errors/403.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
33
<title>403 &mdash; Forbidden</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="You do not have permission to view this"/>
5+
<meta name="description" content="403 - Forbidden"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
21-
2220
<h1>403</h1>
2321
<h2>Forbidden</h2>
2422
<div>
25-
Unfortunately, you do not have permission to view this
23+
You do not have permission to view this page.
2624
</div>
2725
</body>
28-
2926
</html>

‎install/rhel/templates/web/skel/document_errors/404.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>404 &mdash; Not Found</title>
3+
<title>404 &mdash; Page Not Found</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, page not found"/>
5+
<meta name="description" content="404 - Page Not Found"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
2120
<h1>404</h1>
2221
<h2>Page Not Found</h2>
2322
<div>
24-
It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
25-
You can start again from the <a href="http://%domain%/">home</a> or go back to <a href="javascript:%20history.go(-1)">previous page</a>.
23+
The page you were trying to reach does not exist. Or, maybe it has moved.
24+
You can start again from <a href="http://%domain%/">home</a> or go back to the <a href="javascript:%20history.go(-1)">previous page</a>.
2625
</div>
2726
</body>
2827
</html>

‎install/rhel/templates/web/skel/document_errors/50x.html‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>500 &mdash; Internal Sever Error</title>
3+
<title>500 &mdash; Internal Server Error</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
5+
<meta name="description" content="500 - Internal Server Error"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
21-
2220
<h1>500</h1>
2321
<h2>Internal Server Error</h2>
2422
<div>
25-
Sorry, something went wrong :(
23+
Something went wrong. Please try your request again.
2624
</div>
2725
</body>
28-
2926
</html>

‎install/rhel/templates/web/suspend/index.html‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>SUSPEND</title>
3+
<title>Website Suspended</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
5+
<meta name="description" content="This website has been suspended."/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:84px; color:#99A7AF; margin: 70px 0 0 0;}
9-
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
9+
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: 15px 0 25px;}
1010
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
1111
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
@@ -15,13 +15,11 @@
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
20-
<h1>SUSPEND</h1>
21-
<h2>This site has been suspended</h2>
19+
<h1>SUSPENDED</h1>
20+
<h2>This website has been suspended.</h2>
2221
<div>
23-
Please contact technical support departament.
22+
Please contact the technical support department.
2423
</div>
2524
</body>
26-
2725
</html>

‎install/ubuntu/templates/web/skel/document_errors/403.html‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
33
<title>403 &mdash; Forbidden</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="You do not have permission to view this"/>
5+
<meta name="description" content="403 - Forbidden"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
21-
2220
<h1>403</h1>
2321
<h2>Forbidden</h2>
2422
<div>
25-
Unfortunately, you do not have permission to view this
23+
You do not have permission to view this page.
2624
</div>
2725
</body>
28-
2926
</html>

‎install/ubuntu/templates/web/skel/document_errors/404.html‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
22
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
3-
<title>404 &mdash; Not Found</title>
3+
<title>404 &mdash; Page Not Found</title>
44
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
5-
<meta name="description" content="Sorry, page not found"/>
5+
<meta name="description" content="404 - Page Not Found"/>
66
<style type="text/css">
77
body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
88
h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
99
h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
10-
p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11-
div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
10+
p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
11+
div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
1212
a:link {color: #34536A;}
1313
a:visited {color: #34536A;}
1414
a:active {color: #34536A;}
1515
a:hover {color: #34536A;}
1616
</style>
1717
</head>
18-
1918
<body>
2019
<p><a href="http://%domain%/">%domain%</a></p>
2120
<h1>404</h1>
2221
<h2>Page Not Found</h2>
2322
<div>
24-
It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
25-
You can start again from the <a href="http://%domain%/">home</a> or go back to <a href="javascript:%20history.go(-1)">previous page</a>.
23+
The page you were trying to reach does not exist. Or, maybe it has moved.
24+
You can start again from <a href="http://%domain%/">home</a> or go back to the <a href="javascript:%20history.go(-1)">previous page</a>.
2625
</div>
2726
</body>
2827
</html>

0 commit comments

Comments
 (0)