remove traces of plone.formwidget.datetime

base-test.cfg

@@ -15,7 +15,6 @@ eggs =
     icalendar [test]
     plone.app.event [test]
     plone.event [test]
-    plone.formwidget.datetime [archetypes,z3cform,test]
     plone.formwidget.recurrence [archetypes,z3cform,test]
 
 [coverage-test]

base.cfg

@@ -13,7 +13,6 @@ auto-checkout =
     icalendar
     jquery.recurrenceinput.js
     plone.event
-    plone.formwidget.datetime
     plone.formwidget.recurrence
 
 [pae_remotes]
@@ -29,7 +28,6 @@ Products.DateRecurringIndex  = git ${pae_remotes:collective}/Products.DateRecurr
 icalendar                    = git ${pae_remotes:collective}/icalendar.git pushurl=${pae_remotes:collective_push}/icalendar.git
 jquery.recurrenceinput.js    = git ${pae_remotes:collective}/jquery.recurrenceinput.js.git egg=false pushurl=${pae_remotes:collective_push}/jquery.recurrenceinput.js.git
 plone.event                  = git ${pae_remotes:plone}/plone.event.git pushurl=${pae_remotes:plone_push}/plone.event.git
-plone.formwidget.datetime    = git ${pae_remotes:plone}/plone.formwidget.datetime.git pushurl=${pae_remotes:plone_push}/plone.formwidget.datetime.git
 plone.formwidget.recurrence  = git ${pae_remotes:plone}/plone.formwidget.recurrence.git pushurl=${pae_remotes:plone_push}/plone.formwidget.recurrence.git
 
 [instance]

docs/architectural-overview.rst

@@ -42,7 +42,7 @@ CalendarTool (portal_calendar) was reimplenented. Important settings from the
 calendar-controlpanel are now available in the event configlet. Since the
 calendar portlet was the only consumer of the CalendarTool, the CalendarTool,
 the calendar controlpanel and the dependency to Products.CMFCalendar can be
-dropped. The new plone.formwidget.datetime implements archetypes and z3cform
+dropped. The new plone.app.widgets package implements archetypes and z3cform
 based widgets, so the old datetime widget can be dropped. Python-dateutil
 provides recurrence calculations based on the RFC5545 standard -
 plone.formwidget.recurrence provides a awidget for recurrence and

plone/app/event/at/content.py

@@ -18,13 +18,12 @@
 from plone.app.event.base import default_end as default_end_dt
 from plone.app.event.base import default_start as default_start_dt
 from plone.app.event.base import default_timezone
-from plone.app.event.base import first_weekday
-from plone.app.event.base import wkday_to_mon1
 from plone.event.interfaces import IEvent
 from plone.event.interfaces import IEventAccessor
 from plone.event.utils import pydt
 from plone.event.utils import utc
-from plone.formwidget.datetime.at import DatetimeWidget
+from plone.app.widgets.at import DatetimeWidget
+from plone.app.widgets.utils import first_weekday
 from plone.formwidget.recurrence.at.widget import RecurrenceWidget
 from plone.indexer import indexer
 from plone.uuid.interfaces import IUUID
@@ -43,10 +42,6 @@ def default_end():
     return DT(default_end_dt())
 
 
-def first_weekday_sun0():
-    return wkday_to_mon1(first_weekday())
-
-
 ATEventSchema = ATContentTypeSchema.copy() + atapi.Schema((
 
     atapi.DateTimeField(
@@ -66,8 +61,7 @@ def first_weekday_sun0():
                 u'help_event_start',
                 default=u"Date and Time, when the event begins."
             ),
-            with_time=1,
-            first_day=first_weekday_sun0,
+            pattern_options={'date': {'firstDay': first_weekday}},
         ),
     ),
 
@@ -88,8 +82,7 @@ def first_weekday_sun0():
                 u'help_event_end',
                 default=u"Date and Time, when the event ends."
             ),
-            with_time=1,
-            first_day=first_weekday_sun0,
+            pattern_options={'date': {'firstDay': first_weekday}},
         ),
     ),
 
@@ -165,7 +158,7 @@ def first_weekday_sun0():
             startFieldYear='startDate-year',
             startFieldMonth='startDate-month',
             startFieldDay='startDate-day',
-            first_day=first_weekday_sun0,
+            first_day=first_weekday,
             show_repeat_forever=False
         ),
     ),

plone/app/event/configure.zcml

@@ -12,7 +12,6 @@
   <include package="plone.browserlayer" /> 
   <include package="plone.event" />
   <include package="plone.formwidget.recurrence" />
-  <include package="plone.formwidget.datetime" />
   <include package="plone.app.portlets" />
   <include package="plone.app.registry" />
 

plone/app/event/dx/behaviors.py

@@ -25,7 +25,6 @@
 from plone.event.utils import pydt
 from plone.event.utils import tzdel
 from plone.event.utils import utc
-from plone.formwidget.datetime.z3cform.widget import DatetimeWidget
 from plone.formwidget.recurrence.z3cform.field import RecurrenceField
 from plone.formwidget.recurrence.z3cform.widget import RecurrenceFieldWidget
 from plone.indexer import indexer
@@ -144,20 +143,6 @@ def validate_start_end(data):
                   default=u"End date must be after start date.")
             )
 
-@adapter(getSpecification(IEventBasic['start']), IPloneFormLayer)
-@implementer(IFieldWidget)
-def StartDateFieldWidget(field, request):
-    widget = FieldWidget(field, DatetimeWidget(request))
-    widget.first_day = first_weekday_sun0
-    return widget
-
-
-@adapter(getSpecification(IEventBasic['end']), IPloneFormLayer)
-@implementer(IFieldWidget)
-def EndDateFieldWidget(field, request):
-    widget = FieldWidget(field, DatetimeWidget(request))
-    widget.first_day = first_weekday_sun0
-    return widget
 
 def default_start(data):
     return default_start_dt(data.context)

plone/app/event/profiles/default/metadata.xml

@@ -3,7 +3,6 @@
   <version>12</version>
   <dependencies>
     <dependency>profile-plone.app.registry:default</dependency>
-    <dependency>profile-plone.formwidget.datetime:default</dependency>
     <dependency>profile-plone.formwidget.recurrence:default</dependency>
   </dependencies>
 </metadata>

plone/app/event/tests/test_atevent.py

@@ -23,7 +23,7 @@
 from plone.event.interfaces import IEventAccessor
 from plone.event.interfaces import IEventRecurrence
 from plone.event.utils import pydt
-from plone.formwidget.datetime.at import DatetimeWidget
+from plone.app.widgets.at import DatetimeWidget
 from plone.formwidget.recurrence.at.widget import RecurrenceValidator
 from plone.formwidget.recurrence.at.widget import RecurrenceWidget
 from zope.event import notify

setup.py

@@ -51,7 +51,6 @@
         'plone.app.vocabularies',
         'plone.browserlayer',
         'plone.event>=1.0',
-        'plone.formwidget.datetime',
         'plone.formwidget.recurrence',
         'plone.formwidget.namedfile',
         'plone.memoize',
@@ -81,7 +80,7 @@
             'Products.Archetypes',
             'plone.app.imaging',
             'Products.contentmigration',
-            'plone.formwidget.datetime [archetypes]',
+            'plone.app.widgets [archetypes]',
             'plone.formwidget.recurrence [archetypes]',
         ],
         'dexterity': [
@@ -90,7 +89,7 @@
             'plone.autoform>=1.4',
             'plone.behavior',
             'plone.dexterity',
-            'plone.formwidget.datetime [z3cform]',
+            'plone.app.widgets [dexterity]',
             'plone.formwidget.recurrence [z3cform]',
             'plone.indexer',
             'plone.supermodel',

sources.cfg

@@ -6,7 +6,6 @@ auto-checkout +=
     jquery.recurrenceinput.js
     plone.event
     plone.app.event
-    plone.formwidget.datetime
     plone.formwidget.recurrence
 
 # plone.app.event source is included here, so this file can be used to extend
@@ -25,7 +24,6 @@ icalendar                    = git ${pae_remotes:collective}/icalendar.git pushu
 jquery.recurrenceinput.js    = git ${pae_remotes:collective}/jquery.recurrenceinput.js.git egg=false pushurl=${pae_remotes:collective_push}/jquery.recurrenceinput.js.git
 plone.app.event              = git ${pae_remotes:plone}/plone.app.event.git pushurl=${pae_remotes:plone_push}/plone.app.event.git
 plone.event                  = git ${pae_remotes:plone}/plone.event.git pushurl=${pae_remotes:plone_push}/plone.event.git
-plone.formwidget.datetime    = git ${pae_remotes:plone}/plone.formwidget.datetime.git pushurl=${pae_remotes:plone_push}/plone.formwidget.datetime.git
 plone.formwidget.recurrence  = git ${pae_remotes:plone}/plone.formwidget.recurrence.git pushurl=${pae_remotes:plone_push}/plone.formwidget.recurrence.git
 
 [versions]