[z3-checkins] r6907 - z3/xicken/trunk/src/xicken
ngw at codespeak.net
ngw at codespeak.net
Mon Oct 11 16:17:05 MEST 2004
Author: ngw
Date: Mon Oct 11 16:17:05 2004
New Revision: 6907
Modified:
z3/xicken/trunk/src/xicken/xicken.css
z3/xicken/trunk/src/xicken/xicken_macros.pt
Log:
new layout and various cleanups
Modified: z3/xicken/trunk/src/xicken/xicken.css
==============================================================================
--- z3/xicken/trunk/src/xicken/xicken.css (original)
+++ z3/xicken/trunk/src/xicken/xicken.css Mon Oct 11 16:17:05 2004
@@ -1,21 +1,39 @@
-#toolbar {
- background: #CCCCCC;
+body {
+ margin: 0;
+ padding: 0;
+ background-color: #ffffff;
}
-#main {
- position: relative;
+#header {
+ margin: 0.5em 1em 0 1em;
+ padding: 0.5em 1em 0 1em;
+ border-bottom: 1px solid;
}
-#left_nav {
- float: left;
- width: 25%;
- height: 100%;
+#toolbox {
+ position: absolute;
+ width: 10em;
+ margin: 1em 0 0 1em;
+ border: 1px solid;
}
-#message {
- font-style: italic;
+#contentnav {
+ position: absolute;
+ width: 10em;
+ right: 0;
+ margin: 1em 1em 0 0;
+ border: 1px solid;
}
-.error {
- color: Red;
+#toolbox ul, #contentnav ul {
+ padding: 0 0 0.5em 0.5em;
+ list-style: none;
+ font-size: small;
}
+
+#content {
+ position: relative;
+ width: 50%;
+ left: 15em;
+}
+
Modified: z3/xicken/trunk/src/xicken/xicken_macros.pt
==============================================================================
--- z3/xicken/trunk/src/xicken/xicken_macros.pt (original)
+++ z3/xicken/trunk/src/xicken/xicken_macros.pt Mon Oct 11 16:17:05 2004
@@ -1,55 +1,54 @@
-<html metal:define-macro="xicken"
- i18n:domain="xicken">
-<link rel="stylesheet" href="/@@/xicken.css" />
-<body>
+<html metal:define-macro="xicken" i18n:domain="xicken">
+
+<head>
+ <title> Xicken.CMS </title>
+ <link rel="stylesheet" href="/@@/xicken.css" />
+</head>
-<div id="toolbar">
- <form action="#">
- <button title="Add a page"
- tal:attributes="onClick
- string:location.href='${view/site_url}/@@addPage.html';; return false"
- > + </button>
- <button title="Delete this page"
- tal:attributes="onClick
- string:location.href='${view/site_url}/@@removePage.html?page=${context/__name__}';; return false"
- > - </button>
- <button title="View this page"
- tal:condition="python: view.__name__ == 'edit.html'"
- tal:attributes="onClick
- string:location.href='${view/context_url}/@@index.html';; return false"
- > @ </button>
- <button title="Edit this page"
- tal:condition="python: view.__name__ != 'edit.html'"
- tal:attributes="onClick
- string:location.href='${view/context_url}/@@edit.html';; return false"
- > / </button>
- </form>
-</div>
-
-<div id="main">
-
- <div id="left_nav">
- <ul>
- <li tal:repeat="page view/listPages">
- <a href="/FRONT_PAGE"
- tal:attributes="href page/url"
- tal:content="page/title"
- >FRONT PAGE</a>
- </li>
- <li tal:condition="nothing"><a href="/ANOTHER_PAGE">ANOTHER PAGE</a></li>
- <li tal:condition="nothing"><a href="/A_THIRD_PAGE">A THIRD PAGE</a></li>
- <li tal:condition="nothing"><a href="/A_FOURTH_PAGE">A FOURTH PAGE</a></li>
- </ul>
- </div>
-
- <div id="content">
-
- <div metal:define-slot="content">
- CONTENT GOES HERE
- </div>
+<body>
- </div>
+ <div id="header">
+ <h1> Xicken CMS </h1>
+ </div>
+
+ <div id="toolbox">
+ <ul>
+ <li><a tal:condition="python: view.__name__ == 'edit.html'"
+ tal:attributes="href string:${view/context_url}/@@index.html">
+ View
+ </a></li>
+ <li><a tal:condition="python: view.__name__ != 'edit.html'"
+ tal:attributes="href string:${view/context_url}/@@edit.html">
+ Edit
+ </a></li>
+ <li><a tal:attributes="href string:${view/site_url}/@@addPage.html">
+ Add
+ </a></li>
+ <li><a tal:attributes="href string:${view/site_url}/@@removePage.html?page=${context/__name__}">
+ Remove
+ </a></li>
+ </div>
+
+ <div id="contentnav">
+ <ul>
+ <span tal:repeat="page view/listPages"
+ tal:omit-tag="">
+ <li tal:condition="python: page ['title'] != context.__name__">
+ <a href="/FRONT_PAGE"
+ tal:attributes="href page/url"
+ tal:content="page/title">
+ </a>
+ </li>
+ </span>
+ </ul>
+ </div>
+
+ <div id="content">
+
+ <div metal:define-slot="content">
+ </div>
+
+ </div>
-</div>
</body>
</html>
More information about the z3-checkins
mailing list