Эх сурвалжийг харах

Merge pull request #143 from square-orange/web-skel-cleanup

Web skel template cleanup. Thanks to Jason Hanes
Serghey Rodin 11 жил өмнө
parent
commit
9ca7ef8b5f

+ 4 - 7
install/debian/templates/web/skel/document_errors/403.html

@@ -2,28 +2,25 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
     <title>403 &mdash; Forbidden</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="You do not have permission to view this"/>
+    <meta name="description" content="403 - Forbidden"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>403</h1>
     <h2>Forbidden</h2>
     <div>
-        Unfortunately, you do not have permission to view this
+        You do not have permission to view this page.
     </div>
 </body>
-
 </html>

+ 6 - 7
install/debian/templates/web/skel/document_errors/404.html

@@ -1,28 +1,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>404 &mdash; Not Found</title>
+    <title>404 &mdash; Page Not Found</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, page not found"/>
+    <meta name="description" content="404 - Page Not Found"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
     <h1>404</h1>
     <h2>Page Not Found</h2>
     <div>
-        It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
-        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>.
+        The page you were trying to reach does not exist. Or, maybe it has moved.
+        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>.
     </div>
 </body>
 </html>

+ 5 - 8
install/debian/templates/web/skel/document_errors/50x.html

@@ -1,29 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>500 &mdash; Internal Sever Error</title>
+    <title>500 &mdash; Internal Server Error</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="500 - Internal Server Error"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>500</h1>
     <h2>Internal Server Error</h2>
     <div>
-        Sorry, something went wrong :(
+        Something went wrong. Please try your request again.
     </div>
 </body>
-
 </html>

+ 6 - 8
install/debian/templates/web/suspend/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>SUSPEND</title>
+    <title>Website Suspended</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="This website has been suspended."/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:84px; color:#99A7AF; margin: 70px 0 0 0;}
-        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
+        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: 15px 0 25px;}
         p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
         div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
@@ -15,13 +15,11 @@
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
-    <h1>SUSPEND</h1>
-    <h2>This site has been suspended</h2>
+    <h1>SUSPENDED</h1>
+    <h2>This website has been suspended.</h2>
     <div>
-        Please contact technical support departament.
+        Please contact the technical support department.
     </div>
 </body>
-
 </html>

+ 4 - 7
install/rhel/templates/web/skel/document_errors/403.html

@@ -2,28 +2,25 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
     <title>403 &mdash; Forbidden</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="You do not have permission to view this"/>
+    <meta name="description" content="403 - Forbidden"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>403</h1>
     <h2>Forbidden</h2>
     <div>
-        Unfortunately, you do not have permission to view this
+        You do not have permission to view this page.
     </div>
 </body>
-
 </html>

+ 6 - 7
install/rhel/templates/web/skel/document_errors/404.html

@@ -1,28 +1,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>404 &mdash; Not Found</title>
+    <title>404 &mdash; Page Not Found</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, page not found"/>
+    <meta name="description" content="404 - Page Not Found"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
     <h1>404</h1>
     <h2>Page Not Found</h2>
     <div>
-        It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
-        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>.
+        The page you were trying to reach does not exist. Or, maybe it has moved.
+        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>.
     </div>
 </body>
 </html>

+ 5 - 8
install/rhel/templates/web/skel/document_errors/50x.html

@@ -1,29 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>500 &mdash; Internal Sever Error</title>
+    <title>500 &mdash; Internal Server Error</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="500 - Internal Server Error"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>500</h1>
     <h2>Internal Server Error</h2>
     <div>
-        Sorry, something went wrong :(
+        Something went wrong. Please try your request again.
     </div>
 </body>
-
 </html>

+ 6 - 8
install/rhel/templates/web/suspend/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>SUSPEND</title>
+    <title>Website Suspended</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="This website has been suspended."/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:84px; color:#99A7AF; margin: 70px 0 0 0;}
-        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
+        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: 15px 0 25px;}
         p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
         div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
@@ -15,13 +15,11 @@
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
-    <h1>SUSPEND</h1>
-    <h2>This site has been suspended</h2>
+    <h1>SUSPENDED</h1>
+    <h2>This website has been suspended.</h2>
     <div>
-        Please contact technical support departament.
+        Please contact the technical support department.
     </div>
 </body>
-
 </html>

+ 4 - 7
install/ubuntu/templates/web/skel/document_errors/403.html

@@ -2,28 +2,25 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
     <title>403 &mdash; Forbidden</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="You do not have permission to view this"/>
+    <meta name="description" content="403 - Forbidden"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>403</h1>
     <h2>Forbidden</h2>
     <div>
-        Unfortunately, you do not have permission to view this
+        You do not have permission to view this page.
     </div>
 </body>
-
 </html>

+ 6 - 7
install/ubuntu/templates/web/skel/document_errors/404.html

@@ -1,28 +1,27 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>404 &mdash; Not Found</title>
+    <title>404 &mdash; Page Not Found</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, page not found"/>
+    <meta name="description" content="404 - Page Not Found"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
     <h1>404</h1>
     <h2>Page Not Found</h2>
     <div>
-        It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved.
-        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>.
+        The page you were trying to reach does not exist. Or, maybe it has moved.
+        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>.
     </div>
 </body>
 </html>

+ 5 - 8
install/ubuntu/templates/web/skel/document_errors/50x.html

@@ -1,29 +1,26 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>500 &mdash; Internal Sever Error</title>
+    <title>500 &mdash; Internal Server Error</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="500 - Internal Server Error"/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:180px; color:#99A7AF; margin: 70px 0 0 0;}
         h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
-        p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
-        div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
+        p {width:375px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
+        div {width:375px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
         a:visited {color: #34536A;}
         a:active {color: #34536A;}
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
     <p><a href="http://%domain%/">%domain%</a></p>
-
     <h1>500</h1>
     <h2>Internal Server Error</h2>
     <div>
-        Sorry, something went wrong :(
+        Something went wrong. Please try your request again.
     </div>
 </body>
-
 </html>

+ 6 - 8
install/ubuntu/templates/web/suspend/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head>
-    <title>SUSPEND</title>
+    <title>Website Suspended</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="description" content="Sorry, something went wrong. Internal Server Error"/>
+    <meta name="description" content="This website has been suspended."/>
     <style type="text/css">
         body {font-size:14px; color:#777777; font-family:arial; text-align:center;}
         h1 {font-size:84px; color:#99A7AF; margin: 70px 0 0 0;}
-        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: -3px 0 39px;}
+        h2 {color: #DE6C5D; font-family: arial; font-size: 20px; font-weight: bold; letter-spacing: -1px; margin: 15px 0 25px;}
         p {width:320px; text-align:center; margin-left:auto;margin-right:auto; margin-top: 30px }
         div {width:320px; text-align:center; margin-left:auto;margin-right:auto;}
         a:link {color: #34536A;}
@@ -15,13 +15,11 @@
         a:hover {color: #34536A;}
     </style>
 </head>
-
 <body>
-    <h1>SUSPEND</h1>
-    <h2>This site has been suspended</h2>
+    <h1>SUSPENDED</h1>
+    <h2>This website has been suspended.</h2>
     <div>
-        Please contact technical support departament.
+        Please contact the technical support department.
     </div>
 </body>
-
 </html>