summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortdesvenain <thomas.desvenain@gmail.com>2013-03-22 10:43:18 (GMT)
committertdesvenain <thomas.desvenain@gmail.com>2013-03-22 10:43:18 (GMT)
commit4c5619daab89be52d9dd4242882109b180483758 (patch)
treecf0bd42fdeedc11ec948a1c901beac0919419dc3
parentbe51fd95365ed44c7cfd4bbf9e9c9ef4430c2225 (diff)
parent3f6dcd9edcd4bf3d8e6715637818bbe467c5622f (diff)
downloadcollective.contact.widget-4c5619daab89be52d9dd4242882109b180483758.zip
collective.contact.widget-4c5619daab89be52d9dd4242882109b180483758.tar.gz
collective.contact.widget-4c5619daab89be52d9dd4242882109b180483758.tar.bz2
Merge branch 'master' of git://github.com/collective/collective.contact.widget
-rw-r--r--README.rst6
-rw-r--r--buildout.d/base.cfg6
-rw-r--r--buildout.d/development.cfg3
-rw-r--r--buildout.d/jenkins.cfg4
-rw-r--r--setup.py2
-rw-r--r--src/collective/contact/widget/configure.zcml2
-rw-r--r--src/collective/contact/widget/widgets.py1
7 files changed, 13 insertions, 11 deletions
diff --git a/README.rst b/README.rst
index d255bdf..e384e45 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,3 @@
-====================
-collective.contact
-==================== \ No newline at end of file
+========================
+collective.contact.widget
+=========================
diff --git a/buildout.d/base.cfg b/buildout.d/base.cfg
index 109db7f..5d44318 100644
--- a/buildout.d/base.cfg
+++ b/buildout.d/base.cfg
@@ -1,9 +1,9 @@
[buildout]
-package-name = collective.contact
+package-name = collective.contact.widget
package-extras = [test]
extends =
- https://raw.github.com/collective/buildout.plonetest/master/plone-4.2.3.cfg
+ https://raw.github.com/collective/buildout.plonetest/master/plone-4.2.x.cfg
checkouts.cfg
sources.cfg
versions.cfg
@@ -12,4 +12,4 @@ develop = .
eggs +=
Pillow
- ipdb \ No newline at end of file
+ ipdb
diff --git a/buildout.d/development.cfg b/buildout.d/development.cfg
index fb71c25..dd14229 100644
--- a/buildout.d/development.cfg
+++ b/buildout.d/development.cfg
@@ -10,13 +10,14 @@ eggs +=
collective.profiler
extensions +=
- buildout.dumppickedversions
mr.developer
parts +=
omelette
test
+show-picked-versions = true
+
[omelette]
recipe = collective.recipe.omelette
eggs = ${test:eggs}
diff --git a/buildout.d/jenkins.cfg b/buildout.d/jenkins.cfg
index 21087d8..7547521 100644
--- a/buildout.d/jenkins.cfg
+++ b/buildout.d/jenkins.cfg
@@ -5,7 +5,7 @@ extends =
https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg
jenkins-test-eggs = ${buildout:package-name} ${buildout:package-extras}
-jenkins-test-directories = src/collective/contact
+jenkins-test-directories = src/collective/contact/widget
parts += pylint
@@ -21,4 +21,4 @@ arguments = [
'--reports=y',
'--disable=E0611,F0401,W0232,E1101,C0103,C0111,R0201,W0201,R0911,R0904,F0220,E1103,R0901,E0211,E0213,E1002,W0622,C0301,W0212,R0903',
'--generated-members=objects',
- ] + (sys.argv[1:] or ["${buildout:jenkins-test-directories}"]) \ No newline at end of file
+ ] + (sys.argv[1:] or ["${buildout:jenkins-test-directories}"])
diff --git a/setup.py b/setup.py
index e0c6294..895ab49 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-"""Installer for the collective.contact package."""
+"""Installer for the collective.contact.widget package."""
from setuptools import find_packages
from setuptools import setup
diff --git a/src/collective/contact/widget/configure.zcml b/src/collective/contact/widget/configure.zcml
index 4b85a6f..59b9e2e 100644
--- a/src/collective/contact/widget/configure.zcml
+++ b/src/collective/contact/widget/configure.zcml
@@ -4,7 +4,7 @@
xmlns:grok="http://namespaces.zope.org/grok"
xmlns:i18n="http://namespaces.zope.org/i18n"
xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
- i18n_domain="collective.contact">
+ i18n_domain="collective.contact.widget">
<i18n:registerTranslations directory="locales" />
diff --git a/src/collective/contact/widget/widgets.py b/src/collective/contact/widget/widgets.py
index 24fcae2..17f9abc 100644
--- a/src/collective/contact/widget/widgets.py
+++ b/src/collective/contact/widget/widgets.py
@@ -154,6 +154,7 @@ $('#%(id)s-autocomplete').find('.%(klass)s'
subtype: 'ajax',
filter: common_content_filter+',#viewlet-below-content>*',
formselector: '%(formselector)s',
+ cssclass: 'overlay-contact-addnew',
closeselector: '%(closeselector)s',
noform: function(el, pbo) {return ccw.fill_autocomplete(el, pbo, 'close');},
config: {