[Checkins] SVN: grokui.base/trunk/src/grokui/base/ Worked on the global look and templates.
Souheil CHELFOUH
souheil at chelfouh.com
Fri Sep 18 12:08:09 EDT 2009
Log message for revision 104353:
Worked on the global look and templates.
CSS has been updates.
Changed:
U grokui.base/trunk/src/grokui/base/layout.py
U grokui.base/trunk/src/grokui/base/static/grok.css
D grokui.base/trunk/src/grokui/base/templates/administrationbanner.pt
U grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
U grokui.base/trunk/src/grokui/base/templates/authors.pt
A grokui.base/trunk/src/grokui/base/templates/banner.pt
U grokui.base/trunk/src/grokui/base/templates/logininformation.pt
U grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt
U grokui.base/trunk/src/grokui/base/templates/messages.pt
-=-
Modified: grokui.base/trunk/src/grokui/base/layout.py
===================================================================
--- grokui.base/trunk/src/grokui/base/layout.py 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/layout.py 2009-09-18 16:08:09 UTC (rev 104353)
@@ -11,6 +11,7 @@
"""
grok.context(IRootFolder)
template = grok.PageTemplateFile('templates/adminlayout.pt')
+ title = u"Grok Administration Interface"
class AdminView(Page):
Modified: grokui.base/trunk/src/grokui/base/static/grok.css
===================================================================
--- grokui.base/trunk/src/grokui/base/static/grok.css 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/static/grok.css 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,56 +1,52 @@
-/* @override http://www.urbantalk.se/DEVELOPER/grok_2/grok.css */
-
/* ---- general styling elements ---- */
+
body {
-background:#fff;
-color:#555;
-font-family:verdana;
-font-size:0.8em;
-margin:0;
+ margin:0;
+ color:#555;
+ background-color: white;
+ font-size: 85%;
+ font-family: "Trebuchet MS",Verdana,Helvetica,Arial,sans-serif;
+ background: white url("banner.jpg") repeat-x 0 0;
}
h1 {
-border-bottom:1px solid #C90;
-color:#C90;
-font-family:verdana;
-font-size:1.5em;
-text-align:left;
-width:100%;
+ border-bottom:1px solid #C90;
+ color:#C90;
+ font-size:1.5em;
+ text-align:left;
+ width:100%;
}
h2 {
-border-bottom:1px dotted #ccc;
-color:#C90;
-font-family:verdana;
-font-size:1.3em;
-width:100%;
+ border-bottom:1px dotted #ccc;
+ color:#C90;
+ font-size:1.3em;
+ width:100%;
}
h3 {
-color:#555;
-font-family:verdana;
-font-size:1.2em;
-width:100%;
+ color:#555;
+ font-size:1.2em;
+ width:100%;
}
p {
-color:#555;
-font-family:verdana;
-font-size:1em;
+ color:#555;
+ font-size:1em;
}
a:link,a:visited {
-border-bottom-style:dotted;
-border-bottom-width:1px;
-color:#555;
-text-decoration:none;
+ border-bottom-style:dotted;
+ border-bottom-width:1px;
+ color:#555;
+ text-decoration:none;
}
a:hover {
-background-color:#fff;
-border-bottom-style:dotted;
-border-width:0.1em;
-color:#C90;
+ background-color:#fff;
+ border-bottom-style:dotted;
+ border-width:0.1em;
+ color:#C90;
}
img {
@@ -58,69 +54,80 @@
}
pre {
-background:#eee;
-border-bottom:1px solid #ddd;
-border-top:1px solid #ccc;
-color:#A90101;
-font-family:courier;
-font-size:1.1em;
-margin:0.8em auto;
-padding:1.6em 0.8em;
+ background:#eee;
+ border-bottom:1px solid #ddd;
+ border-top:1px solid #ccc;
+ color:#A90101;
+ font-size:1.1em;
+ margin:0.8em auto;
+ padding:1.6em 0.8em;
}
ul {
-color:#555;
-font-family:verdana;
-font-size:1.1em;
-list-style-type:none;
-margin:1.6em auto;
+ color:#555;
+ font-size:1.1em;
+ list-style-type:none;
+ margin:1.6em auto;
}
li {
-left:0;
-margin:0 5em 0 0;
-padding:0;
+ left:0;
+ margin:0 5em 0 0;
+ padding:0;
}
-div#banner {
-background:#cc9900 url("GROK_Ornament3.jpg") repeat-x;
-height:40px;
+
+div#grokui-banner #logo span {
+ display: none;
}
-div#banner-shadow {
-margin-left:1.3em;
+div#grokui-banner #logo {
+ display: block;
+ width: 164px;
+ height: 81px;
+ border: 0;
+ text-decoration: none;
+ background: transparent url("logo.gif") no-repeat 20px 0;
}
-div#banner a,div#banner a:hover,div#banner a:visited, div#banner a:link {
-border:none;
+div#logout {
+ padding-right: 3em;
+ background-color: #ddd;
+ text-align: right;
+ height: 36px;
+ line-height: 36px;
+ background:#cc9900 url("shadow.jpg") repeat-x;
}
-div#logo {
-border:none;
+div#grokui-content {
+ margin: 1em 5em;
}
-div#fireplace {
-position: absolute;
-right: 0px;
-top: 5px;
-width: 160px;
-height: 75px;
+#grokui-menu-entries {
+ text-align: center;
}
-div#breadcrumbs {
+#grokui-menu-entries li {
+ display: inline;
}
-div#content {
-margin-left:5%;
-margin-right:5%;
-text-align:left;
+#grokui-footer {
+ text-align: center;
}
-#footer-copyright {
-font-size:0.9em;
-text-align:center;
+#grokui-messages {
+ margin: 1em 5em;
}
+#grokui-messages li {
+ padding: 0.1em 0.2em;
+}
+
+#grokui-messages li.admin {
+ border: 1px solid #990000;
+ background-color: #fdefca;
+}
+
/* ---- form and form-like elements ----- */
form {
clear:both;
@@ -146,58 +153,46 @@
border:1px solid #c90;
text-align:left;
background-color:#f9f9D4;
+ border-radius : 10px;
+ -moz-border-radius : 10px;
+ -webkit-border-radius : 10px;
+
}
legend {
-position:absolute;
-top:-0.8em;
-left:0.5em;
-color:#C90;
-font-family:verdana;
-font-size:1.2em;
-font-weight:700;
-background-color:#fff;
+ color:#c90;
+ font-size:1.2em;
+ font-weight:700;
+ background-color: transparent;
}
a.button {
-border-bottom:groove #C90 2px;
-color:#000;
-padding:0 0.2em 0.2em;
+ color:#000;
+ padding:0 0.2em 0.2em;
}
a:hover.button {
-background-color:#ccc;
-border:groove #C90 2px;
-border-bottom:groove #C90 2px;
-color:#000;
-padding:0 0.2em 0.2em;
+ background-color: #ccc;
+ color: #000;
+ padding: 0 0.2em 0.2em;
}
-.checkbox {
-border:groove #C90 2px;
-}
/* ----- menu elements ----- */
+
#menu {
-color:#A90101;
-font-family:verdana;
-font-size:1.1em;
+ color: #A90101;
+ font-size: 1.1em;
}
-div#menu-links {
-margin-left:5%;
-margin-right:5%;
-text-align:center;
-}
-
.menu-box1 {
-padding:0.5em;
+ padding: 0.5em;
}
.menu-box2 {
-background-color:#fff4be;
-border:1px solid #fc9;
-padding:0.5em;
+ background-color: #fff4be;
+ border: 1px solid #fc9;
+ padding: 0.5em;
}
.menu-box3 {
@@ -205,11 +200,11 @@
}
.menu-description1 {
-margin-left:1.5em;
+ margin-left: 1.5em;
}
.menu-label1 {
-width: 40em;
+ width: 40em;
}
.menu-head1 h3 {
@@ -219,34 +214,36 @@
/* --- system proces related --- */
div#server-processes {
-background-color:#f9f9D4;
-border:1px solid #cc9900;
-padding:0.75em;
+ background-color: #f9f9D4;
+ border:1px solid #cc9900;
+ padding: 0.75em;
}
div#server-processes dl {
-margin-top:-0.5em;
-padding-top:0;
+ margin: 0.6em;
+ padding-top: 0;
}
div#server-processes dt.emph {
-background:url(banner-shadow.jpg) top left repeat-x;
-border:1px solid grey;
-margin-left:0;
-margin-top:0.5em;
-padding-left:0.75em;
+ background:url(banner-shadow.jpg) top left repeat-x;
+ border:1px solid grey;
+ margin-left:0;
+ margin-top:0.5em;
+ padding-left:0.75em;
+ background-color: #fff4be;
}
div#server-processes dd {
-border:1px solid grey;
-border-top:none;
-margin-left:0;
-padding-left:0.75em;
+ border:1px solid grey;
+ border-top:none;
+ margin: 0 0 1em 0;
+ padding-left:0.75em;
+ background-color: white;
}
div#server-processes ul {
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
/* ----- misc elements ----- */
@@ -267,16 +264,8 @@
color:#C90;
clear:both;
display:block;
-font-family:verdana;
font-size:1.2em;
font-weight:700;
padding-top:1em;
padding-left:0.8em;
}
-
-#logout {
-padding:1px;
-padding-right:150px;
-background-color:#ddd;
-text-align:right;
-}
\ No newline at end of file
Deleted: grokui.base/trunk/src/grokui/base/templates/administrationbanner.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/administrationbanner.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/administrationbanner.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,6 +0,0 @@
-<div id="banner">
- <a href="/" id="logo">
- <img alt="Grok" src="images/grok-admin.jpg" height="40"
- tal:attributes="src view/static/grok-admin.jpg" />
- </a>
-</div>
Modified: grokui.base/trunk/src/grokui/base/templates/adminlayout.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/adminlayout.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/adminlayout.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,14 +1,17 @@
<html xmlns="http://www.w3.org/1999/xhtml" i18n:domain="zope">
<head>
- <title>grok administration interface</title>
- <link rel="stylesheet" type="text/css" href="static/grok.css"
- tal:on-error="nothing"
- tal:attributes="href view/static/grok.css" />
+ <title tal:content="layout/title" />
+ <link rel="stylesheet" type="text/css"
+ tal:attributes="href static/grok.css" />
</head>
<body>
- <tal:header replace="structure provider:grokui_admin_header" />
- <div id="content"
+ <div id="grokui-header"
+ tal:content="structure provider:grokui_admin_header" />
+
+ <div id="grokui-content"
tal:content="structure view/content" />
- <tal:header replace="structure provider:grokui_admin_footer" />
+
+ <div id="grokui-footer"
+ tal:content="structure provider:grokui_admin_footer" />
</body>
</html>
Modified: grokui.base/trunk/src/grokui/base/templates/authors.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/authors.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/authors.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,3 +1,5 @@
- <div>
- <p id="footer-copyright">© Copyright 2007, The Zope Foundation<br />Design inspired by Sebastian Ware</p>
- </div>
\ No newline at end of file
+<div>
+ <p id="footer-copyright">
+ © Copyright 2009, The Zope Foundation
+ </p>
+</div>
Added: grokui.base/trunk/src/grokui/base/templates/banner.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/banner.pt (rev 0)
+++ grokui.base/trunk/src/grokui/base/templates/banner.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -0,0 +1,3 @@
+<div id="grokui-banner">
+ <a href="/" id="logo"><span>Grok Logo</span></a>
+</div>
Modified: grokui.base/trunk/src/grokui/base/templates/logininformation.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/logininformation.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/logininformation.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,4 +1,4 @@
-<div id="logout" metal:define-macro="logged_user">
+<div id="logout">
<span tal:condition="viewlet/is_authenticated">
<span i18n:translate="">User:
<span tal:replace="request/principal/title"
Modified: grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/menuviewlet.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,12 +1,8 @@
-<dl class="display-menu incontext-action" tal:condition="viewlet/actions">
- <dd>
- <ul>
- <li tal:repeat="action viewlet/actions">
- <a href="" tal:content="action/title"
- tal:attributes="href string:${viewlet/contexturl}/${action/action};
- title action/title;"
- />
- </li>
- </ul>
- </dd>
-</dl>
+<ul id="grokui-menu-entries" tal:condition="viewlet/actions">
+ <li tal:repeat="action viewlet/actions">
+ <a href="" tal:content="action/title"
+ tal:attributes="href string:${viewlet/contexturl}/${action/action};
+ title action/title;"
+ />
+ </li>
+</ul>
Modified: grokui.base/trunk/src/grokui/base/templates/messages.pt
===================================================================
--- grokui.base/trunk/src/grokui/base/templates/messages.pt 2009-09-18 15:59:40 UTC (rev 104352)
+++ grokui.base/trunk/src/grokui/base/templates/messages.pt 2009-09-18 16:08:09 UTC (rev 104353)
@@ -1,7 +1,5 @@
-<ul>
- <li
- tal:repeat="message viewlet/messages"
- tal:attributes="class message/type"
- tal:content="message/message">Sauron will arrive soon!
- </li>
+<ul id="grokui-messages">
+ <li tal:repeat="message viewlet/messages"
+ tal:attributes="class message/type"
+ tal:content="message/message" />
</ul>
More information about the checkins
mailing list