[CMF-checkins] CVS: Products/CMFDecor/skins/zpt_generic - content_byline.pt:1.3 index_html.pt:1.2 main_template.pt:1.6 search.pt:1.4 search_form.pt:1.2 zpt_stylesheet.css:1.7

Andrew Sawyers andrew@digicool.com
Wed, 8 Aug 2001 17:33:34 -0400


Update of /cvs-repository/Products/CMFDecor/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv6062/skins/zpt_generic

Modified Files:
	content_byline.pt index_html.pt main_template.pt search.pt 
	search_form.pt zpt_stylesheet.css 
Log Message:

*cleanup and optimizations -- More to come.


=== Products/CMFDecor/skins/zpt_generic/content_byline.pt 1.2 => 1.3 ===
-      xmlns:metal="http://xml.zope.org/namespaces/metal">
-<body>
-
- <div class="Desktop" tal:define="creator here/Creator; home_url python: here.portal_membership.getHomeUrl(creator)"
-       tal:condition="home_url">
+<div class="Desktop" metal:define-macro="byline"
+     tal:define="creator here/Creator; home_url python: here.portal_membership.getHomeUrl(creator)"
+     tal:condition="home_url">
    			Created by <span class="Desktop"><a href="here.html" title="Here"
-			       tal:define="title creator"
-			       tal:attributes="href home_url; title title"
-				   tal:content="title">Me</a>.</span>
+			       tal:attributes="href home_url; title creator"
+				   tal:content="creator">Me</a>.</span>
 			<span tal:condition="python: not(home_url)"
 			      tal:replace="creator">Me</span>
 				  <br>
  <span tal:condition="here/ModificationDate">
      Last modified on <span tal:content="here/ModificationDate">Today</span>
  </span>
- </div>
-</body>
-</html>
\ No newline at end of file
+ </div>
\ No newline at end of file


=== Products/CMFDecor/skins/zpt_generic/index_html.pt 1.1 => 1.2 ===
-<body>
- <div metal:fill-slot="main">
-
- <table cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="80%">
-
- <h1> Welcome to <span tal:replace="container/title">(portal title)</span> </h1>
-
- <dl>
- <dt> Overview </dt>
- <dd tal:content="container/description"> Description here </dd>
- </dl>
-
- </td>
- <td valign="top" width="20%" tal:content="structure container/news_box">
-  News here
- </td>
- </tr>
- </table>
-
- </div>
-</body>
-</html>
+<html metal:use-macro="here/main_template/macros/master">
+<body>
+ <div metal:fill-slot="main">
+
+ <table cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top" width="80%">
+
+ <h1> Welcome to <span tal:replace="here/title">(portal title)</span> </h1>
+
+ <dl>
+ <dt> Overview </dt>
+ <dd tal:content="here/description"> Description here </dd>
+ </dl>
+
+ </td>
+ <td valign="top" width="20%" tal:content="structure here/news_box">
+  News here
+ </td>
+ </tr>
+ </table>
+
+ </div>
+</body>
+</html>


=== Products/CMFDecor/skins/zpt_generic/main_template.pt 1.5 => 1.6 ===
  <head>
-  <title tal:define="ob_title here/Title; portal_title container/title" tal:content="string:${portal_title}: ${ob_title}">The title</title>
+  <title tal:define="ob_title here/Title; portal_title here/title" tal:content="string:${portal_title}: ${ob_title}">The title</title>
   
 <link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
       tal:attributes="href here/zpt_stylesheet/absolute_url">
@@ -15,15 +15,15 @@
  <tr class="Masthead">
 
             <form action="search" method="GET"
-       tal:define="portal_url container/portal_url"
+       tal:define="portal_url here/portal_url"
        tal:attributes="action string:${portal_url}/search">
 	          <td class="PortalLogo" align="left" valign="middle" width="7%" height="32"> 
-                <a href="." tal:attributes="href container/portal_url"><img src="../zpt_images/Zope_logo.gif" alt="Zope Logo" border="0" width="87" height="38"
+                <a href="." tal:attributes="href here/portal_url"><img src="../zpt_images/Zope_logo.gif" alt="Zope Logo" border="0" width="87" height="38"
 																																	 tal:attributes="src string:Zope_logo.gif"></a> 
               </td>
 
               <td class="PortalTitle" width="43%" align="left" valign="middle" height="32"> 
-                <span tal:define="portal_title container/title" tal:content="string:${portal_title}">Site 
+                <span tal:define="portal_title here/title" tal:content="string:${portal_title}">Site 
                 Title</span> </td>
 
               <td class="NavBar" align="right" valign="middle" width="50%" wrap="no" height="32" NOWRAP> 
@@ -61,7 +61,7 @@
 </td></tr>
    <tr valign="top">
    <td class="ActionBox" width="15%" align="left" valign="top" tal:condition="python: not isAnon">
-   <span metal:use-macro="container/actions_box/macros/actions">
+   <span metal:use-macro="here/actions_box/macros/actions">
    <!--everything below here is replaced, just here for view of actions_box -->
    <table class="ActionBox" width="100%">
  <tr class="AuthClass">


=== Products/CMFDecor/skins/zpt_generic/search.pt 1.3 => 1.4 ===
     <p>Found <span tal:define="pss modules/Products.PythonScripts.standard"
                tal:replace="python:pss.thousands_commas(len(results))">100</span> items 
-		 <span tal:condition="request/SearchableText"
+		 <span tal:condition="exists request/SearchableText|nothing"
 		       tal:replace="string:matching ${request/SearchableText}"></span>.
     </p>
 <table class="SearchResults">


=== Products/CMFDecor/skins/zpt_generic/search_form.pt 1.1 => 1.2 ===
 <div class="Desktop">
 
-<h1> Search portal </h1>
+<h1>Search <span tal:replace="here/Title" /></h1>
 
 <form action="search">
 
@@ -90,7 +90,7 @@
            tal:define="today python: here.ZopeTime().earliestTime()">
     <option value=""
 	        tal:condition="python:not(here.portal_membership.isAnonymousUser())"
-			tal:define="member python:here.portal_membership.getAuthenticatedMember(); lastLogin member/last_login_time"
+			tal:define="member python:here.portal_membership.getAuthenticatedMember(); lastLogin exists: member/last_login_time"
 			tal:attributes="value lastLogin">Last login</option>
     <option value=""
 	        tal:define="yesterday python:(today-1).Date()"


=== Products/CMFDecor/skins/zpt_generic/zpt_stylesheet.css 1.6 => 1.7 ===
 
 div.Desktop p {
-    font-size: 80%;
+    font-size: 100%;
     margin-right: 10px;
     font-family: Verdana, Helvetica, sans-serif;
     text-indent: 4px;    
@@ -265,6 +265,18 @@
     font-family: Verdana, Helvetica, sans-serif;
 }
 
+div.Desktop h2 {
+    font-size: 115%;
+    margin-right:100pt;
+    font-family: Verdana, Helvetica, sans-serif;
+}
+
+div.Desktop h3 {
+    font-size: 110%;
+    margin-right:100pt;
+    font-family: Verdana, Helvetica, sans-serif;
+}
+
 div.Desktop a:link {
     text-decoration: none;
     color: #336699;
@@ -272,7 +284,7 @@
 
 div.Desktop table tr td {
     font-size: 80%;
-    color: #336699;
+    color: #000000;
 }
 
 div.Desktop a:visited {