Menu
▾
▴
[Collective-checkins] r230803 - in Products.ImageEditor/trunk: . Products/ImageEditor Products/ImageEditor/actions Products/ImageEditor/adapters Products/ImageEditor/browser Products/ImageEditor/meta Products/ImageEditor/profiles/default docs
Author: vangheem Date: Thu Jan 20 23:23:39 2011 New Revision: 230803 Modified: Products.ImageEditor/trunk/ (props changed) Products.ImageEditor/trunk/Products/ImageEditor/actions/configure.zcml Products.ImageEditor/trunk/Products/ImageEditor/adapters/configure.zcml Products.ImageEditor/trunk/Products/ImageEditor/browser/alagimp.pt Products.ImageEditor/trunk/Products/ImageEditor/browser/configure.zcml Products.ImageEditor/trunk/Products/ImageEditor/browser/css.zcml Products.ImageEditor/trunk/Products/ImageEditor/configure.zcml Products.ImageEditor/trunk/Products/ImageEditor/meta/configure.zcml Products.ImageEditor/trunk/Products/ImageEditor/profiles.zcml Products.ImageEditor/trunk/Products/ImageEditor/profiles/default/metadata.xml Products.ImageEditor/trunk/Products/ImageEditor/testing.zcml Products.ImageEditor/trunk/Products/ImageEditor/upgrades.zcml Products.ImageEditor/trunk/Products/ImageEditor/version.txt Products.ImageEditor/trunk/README.txt Products.ImageEditor/trunk/buildout.cfg Products.ImageEditor/trunk/docs/HISTORY.txt Products.ImageEditor/trunk/setup.py Log: merge toutpt branch Modified: Products.ImageEditor/trunk/Products/ImageEditor/actions/configure.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/actions/configure.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/actions/configure.zcml Thu Jan 20 23:23:39 2011 @@ -1,29 +1,29 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:image="http://namespaces.zope.org/image" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:image="http://namespaces.zope.org/image" + i18n_domain="Products.ImageEditor"> - <image:edit-action class=".actions.CropAction" /> - <image:edit-action class=".actions.ResizeAction" /> - - <image:edit-action class=".actions.RotateLeftAction" /> - <image:edit-action class=".actions.RotateRightAction" /> - <image:edit-action class=".actions.FlipOnVerticalAxisAction" /> - <image:edit-action class=".actions.FlipOnHorizontalAxisAction" /> - - <image:edit-action class=".actions.BlurAction" /> - <image:edit-action class=".actions.CompressAction" /> - <image:edit-action class=".actions.ContrastAction" /> - <image:edit-action class=".actions.BrightnessAction" /> - <image:edit-action class=".actions.SharpenAction" /> - <image:edit-action class=".actions.SepiaAction" /> + <image:edit-action class=".actions.CropAction" /> + <image:edit-action class=".actions.ResizeAction" /> + + <image:edit-action class=".actions.RotateLeftAction" /> + <image:edit-action class=".actions.RotateRightAction" /> + <image:edit-action class=".actions.FlipOnVerticalAxisAction" /> + <image:edit-action class=".actions.FlipOnHorizontalAxisAction" /> + + <image:edit-action class=".actions.BlurAction" /> + <image:edit-action class=".actions.CompressAction" /> + <image:edit-action class=".actions.ContrastAction" /> + <image:edit-action class=".actions.BrightnessAction" /> + <image:edit-action class=".actions.SharpenAction" /> + <image:edit-action class=".actions.SepiaAction" /> - <image:edit-action class=".actions.DropShadowAction" /> + <image:edit-action class=".actions.DropShadowAction" /> - <image:edit-action class=".actions.SaveAsImageEditAction" /> - <image:edit-action class=".actions.SaveImageEditAction" /> - <image:edit-action class=".actions.CancelImageEditAction" /> - <image:edit-action class=".actions.RedoAction" /> - <image:edit-action class=".actions.UndoAction" /> + <image:edit-action class=".actions.SaveAsImageEditAction" /> + <image:edit-action class=".actions.SaveImageEditAction" /> + <image:edit-action class=".actions.CancelImageEditAction" /> + <image:edit-action class=".actions.RedoAction" /> + <image:edit-action class=".actions.UndoAction" /> </configure> \ No newline at end of file Modified: Products.ImageEditor/trunk/Products/ImageEditor/adapters/configure.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/adapters/configure.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/adapters/configure.zcml Thu Jan 20 23:23:39 2011 @@ -1,7 +1,7 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:zope="http://namespaces.zope.org/zope" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:zope="http://namespaces.zope.org/zope" + i18n_domain="Products.ImageEditor"> <zope:adapter factory=".imageeditor.ImageEditorAdapter" /> Modified: Products.ImageEditor/trunk/Products/ImageEditor/browser/alagimp.pt ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/browser/alagimp.pt (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/browser/alagimp.pt Thu Jan 20 23:23:39 2011 @@ -8,11 +8,9 @@ <metal:js fill-slot="javascript_head_slot"> <metal:head define-macro="head"> <link href="" type="text/css" rel="stylesheet" tal:attributes="href string:${context/portal_url}/++resource++imageeditor/alagimp.css"/> - <script type="text/javascript" src="" tal:attributes="src string:${context/portal_url}/++resource++collective.javascript.jqueryui/js/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="" tal:attributes="src string:${context/portal_url}/++resource++imageeditor/imgareaselect-0.8/jquery.imgareaselect-0.8.min.js"></script> <link href="" type="text/css" rel="stylesheet" tal:attributes="href string:${context/portal_url}/++resource++collective.javascript.jqueryui/css/start/jquery-ui.css"/> - <script type="text/javascript" src="" tal:attributes="src string:${context/portal_url}/++resource++collective.javascript.jqueryui/js/jquery-ui.min.js"></script> <script type="text/javascript" src="" tal:attributes="src string:${context/portal_url}/++resource++imageeditor/alagimp.js"></script> <script type="text/javascript" tal:content="structure view/setup_js" /> Modified: Products.ImageEditor/trunk/Products/ImageEditor/browser/configure.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/browser/configure.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/browser/configure.zcml Thu Jan 20 23:23:39 2011 @@ -1,66 +1,59 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:browser="http://namespaces.zope.org/browser"> + xmlns="http://namespaces.zope.org/zope" + xmlns:browser="http://namespaces.zope.org/browser"> - <browser:page - for="Products.ATContentTypes.interface.image.IImageContent" - name="imageeditor" - class=".base.ImageEditor" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - /> - - <browser:page - for="Products.ATContentTypes.interface.image.IImageContent" - name="imageeditor.alagimp" - class=".alagimp.AlaGimp" - template="alagimp.pt" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - /> - - <browser:page - for="Products.ATContentTypes.interface.image.IImageContent" - name="imageeditor.inline" - class=".alagimp.AlaGimp" - template="inline.pt" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - /> - - <browser:page - for="Products.ATContentTypes.interface.image.IImageContent" - name="imageeditor.slider" - class=".slider.Slider" - template="slider.pt" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - /> - - <browser:page - for="Products.ATContentTypes.interface.image.IImageContent" - name="currenteditedimage.jpg" - class=".imageeditor.ShowCurrentEdit" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - /> - - <browser:page - name="image-editor-utility" - for="*" - permission="zope2.View" - allowed_interface="Products.ImageEditor.interfaces.imageeditor.IImageEditorUtility" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - class=".imageeditor.ImageEditorUtility" - /> + <browser:page + for="Products.ATContentTypes.interface.image.IImageContent" + name="imageeditor" + class=".base.ImageEditor" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" /> + + <browser:page + for="Products.ATContentTypes.interface.image.IImageContent" + name="imageeditor.alagimp" + class=".alagimp.AlaGimp" + template="alagimp.pt" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" /> + + <browser:page + for="Products.ATContentTypes.interface.image.IImageContent" + name="imageeditor.inline" + class=".alagimp.AlaGimp" + template="inline.pt" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" /> + + <browser:page + for="Products.ATContentTypes.interface.image.IImageContent" + name="imageeditor.slider" + class=".slider.Slider" + template="slider.pt" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" /> + + <browser:page + for="Products.ATContentTypes.interface.image.IImageContent" + name="currenteditedimage.jpg" + class=".imageeditor.ShowCurrentEdit" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" /> + + <browser:page + name="image-editor-utility" + for="*" + permission="zope2.View" + allowed_interface="Products.ImageEditor.interfaces.imageeditor.IImageEditorUtility" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" + class=".imageeditor.ImageEditorUtility" /> - <browser:page - name="execute" - for="Products.ATContentTypes.interface.image.IImageContent" - permission="Products.ImageEditor.edit" - layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" - class=".imageeditor.ImageEditorActionExecute" - /> + <browser:page + name="execute" + for="Products.ATContentTypes.interface.image.IImageContent" + permission="Products.ImageEditor.edit" + layer="Products.ImageEditor.interfaces.imageeditor.IImageEditorLayer" + class=".imageeditor.ImageEditorActionExecute" /> <browser:resourceDirectory name="imageeditor" Modified: Products.ImageEditor/trunk/Products/ImageEditor/browser/css.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/browser/css.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/browser/css.zcml Thu Jan 20 23:23:39 2011 @@ -1,9 +1,7 @@ -<configure - xmlns:browser="http://namespaces.zope.org/browser"> +<configure xmlns:browser="http://namespaces.zope.org/browser"> <browser:resource - name="imageeditor-style.css" - file="resources/style.css" - /> + name="imageeditor-style.css" + file="resources/style.css" /> </configure> \ No newline at end of file Modified: Products.ImageEditor/trunk/Products/ImageEditor/configure.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/configure.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/configure.zcml Thu Jan 20 23:23:39 2011 @@ -1,17 +1,17 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:five="http://namespaces.zope.org/five" - xmlns:i18n="http://namespaces.zope.org/i18n" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:five="http://namespaces.zope.org/five" + xmlns:i18n="http://namespaces.zope.org/i18n" + i18n_domain="Products.ImageEditor"> - <five:registerPackage package="." /> + <five:registerPackage package="." /> - <include package="collective.javascript.jqueryui" /> - <i18n:registerTranslations directory="locales" /> - <permission - id="Products.ImageEditor.edit" - title="Product.ImageEditor: Edit Images" - /> + <include package="collective.js.jqueryui" /> + <i18n:registerTranslations directory="locales" /> + + <permission + id="Products.ImageEditor.edit" + title="Product.ImageEditor: Edit Images" /> <include package=".meta" /> <include package=".actions" /> @@ -19,11 +19,11 @@ <include package=".browser" /> <include package=".adapters" /> - <include file="profiles.zcml" /> + <include file="profiles.zcml" /> <include file="upgrades.zcml" /> - <utility - component=".vocabularies.ImageContentTypeVocabularyFactory" - name="plone.app.vocabularies.ImageContentTypes" - /> + <utility + component=".vocabularies.ImageContentTypeVocabularyFactory" + name="plone.app.vocabularies.ImageContentTypes" /> + </configure> Modified: Products.ImageEditor/trunk/Products/ImageEditor/meta/configure.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/meta/configure.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/meta/configure.zcml Thu Jan 20 23:23:39 2011 @@ -1,12 +1,11 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:meta="http://namespaces.zope.org/meta"> + xmlns="http://namespaces.zope.org/zope" + xmlns:meta="http://namespaces.zope.org/meta"> - <meta:directive - name="edit-action" - namespace="http://namespaces.zope.org/image" - schema=".zcml.IEditorAction" - handler=".zcml.add_action" - /> + <meta:directive + name="edit-action" + namespace="http://namespaces.zope.org/image" + schema=".zcml.IEditorAction" + handler=".zcml.add_action" /> </configure> \ No newline at end of file Modified: Products.ImageEditor/trunk/Products/ImageEditor/profiles.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/profiles.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/profiles.zcml Thu Jan 20 23:23:39 2011 @@ -1,33 +1,30 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:genericsetup="http://namespaces.zope.org/genericsetup" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:genericsetup="http://namespaces.zope.org/genericsetup" + i18n_domain="Products.ImageEditor"> - <genericsetup:registerProfile - name="default" - title="Image Editor" - directory="profiles/default" - description='Extension profile ImageEditor.' - provides="Products.GenericSetup.interfaces.EXTENSION" - for="Products.CMFPlone.interfaces.IPloneSiteRoot" - /> + <genericsetup:registerProfile + name="default" + title="Image Editor" + directory="profiles/default" + description='Extension profile ImageEditor.' + provides="Products.GenericSetup.interfaces.EXTENSION" + for="Products.CMFPlone.interfaces.IPloneSiteRoot" /> - <genericsetup:registerProfile - name="uninstall" - title="Products.ImageEditor Uninstall profile" - directory="profiles/uninstall" - description='Uninstall profile for Image Editor.' - provides="Products.GenericSetup.interfaces.EXTENSION" - for="Products.CMFPlone.interfaces.IPloneSiteRoot" - /> + <genericsetup:registerProfile + name="uninstall" + title="Products.ImageEditor Uninstall profile" + directory="profiles/uninstall" + description='Uninstall profile for Image Editor.' + provides="Products.GenericSetup.interfaces.EXTENSION" + for="Products.CMFPlone.interfaces.IPloneSiteRoot" /> <genericsetup:registerProfile - name="upgrade_to_1_2" - title="Products.ImageEditor upgrade profile" - directory="profiles/upgrade_to_1_2" - description='Upgrade to 1.2 profile for Image Editor.' - provides="Products.GenericSetup.interfaces.EXTENSION" - for="Products.CMFPlone.interfaces.IPloneSiteRoot" - /> + name="upgrade_to_1_2" + title="Products.ImageEditor upgrade profile" + directory="profiles/upgrade_to_1_2" + description='Upgrade to 1.2 profile for Image Editor.' + provides="Products.GenericSetup.interfaces.EXTENSION" + for="Products.CMFPlone.interfaces.IPloneSiteRoot" /> </configure> Modified: Products.ImageEditor/trunk/Products/ImageEditor/profiles/default/metadata.xml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/profiles/default/metadata.xml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/profiles/default/metadata.xml Thu Jan 20 23:23:39 2011 @@ -1,4 +1,7 @@ <?xml version="1.0"?> <metadata> <version>1.6</version> + <dependencies> + <dependency>profile-collective.js.jqueryui:default</dependency> + </dependencies> </metadata> Modified: Products.ImageEditor/trunk/Products/ImageEditor/testing.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/testing.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/testing.zcml Thu Jan 20 23:23:39 2011 @@ -1,9 +1,8 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:zcml="http://namespaces.zope.org/zcml" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:zcml="http://namespaces.zope.org/zcml" + i18n_domain="Products.ImageEditor"> - <include package="collective.js.jquery" /> <include package="collective.js.jqueryui" /> </configure> Modified: Products.ImageEditor/trunk/Products/ImageEditor/upgrades.zcml ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/upgrades.zcml (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/upgrades.zcml Thu Jan 20 23:23:39 2011 @@ -1,24 +1,22 @@ <configure - xmlns="http://namespaces.zope.org/zope" - xmlns:gs="http://namespaces.zope.org/genericsetup" - i18n_domain="Products.ImageEditor"> + xmlns="http://namespaces.zope.org/zope" + xmlns:gs="http://namespaces.zope.org/genericsetup" + i18n_domain="Products.ImageEditor"> - <gs:upgradeStep - title="Upgrade Products.ImageEditor to 1.2" - description="Products.ImageEditor upgrade step" - source="*" - destination="1.2" - handler=".upgrades.upgrade_to_1_2" - profile="Products.ImageEditor:default" - /> + <gs:upgradeStep + title="Upgrade Products.ImageEditor to 1.2" + description="Products.ImageEditor upgrade step" + source="*" + destination="1.2" + handler=".upgrades.upgrade_to_1_2" + profile="Products.ImageEditor:default" /> <gs:upgradeStep - title="Upgrade Products.ImageEditor to 1.3" - description="Products.ImageEditor upgrade step" - source="1.2" - destination="1.3" - handler=".upgrades.upgrade_to_1_3" - profile="Products.ImageEditor:default" - /> + title="Upgrade Products.ImageEditor to 1.3" + description="Products.ImageEditor upgrade step" + source="1.2" + destination="1.3" + handler=".upgrades.upgrade_to_1_3" + profile="Products.ImageEditor:default" /> </configure> Modified: Products.ImageEditor/trunk/Products/ImageEditor/version.txt ============================================================================== --- Products.ImageEditor/trunk/Products/ImageEditor/version.txt (original) +++ Products.ImageEditor/trunk/Products/ImageEditor/version.txt Thu Jan 20 23:23:39 2011 @@ -1 +1 @@ -1.6 \ No newline at end of file +1.6.1dev \ No newline at end of file Modified: Products.ImageEditor/trunk/README.txt ============================================================================== --- Products.ImageEditor/trunk/README.txt (original) +++ Products.ImageEditor/trunk/README.txt Thu Jan 20 23:23:39 2011 @@ -26,8 +26,12 @@ Dependencies ============ -* collective.javascript.jqueryui +* collective.js.jqueryui +Warning: on plone3 you should pin the version to 1.7.2.7 because +of a known bug discused here: +http://forum.jquery.com/topic/jqueryui-1-8-6-with-jquery-1-3-2-old-one +http://bugs.jqueryui.com/ticket/6030 Contributors ============ Modified: Products.ImageEditor/trunk/buildout.cfg ============================================================================== --- Products.ImageEditor/trunk/buildout.cfg (original) +++ Products.ImageEditor/trunk/buildout.cfg Thu Jan 20 23:23:39 2011 @@ -6,3 +6,6 @@ [instance] debug-mode = on verbose-security = on + +[versions] +collective.js.jqueryui = 1.7.2.7 Modified: Products.ImageEditor/trunk/docs/HISTORY.txt ============================================================================== --- Products.ImageEditor/trunk/docs/HISTORY.txt (original) +++ Products.ImageEditor/trunk/docs/HISTORY.txt Thu Jan 20 23:23:39 2011 @@ -1,6 +1,16 @@ Changelog ========= +1.6.1 ~ unreleased +------------------ + +* use c.js.jqueryui instead of c.javascript.jqueryui + don t include javascript by hand in template, let the portal_javascript do its job + [toutpt] + +* fix tests setup + [toutpt] + 1.6 - Released August 29, 2010 ------------------------------ Modified: Products.ImageEditor/trunk/setup.py ============================================================================== --- Products.ImageEditor/trunk/setup.py (original) +++ Products.ImageEditor/trunk/setup.py Thu Jan 20 23:23:39 2011 @@ -29,7 +29,7 @@ zip_safe = False, install_requires = [ 'setuptools', - 'collective.javascript.jqueryui', + 'collective.js.jqueryui', ], extras_require = { 'test': [ 'collective.testcaselayer', |