[Checkins] SVN: z3c.reference/trunk/src/z3c/reference/browser/ use aspect ration list from settings

[Juergen Kartnaller]

Log message for revision 79720:
  use aspect ration list from settings

Changed:
  U   z3c.reference/trunk/src/z3c/reference/browser/crop-image-widget.pt
  U   z3c.reference/trunk/src/z3c/reference/browser/editor.pt
  U   z3c.reference/trunk/src/z3c/reference/browser/widget.py

-=-
Modified: z3c.reference/trunk/src/z3c/reference/browser/crop-image-widget.pt
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/crop-image-widget.pt	2007-09-17 14:04:05 UTC (rev 79719)
+++ z3c.reference/trunk/src/z3c/reference/browser/crop-image-widget.pt	2007-09-17 14:34:35 UTC (rev 79720)
@@ -52,9 +52,6 @@
     if (!crop_w) crop_w = ${view/cropWidth};
     if (!crop_h) crop_h = ${view/cropHeight};    
 
-
-    //alert('debug: x:'+crop_x+' y:'+crop_y+' w:'+crop_w+' h:'+crop_h+' r:'+rotate);
-
     var url='${context/++resource++imagetool.swf}';
     var img='${view/url}';
     url = url + '?url=' + encodeForFlash(img) + '/@@resized';
@@ -67,10 +64,9 @@
     so.addVariable('crop_w', crop_w);
     so.addVariable('crop_h', crop_h);
     so.addVariable('rotation', rotate);
-    so.addVariable('presets', '${view/ratioPresets}'); 
+    so.addVariable('presets', '${view/ajaxRatioPresets}'); 
     var ok = so.write('image-tool-target');
 
     if (!ok) alert('error creating crop widget. flash plugin missing?');
-
-            ">
+    ">
 </script>

Modified: z3c.reference/trunk/src/z3c/reference/browser/editor.pt
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/editor.pt	2007-09-17 14:04:05 UTC (rev 79719)
+++ z3c.reference/trunk/src/z3c/reference/browser/editor.pt	2007-09-17 14:34:35 UTC (rev 79720)
@@ -7,11 +7,11 @@
 <title>Objectpicker</title>
 <script type="text/javascript"
         tal:define="name view/name;
-		            settingNameStr view/settingNameStr;
+		                settingNameStr view/settingNameStr;
                     targetStr view/targetStr;
-					viewStr view/viewStr;
-					titleStr view/titleStr;
-					descriptionStr view/descriptionStr"
+					          viewStr view/viewStr;
+					          titleStr view/titleStr;
+					          descriptionStr view/descriptionStr"
         tal:content="string:
   var name = '${name}';
   var settingNameStr = '${settingNameStr}';

Modified: z3c.reference/trunk/src/z3c/reference/browser/widget.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-09-17 14:04:05 UTC (rev 79719)
+++ z3c.reference/trunk/src/z3c/reference/browser/widget.py	2007-09-17 14:34:35 UTC (rev 79720)
@@ -16,6 +16,7 @@
 """
 __docformat__ = 'restructuredtext'
 
+import simplejson
 import urlparse, cgi, urllib
 from xml.dom.minidom import parse, parseString
 
@@ -265,10 +266,16 @@
     """widget for cropping images"""
 
     template = ViewPageTemplateFile('crop-image-widget.pt')
+
+    # the following properties must be set by the editor view
     cropWidth = 50
     cropHeight = 50
+    ratioPresets = [{'name': 'None'}]
 
-    ratioPresets = "[{\\'name\\': \\'None\\'}]"
+    @property
+    def ajaxRatioPresets(self):
+        result = simplejson.dumps(self.ratioPresets)
+        return result.replace('"', '\\\'')
 
     def url(self):
         return absoluteURL(self.context.context, self.request)