Merge branch 'master' of git://github.com/collective/collective.contact.widget

This commit is contained in:
tdesvenain 2013-03-22 11:43:18 +01:00
commit 4c5619daab
7 changed files with 13 additions and 11 deletions

View File

@ -1,3 +1,3 @@
====================
collective.contact
====================
========================
collective.contact.widget
=========================

View File

@ -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
ipdb

View File

@ -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}

View File

@ -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}"])
] + (sys.argv[1:] or ["${buildout:jenkins-test-directories}"])

View File

@ -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

View File

@ -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" />

View File

@ -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: {