cherokee at cherokee-project
Sep 18, 2009, 12:26 PM
Post #1 of 1
(216 views)
Permalink
|
|
[3667] cherokee/branches/newerrors/admin: Error page design
|
|
Revision: 3667
http://svn.cherokee-project.com/changeset/3667
Author: ion
Date: 2009-09-18 21:26:30 +0200 (Fri, 18 Sep 2009)
Log Message:
-----------
Error page design
Modified Paths:
--------------
cherokee/branches/newerrors/admin/Page.py
cherokee/branches/newerrors/admin/PageError.py
cherokee/branches/newerrors/admin/error_couldnt_launch.template.html
cherokee/branches/newerrors/admin/error_icons_dir_missing.template.html
cherokee/branches/newerrors/admin/error_not_writable.template.html
cherokee/branches/newerrors/admin/static/css/cherokee.css
cherokee/branches/newerrors/admin/static/images/Makefile.am
Added Paths:
-----------
cherokee/branches/newerrors/admin/static/images/background-nobar.png
cherokee/branches/newerrors/admin/static/images/error.png
Modified: cherokee/branches/newerrors/admin/Page.py
===================================================================
--- cherokee/branches/newerrors/admin/Page.py 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/Page.py 2009-09-18 19:26:30 UTC (rev 3667)
@@ -7,6 +7,19 @@
# For gettext
N_ = lambda x: x
+PAGE_BASIC_LAYOUT_NOBAR = """
+ <div id="container-nobar">
+ <div id="header">
+ <div id="logo"><a href="/"><img src="/static/images/cherokee-logo-bar.png" alt="logo"/></a></div>
+ <div id="version">{{_lversion}} {{version}}</div>
+ {{help_block}}
+ </div>
+ <div id="workarea"><div id="workarea-inner">
+ {{content}}
+ </div></div>
+ </div>"""
+
+
PAGE_BASIC_LAYOUT = """
<div id="container">
<div id="header">
Modified: cherokee/branches/newerrors/admin/PageError.py
===================================================================
--- cherokee/branches/newerrors/admin/PageError.py 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/PageError.py 2009-09-18 19:26:30 UTC (rev 3667)
@@ -22,7 +22,7 @@
self.AddMacroContent ('menu', '')
self.AddMacroContent ('help', '')
- self.AddMacroContent ('body', PAGE_BASIC_LAYOUT)
+ self.AddMacroContent ('body', PAGE_BASIC_LAYOUT_NOBAR)
self.AddMacroContent ('title', 'ERROR: %s'%(self._error['title']))
self.AddMacroContent ('content', self.Read(template))
self.AddMacroContent ('icons_dir', CHEROKEE_ICONSDIR)
@@ -56,7 +56,7 @@
self.AddMacroContent ('menu', '')
self.AddMacroContent ('help', '')
- self.AddMacroContent ('body', PAGE_BASIC_LAYOUT)
+ self.AddMacroContent ('body', PAGE_BASIC_LAYOUT_NOBAR)
self.AddMacroContent ('title', 'ERROR: %s'%(ERRORS_TITLE[self.type]))
self.AddMacroContent ('content', self.Read(template))
self.AddMacroContent ('cherokee_conf', self._cfg.file)
Modified: cherokee/branches/newerrors/admin/error_couldnt_launch.template.html
===================================================================
--- cherokee/branches/newerrors/admin/error_couldnt_launch.template.html 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/error_couldnt_launch.template.html 2009-09-18 19:26:30 UTC (rev 3667)
@@ -1,8 +1,8 @@
-<h1>Could not launch the server</h1>
-
-<h2>{{title}}</h2>
- <p>The server suggests to check <a href="{{admin_url}}">this page</a>. Most probably the problem can he solved in there.</p>
- <p>{{description}}</p>
- <p><pre>{{backtrace}}</pre></p>
-
-<p><div align="right">{{time}}</div></p>
+<div class="error-page">
+<div class="error-title">Could not launch the server</div>
+<div class="error-reason">{{title}}</div>
+<div class="error-suggestion">The server suggests to check <a href="{{admin_url}}">this page</a>. Most probably the problem can he solved in there.</div>
+<div class="error-description">{{description}}</div>
+<div class="error-backtrace">{{backtrace}}</div>
+<div class="error-datetime">{{time}}</div>
+</div>
Modified: cherokee/branches/newerrors/admin/error_icons_dir_missing.template.html
===================================================================
--- cherokee/branches/newerrors/admin/error_icons_dir_missing.template.html 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/error_icons_dir_missing.template.html 2009-09-18 19:26:30 UTC (rev 3667)
@@ -1,4 +1,6 @@
-<h1>ERROR</h1>
+<div class="error-page">
+<div class="error-title">Error</div>
+<div class="error-reason"> Could not find the icons directory: {{icons_dir}}</div>
+<div class="error-suggestion">You may need to reinstall the web server.</div>
+</div>
-<p>Could not find the icons directory <b>{{icons_dir}}</b>.</p>
-<p>You may need to reinstall the web server.</p>
Modified: cherokee/branches/newerrors/admin/error_not_writable.template.html
===================================================================
--- cherokee/branches/newerrors/admin/error_not_writable.template.html 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/error_not_writable.template.html 2009-09-18 19:26:30 UTC (rev 3667)
@@ -1,10 +1,5 @@
-<h1>ERROR</h1>
-
-<div class="dialog-error">
- <p>The configuration file <b>{{cherokee_conf}}</b> cannot be modified.</p>
+<div class="error-page">
+<div class="error-title">Error</div>
+<div class="error-reason">The configuration file <code>{{cherokee_conf}}</code> cannot be modified.</div>
+<div class="error-suggestion">You have to change its permissions in order to allow cherokee-admin to work with it. You can try to fix it by changing the file permissions (<code>chmod u+w {{cherokee_conf}}</code>) or by launching cherokee-admin as root.</div>
</div>
-
-<p>You have to change its permissions in order to allow cherokee-admin to work with it.</p>
-
-<p>You can try to fix it by changing the file permissions (<em>chmod u+w
-{{cherokee_conf}}</em>) or by launching cherokee-admin as root.</p>
Modified: cherokee/branches/newerrors/admin/static/css/cherokee.css
===================================================================
--- cherokee/branches/newerrors/admin/static/css/cherokee.css 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/static/css/cherokee.css 2009-09-18 19:26:30 UTC (rev 3667)
@@ -12,7 +12,8 @@
height:100%;
}
-html>body #container {
+html>body #container,
+html>body #container-nobar {
overflow: auto;
min-height: 100%;
}
@@ -40,12 +41,20 @@
#container {
background: #cfd9e8 url(../images/background.png) center top repeat-y;
+}
+
+#container-nobar {
+ background: #cfd9e8 url(../images/background-nobar.png) center top repeat-y;
+}
+
+#container, #container-nobar {
width: 960px;
min-width: 960px;
margin: 0 auto;
text-align: center;
}
+
#header {
width: 960px;
background: transparent url(../images/top-bar.png) left top no-repeat;
@@ -81,6 +90,12 @@
height:100%;
}
+#container-nobar #workarea {
+ width: 90%;
+ margin: 0 auto;
+ float: none;
+}
+
#workarea-inner {
padding: 16px;
}
@@ -345,6 +360,61 @@
color: #000;
}
+/* ERROR PAGE */
+.error-page {
+ padding: 8px 16px 8px 64px;
+ margin: 16px 0;
+ min-height: 60px;
+ background: #fbf7da url(../images/offline.png) 8px 8px no-repeat;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid #edd400;
+}
+
+.error-title {
+ color: #c00;
+ font-weight: normal;
+ font-size: 150%;
+}
+
+.error-reason {
+ font-weight: bold;
+ margin-bottom: 1em;
+}
+
+.error-suggestion {
+ margin: 0.5em 0;
+}
+
+.error-description {
+ margin: 0.5em 0;
+}
+
+.error-backtrace {
+ padding: 1em;
+ background: #efeac7;
+ white-space: pre;
+ font-family: monospace;
+ margin: 1em 0;
+ max-height: 128px;
+ overflow: auto;
+}
+
+.error-page code {
+ background: #efeac7;
+ white-space: pre;
+ font-family: monospace;
+ padding: 2px;
+ font-size: 110%;
+}
+
+
+.error-datetime {
+ text-align: right;
+ color: #c3ba7b;
+}
+
/* TABS */
.ui-tabs-hide { display: none; }
Modified: cherokee/branches/newerrors/admin/static/images/Makefile.am
===================================================================
--- cherokee/branches/newerrors/admin/static/images/Makefile.am 2009-09-18 08:55:07 UTC (rev 3666)
+++ cherokee/branches/newerrors/admin/static/images/Makefile.am 2009-09-18 19:26:30 UTC (rev 3667)
@@ -4,7 +4,8 @@
DARKGLASS_ICONS = \
online.png \
-offline.png
+offline.png \
+error.png
SILK_ICONS = \
cross.png \
@@ -15,6 +16,7 @@
$(DARKGLASS_ICONS) \
$(SILK_ICONS) \
background.png \
+background-nobar.png \
cherokee-logo-bar.png \
top-bar.png \
menu-sep.png \
Added: cherokee/branches/newerrors/admin/static/images/background-nobar.png
===================================================================
(Binary files differ)
Property changes on: cherokee/branches/newerrors/admin/static/images/background-nobar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: cherokee/branches/newerrors/admin/static/images/error.png
===================================================================
(Binary files differ)
Property changes on: cherokee/branches/newerrors/admin/static/images/error.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
|
