Merge pull request #1 from plone/master

pull changes from plone master

CHANGES.rst

@@ -1,14 +1,22 @@
 Changelog
 =========
 
-1.0b3 (unreleased)
+1.0b4 (unreleased)
+------------------
+
+- If we set background to 'white' we should set foreground to 'black' to avoid
+  people getting white font on white background if they use white font color
+  for their plone sites.  [saily]
+
+
+1.0b3 (2013-02-04)
 ------------------
 
 - Fixed context for getting ajax results
   [kroman0]
 
 - Fixed conditional initialization of querywidget,
-  see https://dev.plone.org/ticket/12529 [kroman0]
+  see http://dev.plone.org/ticket/12529 [kroman0]
 
 - The widget can now be hidden, when clicking on the
   window or the widget. The event is only effective
@@ -18,11 +26,14 @@ Changelog
 - Translations are now in Plone domain
   [bosim]
 
-- Made the widget a bit more resistent to missing entries, i.e. vocabularies or in 
-  other way indexes. The problem occur if an option is deleted from the registry 
-  but not deleted from the collections in before hand.
+- Made the widget a bit more resistent to missing entries, i.e. vocabularies
+  or in other way indexes. The problem occur if an option is deleted from the
+  registry but not deleted from the collections in before hand.
   [bosim]
 
+- Update import path for pagetemplate. Now only works with 4.1 and higher
+  [do3cc]
+
 
 1.0b2 (2012-03-19)
 ------------------

plone/formwidget/querystring/querywidget.css

@@ -69,11 +69,12 @@ dl.multipleSelectionWidget,
 }
 .multipleSelectionWidget dd {
     width: 198px;
-    background: white;
+    background: #FFF;
     overflow:auto;
 }
 .multipleSelectionWidget label {
     display: block;
+    color: #000;
 }
 .querywidget {
     float: left;
@@ -105,4 +106,4 @@ dl.querywidget dd {
    have the highest priority. */
 .multipleSelectionWidget .hiddenStructure {
    display: none !important;
-}
+}

plone/formwidget/querystring/widget.py

@@ -1,7 +1,7 @@
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getUtility
 from zope.component import getMultiAdapter
 from zope.interface import implements, implementer
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.site.hooks import getSite
 import z3c.form.interfaces
 import z3c.form.util

setup.py

@@ -1,32 +1,35 @@
 from setuptools import setup, find_packages
 
-version = '1.0b3'
+version = '1.0b4'
 
-setup(name='plone.formwidget.querystring',
-      version=version,
-      description="A widget for composing a Query string/search.",
-      long_description=open("README.rst").read() + "\n" +
-                       open("CHANGES.txt").read(),
-      classifiers=[
+long_description = open("README.rst").read() + "\n" + \
+    open("CHANGES.rst").read()
+
+setup(
+    name='plone.formwidget.querystring',
+    version=version,
+    description="A widget for composing a Query string/search.",
+    long_description=long_description,
+    classifiers=[
         "Framework :: Plone",
         "Programming Language :: Python",
-        ],
-      keywords='',
-      author='Plone Foundation',
-      author_email='plone-developers@lists.sourceforge.net',
-      url='https://github.com/plone/plone.formwidget.querystring',
-      license='GPL',
-      packages=find_packages(exclude=['ez_setup']),
-      namespace_packages=['plone', 'plone.formwidget'],
-      include_package_data=True,
-      zip_safe=False,
-      install_requires=[
-          'setuptools',
-          'plone.app.querystring',
-      ],
-      entry_points="""
-      # -*- Entry points: -*-
-          [z3c.autoinclude.plugin]
-          target = plone
-      """,
-      )
+    ],
+    keywords='',
+    author='Plone Foundation',
+    author_email='plone-developers@lists.sourceforge.net',
+    url='https://github.com/plone/plone.formwidget.querystring',
+    license='GPL',
+    packages=find_packages(exclude=['ez_setup']),
+    namespace_packages=['plone', 'plone.formwidget'],
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        'setuptools',
+        'plone.app.querystring',
+    ],
+    entry_points="""
+    # -*- Entry points: -*-
+        [z3c.autoinclude.plugin]
+        target = plone
+    """,
+)