Tue, 11 Dec 2001 10:54:28 -0500

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

Modified Files:
      Tag: ExtensionsBranch
	discussion_reply_form.pt discussion_reply_preview.pt 
	folder_add.pt folder_contents.pt folder_factories.pt 
	folder_localrole_form.pt folder_rename_form.pt index_html.pt 
	join_form.pt logged_in.pt logged_out.pt login_form.pt 
	mail_password_form.pt mail_password_response.pt 
	main_template.pt metadata_help.pt password_form.pt 
	personalize_form.pt recent_news.pt reconfig_form.pt 
	registered.pt review.pt roster.pt rssDisabled.pt search.pt 
	search_form.pt standard_error_message.pt stxmethod_view.pt 
	undo_form.pt 
Log Message:

*Prototype CMF with extensions for webdav
*Things will change to make this functionality baclwards
compatible; beware.


=== CMF/CMFDefault/skins/zpt_generic/discussion_reply_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">	
 <div tal:define="dummy python:here.portal_discussion.getDiscussionFor(here)">This is evaluated.</div>


=== CMF/CMFDefault/skins/zpt_generic/discussion_reply_preview.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/folder_add.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">	  
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/folder_contents.pt 1.2 => 1.2.4.1 ===
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
   <div tal:condition="python: not(here.portal_membership.checkPermission('List folder contents', here))">


=== CMF/CMFDefault/skins/zpt_generic/folder_factories.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master"
+      metal:use-macro="here/main_template.pt/macros/master"
 	  tal:define="dummy python: here.request.set('isDesktop', 1)">
 <body>
 <div metal:fill-slot="main">


=== CMF/CMFDefault/skins/zpt_generic/folder_localrole_form.pt 1.2 => 1.2.4.1 ===
+<html metal:use-macro="here/main_template.pt/macros/master">
 <body>
 
 <div class="Desktop"


=== CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/index_html.pt 1.2 => 1.2.4.1 ===
+<html metal:use-macro="here/main_template.pt/macros/master"
 >
 <body>
 


=== CMF/CMFDefault/skins/zpt_generic/join_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/logged_in.pt 1.2 => 1.2.4.1 ===
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
  <div tal:define="p_props here/portal_properties">


=== CMF/CMFDefault/skins/zpt_generic/logged_out.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <p tal:condition="python: here.portal_membership.isAnonymousUser()"


=== CMF/CMFDefault/skins/zpt_generic/login_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/mail_password_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/mail_password_response.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <p class="DesktopStatusBar">Your password has been mailed.  


=== CMF/CMFDefault/skins/zpt_generic/main_template.pt 1.2 => 1.2.4.1 ===
 
  <!-- Bug in ZPT Causes this to break-metal:block define-slot="base" / --> 
- <link rel="stylesheet" href="zpt_stylesheet.css" type="text/css"
-       tal:attributes="href here/zpt_stylesheet/absolute_url">
+ <link rel="stylesheet" href="../zpt_generic/zpt_stylesheet.css" type="text/css"
+       tal:attributes="href here/zpt_stylesheet.css/absolute_url">
 
 </head>
 
@@ -48,7 +48,7 @@
 
    <td id="PortalLogo">
     <a href="." tal:attributes="href portal_url"
-    ><img src="Zope_logo.gif" alt="Zope Logo"
+    ><img src="../Images/Zope_logo.gif" alt="Zope Logo"
           border="0" width="87" height="38"
           tal:attributes="src string:${portal_url}/Zope_logo.gif"></a> 
    </td>
@@ -67,7 +67,7 @@
        tal:attributes="href string:${portal_url}/search_form">search</a> 
 
     <input name="SearchableText" size="16">
-    <input border="0" type="image" name="go" value="go" src="go.gif"
+    <input border="0" type="image" name="go" value="go" src="../Images/go.gif"
            align="middle" width="20" height="20"
            tal:attributes="src string:go.gif"> &nbsp;
    </td>


=== CMF/CMFDefault/skins/zpt_generic/metadata_help.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/password_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
   <div tal:define="member python: here.portal_membership.getAuthenticatedMember()">


=== CMF/CMFDefault/skins/zpt_generic/personalize_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
   <div tal:define="member python: here.portal_membership.getAuthenticatedMember()">


=== CMF/CMFDefault/skins/zpt_generic/recent_news.pt 1.3 => 1.3.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
   <div tal:define="b_start string:0;b_start request/b_start | b_start;


=== CMF/CMFDefault/skins/zpt_generic/reconfig_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/registered.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/review.pt 1.2 => 1.2.4.1 ===
+<html metal:use-macro="here/main_template.pt/macros/master">
 
 <body>
 


=== CMF/CMFDefault/skins/zpt_generic/roster.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/rssDisabled.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/search.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/search_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 
@@ -8,7 +8,7 @@
 
 <h1>Search <span tal:replace="here/Title" /></h1>
 
-<form action="search">
+<form action="search.pt">
 
 <table class="FormLayout">
 


=== CMF/CMFDefault/skins/zpt_generic/standard_error_message.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">


=== CMF/CMFDefault/skins/zpt_generic/stxmethod_view.pt 1.2 => 1.2.4.1 ===
        xmlns:metal="http://xml.zope.org/namespaces/metal"
-       metal:use-macro="here/main_template/macros/master">
+       metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 


=== CMF/CMFDefault/skins/zpt_generic/undo_form.pt 1.2 => 1.2.4.1 ===
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/main_template.pt/macros/master">
 <body>
 <div metal:fill-slot="main">
 <div class="Desktop">
@@ -23,7 +23,7 @@
          <tbody tal:condition="request/first_transaction">
            <tr><td colspan=2 align=center>
             <a href=""
-               tal:attributes="href python:here.portal_url() + '/undo_form?first_transaction:int=' + 
+               tal:attributes="href python:here.portal_url() + '/undo_form.pt?first_transaction:int=' + 
                                str(request.first_transaction*2-request.last_transaction) +
                                '&last_transaction:int=' +
                                str(request.first_transaction) + 
@@ -53,7 +53,7 @@
     <tr><td colspan=2 align=center>
     <span tal:condition="python: len(transactions) == request.PrincipiaUndoBatchSize">
         <a href=""
-           tal:attributes="href python: here.absolute_url() + '/undo_form?first_transaction:int=' + str(request.last_transaction) + '&last_transaction:int=' + str(request.last_transaction+request.PrincipiaUndoBatchSize) + '&PrincipiaUndoBatchSize:int=' + str(request.PrincipiaUndoBatchSize)">Earlier Transactions</a>
+           tal:attributes="href python: here.absolute_url() + '/undo_form.pt?first_transaction:int=' + str(request.last_transaction) + '&last_transaction:int=' + str(request.last_transaction+request.PrincipiaUndoBatchSize) + '&PrincipiaUndoBatchSize:int=' + str(request.PrincipiaUndoBatchSize)">Earlier Transactions</a>
     </span>
     </td></tr>
     <tr><td></td></tr>



