[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - main_template.pt:1.11 undo_form.pt:1.7 zpt_stylesheet.css:1.8

Yvo Schubbe schubbe@web.de
Sun, 8 Jun 2003 15:47:53 -0400


Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv26280/CMFDefault/skins/zpt_generic

Modified Files:
	main_template.pt undo_form.pt zpt_stylesheet.css 
Log Message:
Merged yuppie-buglets2-branch:
- Fixed some zpt issues. (Collector #156 and other)
- Fixed stylesheets. (Collector #164)
- Cleanup.

=== CMF/CMFDefault/skins/zpt_generic/main_template.pt 1.10 => 1.11 ===
--- CMF/CMFDefault/skins/zpt_generic/main_template.pt:1.10	Thu Mar  6 05:32:18 2003
+++ CMF/CMFDefault/skins/zpt_generic/main_template.pt	Sun Jun  8 15:47:52 2003
@@ -25,9 +25,11 @@
 
  <metal:block define-slot="base" />
 
- <link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
+ <link rel="stylesheet" type="text/css" href="zpt_stylesheet.css"
        tal:attributes="href here/zpt_stylesheet.css/absolute_url" />
-
+ <link rel="stylesheet" type="text/css" href="CalendarStyle.css"
+       tal:condition="here/CalendarStyle.css|nothing"
+       tal:attributes="href here/CalendarStyle.css/absolute_url" />
 </head>
 
 <body>
@@ -272,7 +274,8 @@
 
   <p id="DesktopStatusBar"
      tal:condition="request/portal_status_message|nothing"
-     tal:content="request/portal_status_message"> Status message.</p>
+     tal:content="request/portal_status_message"
+     i18n:translate="">Status message.</p>
 
   <div metal:define-slot="header">
 


=== CMF/CMFDefault/skins/zpt_generic/undo_form.pt 1.6 => 1.7 ===
--- CMF/CMFDefault/skins/zpt_generic/undo_form.pt:1.6	Thu Mar  6 05:35:22 2003
+++ CMF/CMFDefault/skins/zpt_generic/undo_form.pt	Sun Jun  8 15:47:52 2003
@@ -2,9 +2,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-
 <div metal:fill-slot="main" i18n:domain="cmf_default">
-
 <div class="Desktop">
 
 <h1 i18n:translate="">Undo Transactions</h1>
@@ -29,7 +27,7 @@
               ">
 
   <form action="undo" method="post"
-        tal:attributes="action_xxx string:${here/absolute_url}/undo"
+        tal:attributes="action string:${here/absolute_url}/undo"
   >
 
    <p i18n:translate="">This application's transactional feature allows you to
@@ -44,19 +42,16 @@
        modified by the transaction. </p>
 
    <table class="FormLayout">
-
     <tr>
      <td colspan="2" align="center">
-      <input type="submit" value=" Undo " i18n:attributes="value" />
+      <input type="submit" value="Undo" i18n:attributes="value" />
      </td>
     </tr>
-
     <tr>
      <td><br /></td>
     </tr>
 
-    <tbody tal:condition="request/first_transaction">
-    <tr>
+    <tr tal:condition="request/first_transaction">
      <td colspan="2" align="center">
       <a href=""
          tal:attributes="href python:b_fmt%(url,e_start,e_end,b_size)"
@@ -64,10 +59,8 @@
       >Later Transactions</a>
      </td>
     </tr>
-    </tbody>
 
-    <tbody tal:repeat="items transactions">
-    <tr>
+    <tr tal:repeat="items transactions">
      <td valign="top">
       <input type="checkbox" name="transaction_info:list" value=""
              tal:attributes="value items/id" />
@@ -79,7 +72,7 @@
        <span tal:condition="items/user_name|nothing">
         <span tal:replace="items/user_name" />
        </span>
-       <span condition="python:not(items.description)">
+       <span tal:condition="not: items/user_name|nothing">
         <em i18n:translate="">Zope</em>
        </span>
       </strong>
@@ -90,7 +83,6 @@
       <span tal:replace="python: items['time'].Time()" />
      </td>
     </tr>
-    </tbody>
 
     <tr>
      <td colspan="2" align="center">
@@ -106,13 +98,11 @@
     <tr>
      <td><br /></td>
     </tr>
-
     <tr>
      <td colspan="2" align="center">
-      <input type="submit" value=" Undo " i18n:attributes="value" />
+      <input type="submit" value="Undo" i18n:attributes="value" />
      </td>
     </tr>
-
    </table>
   </form>
  </div>
@@ -125,6 +115,5 @@
 
 </div><!-- class="Desktop" -->
 </div><!-- metal:fill-slot="main" -->
-
 </body>
 </html>


=== CMF/CMFDefault/skins/zpt_generic/zpt_stylesheet.css 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/zpt_generic/zpt_stylesheet.css:1.7	Tue Sep 17 17:36:36 2002
+++ CMF/CMFDefault/skins/zpt_generic/zpt_stylesheet.css	Sun Jun  8 15:47:52 2003
@@ -1,5 +1,3 @@
-Content-Type: text/css
-
 body {
     background-color: White;
     color: Black;
@@ -68,8 +66,7 @@
     background-color: #336699;
     border: 1pt;
     border-color: #336699;
-    padding: none;
-    cell-spacing: none;
+    padding: 0;
     width: 100%;
 }
 
@@ -133,7 +130,7 @@
 #ContextActionsBox {
     border-color: #AAAAAA;
     background-color: #AAAAAA;
-    padding: none;
+    padding: 0;
 }
 
 .ContextActionsRow {
@@ -363,5 +360,3 @@
 p.NewsHeadline {
     background-color:  #336699;
 }
-
-<dtml-var CalendarStyle missing>