commit 252660190c4048a5ee6c9b525cf26f8e3039ddac Author: Kostas Papadimitriou Date: Wed Jul 20 16:40:09 2011 +0300 Added 404 and 500 error pages templates, Refs #837 also added an html sample page to get served on several occasions (e.g. inform users that service is currently unavailable) diff --git a/ui/static/404.html b/ui/static/404.html new file mode 120000 index 0000000..495d5c0 --- /dev/null +++ b/ui/static/404.html @@ -0,0 +1 @@ +../templates/404.html \ No newline at end of file diff --git a/ui/static/500.html b/ui/static/500.html new file mode 120000 index 0000000..4396d1c --- /dev/null +++ b/ui/static/500.html @@ -0,0 +1 @@ +../templates/500.html \ No newline at end of file diff --git a/ui/static/generic_info_tpl.html b/ui/static/generic_info_tpl.html new file mode 100644 index 0000000..d100db8 --- /dev/null +++ b/ui/static/generic_info_tpl.html @@ -0,0 +1,31 @@ + + + + ~okeanos + + + + +
+ +
+
+
+

Sample title

+
+

+ Sample message ...... with a link ... +

+
+
+
+
+
+ + diff --git a/ui/static/ie.css b/ui/static/ie.css index a6aeb63..4d42a42 100644 --- a/ui/static/ie.css +++ b/ui/static/ie.css @@ -572,3 +572,8 @@ a.manage-metadata { #machinesview-icon .ipv4-text { margin-right: 5px; } + +/*404 and 500 error pages*/ +.error_page .http_error { + line-height: 7em; +} diff --git a/ui/static/main.css b/ui/static/main.css index 3b8973c..a810461 100644 --- a/ui/static/main.css +++ b/ui/static/main.css @@ -4155,4 +4155,93 @@ div.state .shutdown, tbody.machines .shutdown { border: 1px solid #888; } +/*404 and 500 pages*/ +.error_page { + position: relative; + top: 40px; + padding-bottom: 140px !important; +} + +.error_page h1 { + font-weight: normal; +} + +.error_page .msg_header { + margin: 0px; + font-size: 10em; + position: absolute; + left: -5px; + top: 0px; + color: #4085A5; + font-family: arial, verdana; +} + +.error_page p.error_desc { + color: #fff; + font-size: 0.8em; +} + +.error_page { + padding-right: 50px !important; + padding-left: 100px !important; +} + +.error_page .error_content { + padding-left: 150px; + padding-top: 97px; +} + +.error_page .error_content .links, .info_content .links { + margin-top: 10px; + margin-left: 20px; +} + +.error_page .http_error .code { + letter-spacing: -10px; + font-size: 9em; +} + +.error_page .http_error .msg { + letter-spacing: -1px; + font-size: 2em; +} + +.error_page .http_error { + position: absolute; + right: 0px; + bottom: 0px; + color: #75B3D0; + line-height: 1em; +} + +.error_page .error_content a, .info_content .links a { + color: #4085A5; + font-weight: bold; + margin-right: 10px; + font-size: 0.9em; +} + +.error_body #container, .info_body #container { + background-position: right 200px; +} + +.info_page h1 { + color: #4085A5; + font-size: 2em; + font-weight: normal; +} + +.info_page p { + color: #ffffff; + margin: 1em 0; +} + +.info_body p a, .error_body p a{ + color: #4085A5; + text-decoration: underline; +} + +.error_404 .http_error .code { + letter-spacing: -7px; +} diff --git a/ui/templates/404.html b/ui/templates/404.html new file mode 100644 index 0000000..c7c4ea4 --- /dev/null +++ b/ui/templates/404.html @@ -0,0 +1,39 @@ + + + + ~okeanos + + + + +
+ +
+
+
+

Oops!

+
+

+ It looks like the page you requested has not been found.
+ Don't worry... this happens to the best of us.
+
+ One of these might help:
+

+ +
+
404
+
+
+
+
+ + diff --git a/ui/templates/500.html b/ui/templates/500.html new file mode 100644 index 0000000..2f00869 --- /dev/null +++ b/ui/templates/500.html @@ -0,0 +1,40 @@ + + + + ~okeanos + + + + +
+ +
+
+
+

Oops!

+
+

+ Something went terribly wrong :-(
+ The page you requested cannot be displayed.
+ We're sorry, that's embarrassing...
+
+ One of these might help:
+

+ +
+
internal error500
+
+
+
+
+ +