r13638 - in Products.OrderableReferenceField/trunk: . Products/OrderableReferenceField Products/OrderableReferenceField/profiles/default Products/OrderableReferenceField/profiles/uninstall Products/OrderableReferenceField/skins/orderablereferencefield
"Luca Fabbri" <[email protected]> Tue, 17 May 2011 07:38:01 +0000
| Newsgroups | gmane.comp.web.zope.plone.archetypes.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: keul
Date: Tue May 17 07:38:00 2011
New Revision: 13638
Added:
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereference.css
- copied unchanged from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereference.css
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereference.css.metadata
- copied unchanged from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereference.css.metadata
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js
- copied, changed from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js.metadata
- copied unchanged from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js.metadata
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.pt
- copied unchanged from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.pt
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/referencebrowser_popup.pt
- copied unchanged from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/referencebrowser_popup.pt
Removed:
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereference.css.dtml
Modified:
Products.OrderableReferenceField/trunk/ (props changed)
Products.OrderableReferenceField/trunk/CHANGES.txt
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/__init__.py
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/_field.py
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/configure.zcml
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/jsregistry.xml
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/metadata.xml
Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/uninstall/jsregistry.xml
Products.OrderableReferenceField/trunk/README.txt
Products.OrderableReferenceField/trunk/setup.py
Log:
Merged the branch into the trunk
Modified: Products.OrderableReferenceField/trunk/CHANGES.txt
==============================================================================
--- Products.OrderableReferenceField/trunk/CHANGES.txt (original)
+++ Products.OrderableReferenceField/trunk/CHANGES.txt Tue May 17 07:38:00 2011
@@ -1,6 +1,16 @@
Changelog
=========
+1.3 (Unreleased)
+----------------
+
+- alternative OrderableReferenceBrowserWidget (using the original Plone pop-up to select objects)
+ (see also `#4`__) [marco.mariani]
+- removed z3c.autoinclude ``includeDependencies`` (see `#3`__) [keul]
+
+__ http://plone.org/products/orderablereferencefield/issues/4
+__ http://plone.org/products/orderablereferencefield/issues/3
+
1.2-beta4 (2010-11-17)
----------------------
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/__init__.py
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/__init__.py (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/__init__.py Tue May 17 07:38:00 2011
@@ -29,7 +29,7 @@
from Products.Archetypes import listTypes
from Products.OrderableReferenceField._field import OrderableReferenceField
-from Products.OrderableReferenceField._field import OrderableReferenceWidget
+from Products.OrderableReferenceField._field import OrderableReferenceWidget, OrderableReferenceBrowserWidget
from Products.OrderableReferenceField.config import *
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/_field.py
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/_field.py (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/_field.py Tue May 17 07:38:00 2011
@@ -25,6 +25,7 @@
from AccessControl import ClassSecurityInfo
from Products.Archetypes import atapi
from Products.Archetypes.Registry import registerField, registerWidget
+from Products.ATReferenceBrowserWidget.ATReferenceBrowserWidget import ReferenceBrowserWidget
class OrderableReferenceWidget(atapi.ReferenceWidget):
@@ -35,6 +36,15 @@
'size': '6',
'helper_js': ('orderablereference.js',),
})
+
+class OrderableReferenceBrowserWidget(ReferenceBrowserWidget):
+ _properties = ReferenceBrowserWidget._properties.copy()
+ _properties.update({
+ 'type': 'orderablereferencebrowser',
+ 'macro': 'orderablereferencebrowser',
+ 'size': '6',
+ 'helper_js': ('orderablereferencebrowser.js',),
+ })
class OrderableReferenceField(atapi.ReferenceField):
@@ -90,6 +100,12 @@
used_for=('Products.OrderableReferenceField.OrderableReferenceField',)
)
+registerWidget(
+ OrderableReferenceBrowserWidget,
+ title='Orderable Reference Browser',
+ used_for=('Products.OrderableReferenceField.OrderableReferenceField',)
+ )
+
registerField(
OrderableReferenceField,
title="Orderable Reference Field",
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/configure.zcml
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/configure.zcml (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/configure.zcml Tue May 17 07:38:00 2011
@@ -6,11 +6,8 @@
xmlns:i18n="http://namespaces.zope.org/i18n"
i18n_domain="Products.OrderableReferenceField">
- <!-- Not needed to register this package because it's in the Products-namespace -->
- <!-- <five:registerPackage package="." initialize=".initialize" /> -->
-
<!-- Include configuration for dependencies listed in setup.py -->
- <includeDependencies package="." />
+ <!-- includeDependencies package="." /-->
<!-- register all skins-folders -->
<cmf:registerDirectory name="skins" directory="skins" recursive="True" />
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/jsregistry.xml
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/jsregistry.xml (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/jsregistry.xml Tue May 17 07:38:00 2011
@@ -8,6 +8,14 @@
enabled="True"
expression=""
inline="False"/>
+
+ <javascript id="orderablereferencebrowser.js"
+ cacheable="True"
+ compression="none"
+ cookable="True"
+ enabled="True"
+ expression=""
+ inline="False"/>
</object>
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/metadata.xml
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/metadata.xml (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/default/metadata.xml Tue May 17 07:38:00 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<metadata>
- <version>1</version>
+ <version>1001</version>
</metadata>
Modified: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/uninstall/jsregistry.xml
==============================================================================
--- Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/uninstall/jsregistry.xml (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/profiles/uninstall/jsregistry.xml Tue May 17 07:38:00 2011
@@ -2,6 +2,7 @@
<object name="portal_javascripts">
<javascript id="orderablereference.js" remove="True" />
+ <javascript id="orderablereferencebrowser.js" remove="True" />
</object>
Copied: Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js (from r13637, Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js)
==============================================================================
--- Products.OrderableReferenceField/branches/alternative-widget/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js (original)
+++ Products.OrderableReferenceField/trunk/Products/OrderableReferenceField/skins/orderablereferencefield/orderablereferencebrowser.js Tue May 17 07:38:00 2011
@@ -33,9 +33,9 @@
};
}
- $(a).unbind('click').css({'cursor': 'auto'});
+ $(a).unbind('click').css({'cursor': 'auto', visibility: 'hidden'});
if (handler) {
- $(a).click(handler).css({'cursor': 'pointer', 'color': ''});
+ $(a).click(handler).css({'cursor': 'pointer', 'color': '', visibility: 'visible'});
}
});
});
Modified: Products.OrderableReferenceField/trunk/README.txt
==============================================================================
--- Products.OrderableReferenceField/trunk/README.txt (original)
+++ Products.OrderableReferenceField/trunk/README.txt Tue May 17 07:38:00 2011
@@ -4,25 +4,47 @@
This product provides an Archetype field that's very similiar to the Archetypes
Reference field, with the addition that it stores the order of referenced objects.
+You can use two different widget for manage reference order:
+
+- the ``OrderableReferenceField`` (default ones), someway similar to the
+ `InAndOutWidget`__
+- the ``OrderableReferenceBrowserWidget``, that use the default `ReferenceBrowserWidget`__
+
+__ http://plone.org/documentation/manual/developer-manual/archetypes/fields/widgets-reference#InAndOutWidget
+__ http://plone.org/documentation/manual/developer-manual/archetypes/fields/widgets-reference#ReferenceBrowserWidget
+
Usage
-----
1. Add this package to your buildout or setup.py of your custom-package
-3. Add this line to your custom Archetype to import the fields::
+3. Add one of those lines to your custom Archetype to import the fields::
from Products.OrderableReferenceField import OrderableReferenceField
+
+ or::
+
+ from Products.OrderableReferenceField import OrderableReferenceBrowserWidget
4. In your schema, add an OrderableReferenceField like this::
BaseSchema + Schema(( ...
- OrderableReferenceField('afield', relationship='somrel'),
- ...
+ OrderableReferenceField('afield', relationship='somrel'),
+ ...
))
+ in alternative, write something like this for use the other widget::
+
+ BaseSchema + Schema(( ...
+ OrderableReferenceField('afield',
+ relationship='somrel',
+ OrderableReferenceField()),
+ ...
+ ))
Credits
-------
+
- Written by Daniel Nouri <[email protected]>
- Thanks to Ilia Goranov <[email protected]> for the JavaScript
@@ -40,6 +62,10 @@
- Move install-code to GS-profiles by WouterVH
+- ``OrderableReferenceBrowserWidget`` widget added by RedTurtle Technology
+ <[email protected]>
+
Copyright
---------
+
Copyright (C) 2006 "Zest Software":http://zestsoftware.nl
Modified: Products.OrderableReferenceField/trunk/setup.py
==============================================================================
--- Products.OrderableReferenceField/trunk/setup.py (original)
+++ Products.OrderableReferenceField/trunk/setup.py Tue May 17 07:38:00 2011
@@ -5,16 +5,12 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '1.2-beta4'
+version = '1.3'
long_description = (
read('README.txt')
+ '\n' +
read('CHANGES.txt')
-# + '\n' +
-# read('Products', 'OrderableReferenceField', 'README.txt')
-# + '\n' +
-# read('CONTRIBUTORS.txt')
)
setup(name='Products.OrderableReferenceField',
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay