Author: bree
Date: Sun Mar 12 13:18:17 2006
New Revision: 2615

Added:
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/azax_demo.kukit
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/azax_instant_edit.kukit
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/azax_three_autoupdate.kukit
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/azax_tree.kukit
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/azax_two_select.kukit
   azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.kukit
      - copied unchanged from r2614, 
azax/branches/plugin/demos/azaxdemo/browser/cancel_submit.kukit
Removed:
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.kkt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.kkt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.kkt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.kkt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.kkt
   azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.kkt
Modified:
   azax/branches/snowsprint/TODO.txt
   azax/branches/snowsprint/__init__.py
   azax/branches/snowsprint/demos/azaxdemo/azaxview.py
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.pt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.pt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.pt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.pt
   azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.pt
   azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.pt
   azax/branches/snowsprint/demos/azaxdemo/configure.zcml
Log:
Merge in fixes from plugin branch

* .kkt -> .kukit extension change
* small typo fix in demo


Modified: azax/branches/snowsprint/TODO.txt
==============================================================================
--- azax/branches/snowsprint/TODO.txt   (original)
+++ azax/branches/snowsprint/TODO.txt   Sun Mar 12 13:18:17 2006
@@ -1,5 +1,4 @@
 * rename AzaxResponse to KukitResponse
-* register kkt mimetype instead of azax
 * look to TextIndexNG3 howto have it compatible with Z3, Z2 and Plone
 * rename the commands to better match the DOM API
 * try to fix the namespace problems - see 
https://svn.z3lab.org/z3lab/azax/branches/gotcha-namespaces

Modified: azax/branches/snowsprint/__init__.py
==============================================================================
--- azax/branches/snowsprint/__init__.py        (original)
+++ azax/branches/snowsprint/__init__.py        Sun Mar 12 13:18:17 2006
@@ -1,6 +1,7 @@
 import mimetypes
 
-mimetypes.types_map['.kkt'] = 'text/xml' 
+mimetypes.types_map['.kkt'] = 'text/xml'    # XXX legacy!
+mimetypes.types_map['.kukit'] = 'text/xml'
 
 from azaxview import AzaxBaseView
 from unicode_quirks import force_unicode, AzaxUnicodeError

Modified: azax/branches/snowsprint/demos/azaxdemo/azaxview.py
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/azaxview.py (original)
+++ azax/branches/snowsprint/demos/azaxdemo/azaxview.py Sun Mar 12 13:18:17 2006
@@ -40,7 +40,7 @@
 
     def copyToDivContent(self):
         """ copy div content """
-        return_object.copyChildrenTo('div#copy', 'demo')
+        self.copyChildrenTo('div#copy', 'demo')
         return self.render()
 
     def moveToDivContent(self):

Modified: azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.pt        
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/azax_demo.pt        Sun Mar 
12 13:18:17 2006
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel="kukit"
-          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_demo.kkt"/>
+          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_demo.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>
@@ -60,12 +60,12 @@
     </div>
     <h3>Javascript Styling</h3>
     <p>This page defines a <code>link</code> in the header which 
<code>rel</code> attribute points
-       to a <code>.kkt</code> server file :
+       to a <code>.kukit</code> server file :
 
-          <a tal:attributes="href 
string:${context/absolute_url}/++resource++azax_demo.kkt">
+          <a tal:attributes="href 
string:${context/absolute_url}/++resource++azax_demo.kukit">
            see the kukit file here</a>.</p>
     <p>
-        This <code>.kkt</code> file declares CSS selectors associated with 
events and server URLs called when the event occur.
+        This <code>.kukit</code> file declares CSS selectors associated with 
events and server URLs called when the event occur.
     </p>
     <p>A javascript engine processes the XML content : it inserts javascript
        events in the DOM.</p>

Modified: azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.pt        
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/azax_instant_edit.pt        
Sun Mar 12 13:18:17 2006
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel="kukit"
-          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_instant_edit.kkt"/>
+          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_instant_edit.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>

Modified: 
azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.pt    
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/azax_three_autoupdate.pt    
Sun Mar 12 13:18:17 2006
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel="kukit"
-          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_three_autoupdate.kkt"/>
+          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_three_autoupdate.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
     <style type="text/css">
         #update-area {

Modified: azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.pt        
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/azax_tree.pt        Sun Mar 
12 13:18:17 2006
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel="kukit"
-          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_tree.kkt"/>
+          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_tree.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
     <style>
         ul, li{

Modified: azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.pt  
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/azax_two_select.pt  Sun Mar 
12 13:18:17 2006
@@ -1,7 +1,7 @@
 <html>
   <head>
     <link rel="kukit"
-          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_two_selects.kkt"/>
+          tal:attributes="href 
string:${context/absolute_url}/++resource++azax_two_selects.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>

Modified: azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.pt
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.pt    
(original)
+++ azax/branches/snowsprint/demos/azaxdemo/browser/cancel_submit.pt    Sun Mar 
12 13:18:17 2006
@@ -2,7 +2,7 @@
   <head>
     <link rel="kukit"
           tal:attributes="href
-          string:${context/absolute_url}/++resource++cancel_submit.kkt"/>
+          string:${context/absolute_url}/++resource++cancel_submit.kukit"/>
     <metal:header use-macro="context/header_macros/macros/header_resources" />
   </head>
   <body>

Modified: azax/branches/snowsprint/demos/azaxdemo/configure.zcml
==============================================================================
--- azax/branches/snowsprint/demos/azaxdemo/configure.zcml      (original)
+++ azax/branches/snowsprint/demos/azaxdemo/configure.zcml      Sun Mar 12 
13:18:17 2006
@@ -50,8 +50,8 @@
       />
 
   <browser:resource
-    file="browser/azax_demo.kkt"
-    name="azax_demo.kkt"
+    file="browser/azax_demo.kukit"
+    name="azax_demo.kukit"
     />
 
   <browser:page
@@ -103,8 +103,8 @@
       />
 
   <browser:resource
-    file="browser/azax_two_select.kkt"
-    name="azax_two_selects.kkt"
+    file="browser/azax_two_select.kukit"
+    name="azax_two_selects.kukit"
   />
 
   <browser:page
@@ -124,8 +124,8 @@
       />
 
   <browser:resource
-    file="browser/azax_three_autoupdate.kkt"
-    name="azax_three_autoupdate.kkt"
+    file="browser/azax_three_autoupdate.kukit"
+    name="azax_three_autoupdate.kukit"
   />
 
   <browser:page
@@ -154,8 +154,8 @@
       />
 
   <browser:resource
-    file="browser/azax_instant_edit.kkt"
-    name="azax_instant_edit.kkt"
+    file="browser/azax_instant_edit.kukit"
+    name="azax_instant_edit.kukit"
   />
 
   <browser:page
@@ -184,8 +184,8 @@
       />
 
   <browser:resource
-    file="browser/azax_tree.kkt"
-    name="azax_tree.kkt"
+    file="browser/azax_tree.kukit"
+    name="azax_tree.kukit"
   />
 
   <browser:page
@@ -205,8 +205,8 @@
       />
 
   <browser:resource
-    file="browser/cancel_submit.kkt"
-    name="cancel_submit.kkt"
+    file="browser/cancel_submit.kukit"
+    name="cancel_submit.kukit"
   />
 
   <browser:page
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to