From b94c445aab2ab85d48097364996d3bdd6d9db081 Mon Sep 17 00:00:00 2001
From: helmutm <helmutm@fd906abe-77d9-0310-91a1-e0d9ade77398>
Date: Thu, 12 Jan 2006 20:47:52 +0000
Subject: [PATCH] Liquid skin made basically usable together with the loops
 package

git-svn-id: svn://svn.cy55.de/Zope3/src/cybertools/trunk@1004 fd906abe-77d9-0310-91a1-e0d9ade77398
---
 browser/liquid/liquid4.css    | 18 +++++++++++--
 browser/liquid/view_macros.pt | 49 +++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/browser/liquid/liquid4.css b/browser/liquid/liquid4.css
index 7e2c0e0..b5d771e 100644
--- a/browser/liquid/liquid4.css
+++ b/browser/liquid/liquid4.css
@@ -9,9 +9,9 @@ body {
     min-width:640px;
     margin: 0;
     padding: 0;
-    font: 0.8em Tahoma, Helvetica, Arial, sans-serif;
+    font: 0.9em Tahoma, Arial, Helvetica, sans-serif;
     background-color: white;
-    color: #000066;
+    color: #000040;
 }
 
 #header,#menu,#content,#sub-section,#footer {
@@ -26,7 +26,21 @@ body {
 #sub-section {width:19.9%}
 #footer {clear:left}
 
+/* more general stuff */
+
+.box {
+    margin: 12px 15px 8px 10px;
+    border-left: none;
+}
+
+#footer {
+    border: none;
+}
+
+/* cyberconcepts specialties */
+
 .top {
   background-image: url('bg_cyberview.gif');
   height: 75px;
 }
+
diff --git a/browser/liquid/view_macros.pt b/browser/liquid/view_macros.pt
index 422f975..ae6ed9f 100644
--- a/browser/liquid/view_macros.pt
+++ b/browser/liquid/view_macros.pt
@@ -8,36 +8,45 @@
       cyberconcepts IT-Consulting
     </title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link href="liquid.css" rel="stylesheet" type="text/css"
-          tal:attributes="href context/++resource++liquid.css" />
-    <div metal:define-slot="headers" />
+    <style type="text/css" media="all"
+           tal:content="string:@import url(${context/++resource++zope3_tablelayout.css});">
+      @import url(zope3_tablelayout.css);
+    </style>
+    <metal:block metal:define-slot="headers" />
+    <metal:block define-slot="style_slot" />
+    <style type="text/css" media="all"
+           tal:content="string:@import url(${context/++resource++liquid.css});">
+      @import url(liquid.css);
+    </style>
+    <metal:block define-slot="ecmascript_slot" />
+    <link rel="icon" type="image/png"
+          tal:attributes="href context/++resource++favicon.png" />
   </head>
   
   <body>
     
     <div id="header">
       <div class="top">
-        <a href="#" name="top" tal:attributes="href string:${request/URL/1}/@@manage">
-          <img src="cyberconcepts.gif" height="75" border="0"
+        <a href="#" name="top"
+           tal:attributes="href string:${request/URL/1}"><img
+               src="cyberconcepts.gif" height="75" border="0"
                alt="cyberconcepts IT-Consulting"
-               tal:attributes="src context/++resource++cyberconcepts.gif" />
-        </a>
-        <span metal:use-macro="context/@@standard_macros/logged_user">
-          Logged in as user
-        </span>
+               tal:attributes="src context/++resource++cyberconcepts.gif" /></a>
       </div>
     </div>
-    
-    <div id="menu"><h1>menu</h1></div>
-    
-    <div id="content">
-      <span metal:define-slot="body">Here comes the body</span>
+    <div id="menu">
+      <metal:menu define-slot="navigators"><h1>menu</h1></metal:menu>
     </div>
-    
-    <div id="sub-section"><h1>sub-section</h1></div>
-    
-    <div id="footer"><h1>footer</h1>
-        <span metal:use-macro="context/@@standard_macros/footer" />
+    <div id="content">
+      <metal:content define-slot="body">Here comes the body</metal:content>
+    </div>
+    <div id="sub-section">
+      <metal:sub define-slot="context_information">
+      </metal:sub>
+    </div>
+    <div id="footer">
+      <metal:footer define-slot="footer">
+      </metal:footer>
     </div>
 
   </body>
