Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.43.2.1 -r1.43.2.2
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	6 Feb 2014 22:45:53 -0000	1.43.2.1
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	1 Feb 2015 16:47:23 -0000	1.43.2.2
@@ -18,7 +18,6 @@
   <msg key="copy_entry">Kopiere Eintrag</msg>
   <msg key="create_new_entry_of_type">Neuen Eintrag vom Typ %type% erstellen</msg>
   <msg key="create_this_page_in_language">Erzeuge diese Seite in der folgenden Sprache:</msg>
-  <msg key="creator">Ersteller/in</msg>
   <msg key="day">Tag</msg>
   <msg key="days">Tage</msg>
   <msg key="delete">L�schen</msg>
@@ -28,7 +27,6 @@
   <msg key="delete_all_items">Alle Eintr�ge dieser Art l�schen</msg>
   <msg key="delete_confirm">L�schen best�tigen?</msg>
   <msg key="delete_title">L�sche diese Seite ...</msg>
-  <msg key="description">Kurzbeschreibung</msg>
   <msg key="details">Details</msg>
   <msg key="edit">Bearbeiten</msg>
   <msg key="edit_link">bearbeiten</msg>
@@ -100,6 +98,7 @@
   <msg key="menu-Clipboard-Use-Copy">Kopieren</msg>
   <msg key="menu-Clipboard-Use-Export">Export</msg>
   <msg key="menu-Package-ImportArchive">Archiv importieren</msg>
+  <msg key="menu-Page">Wiki-Seite</msg>
   <msg key="minute">Minute</msg>
   <msg key="minutes">Minuten</msg>
   <msg key="month">Monat</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.64.2.2 -r1.64.2.3
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	6 Feb 2014 22:45:54 -0000	1.64.2.2
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	1 Feb 2015 16:47:23 -0000	1.64.2.3
@@ -30,7 +30,7 @@
   <msg key="delete_all_items">Delete all such items of this instances</msg>
   <msg key="delete_confirm">Confirm delete?</msg>
   <msg key="delete_title">Delete this page ...</msg>
-  <msg key="details">Details</msg>
+  <msg key="details">Detail Link</msg>
   <msg key="edit">Edit</msg>
   <msg key="edit_link">edit tags</msg>
   <msg key="edit_title">Edit this page ...</msg>
@@ -59,7 +59,8 @@
   <msg key="event-location">Location</msg>
   <msg key="event-start_of_event">Start Time</msg>
   <msg key="event-start_of_lecture">Start of Lecture</msg>
-  <msg key="event-title_of_event">Title</msg>
+  <msg key="event-summary_of_event">Summary of the Event</msg>
+  <msg key="event-title_of_event">Title of the Event</msg>
   <msg key="event-title_of_lecture">Title of Lecture</msg>
   <msg key="export">Export</msg>
   <msg key="feedback">Feedback</msg>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.239.2.22 -r1.239.2.23
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	1 Feb 2015 15:26:25 -0000	1.239.2.22
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	1 Feb 2015 16:47:23 -0000	1.239.2.23
@@ -3556,6 +3556,11 @@
   #
   # ::xowiki::formfield::event
   #
+  # This formfield is rendered following the conventions of the
+  # h-event of microformats2.
+  #
+  # See: http://microformats.org/wiki/h-event
+  #
   ###########################################################
 
   Class create event -superclass CompoundField -parameter {
@@ -3574,7 +3579,8 @@
       set dtend_display_format %X
     }
     my create_components [subst {
-      {summary {richtext,required,editor=wym,height=150px,label=#xowiki.event-title_of_event#}}
+      {title {text,label=#xowiki.event-title_of_event#}}
+      {summary {richtext,required,height=150px,label=#xowiki.event-summary_of_event#}}
       {dtstart {date,required,format=DD_MONTH_YYYY_#xowiki.event-hourprefix#_HH24_MI,
         default=now,label=#xowiki.event-start_of_event#,display_format=%Q_%X}}
       {dtend   date,format=$dtend_format,default=now,label=#xowiki.event-end_of_event#,display_format=$dtend_display_format}
@@ -3605,16 +3611,22 @@
     set dtstart [my get_component dtstart]
     set dtstart_val [$dtstart value]
     set dtstart_iso [::xo::ical clock_to_iso [clock scan $dtstart_val]]
+    set dtstart_pretty [$dtstart pretty_value $dtstart_val]
 
     set dtend [my get_component dtend]
     set dtend_val [$dtend value]
     set dtend_txt ""
     if {$dtend_val ne ""} {
       set dtend_iso [::xo::ical clock_to_iso [clock scan $dtend_val]]
-      set dtend_txt " - <abbr class='dtend' title='$dtend_iso'>[$dtend pretty_value $dtend_val]</abbr>"
+      set dtend_txt " - <time class='dt-end' title='$dtend_iso'>[$dtend pretty_value $dtend_val]</time>"
     }
 
-    set summary_txt "<span class='summary'>[[my get_component summary] value]</span>"
+    set title_val   [[my get_component title] value]
+    if {$title_val eq ""} {
+      set title_val [[my object] property _title]
+    }
+    set summary_val [[my get_component summary] value]
+
     set location [my get_component location]
     set location_val [$location value]
     set location_txt ""
@@ -3623,16 +3635,18 @@
       if {[regexp {^#(.+)#$} $location_label _ msg_key]} {
         set location_label [lang::message::lookup [my locale] $msg_key]
       }
-      set location_txt "$location_label: <span class='location'>$location_val</span>"
+      set location_txt "<tr><td>$location_label:</td><td><span class='p-location'>$location_val</span></td></tr>"
     }
 
-    append result \
-        "<div class='vevent'>" \
-        $summary_txt " " \
-        "<abbr class='dtstart' title='$dtstart_iso'>[$dtstart pretty_value $dtstart_val]</abbr>" \
-        $dtend_txt <br> \
-        $location_txt \
-        "</div>" 
+    append result \n\
+        "<div class='h-event'>" \n\
+        "<h1 class=p-name>$title_val</h1>" \n\
+        "<p class='p-summary'>$summary_val</p>" "<br> " \n\
+        "<table>" \n\
+        "<tr><td>Time:</td><td><time class='dt-start' datetime='$dtstart_iso'>$dtstart_pretty</time> $dtend_txt</td></tr>" \n\
+        $location_txt \n\
+        "</table>" \n\
+        "</div>" \n
     return $result
   }
 }
Index: openacs-4/packages/xowiki/www/prototypes/announcement-talk.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/announcement-talk.form.page,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/xowiki/www/prototypes/announcement-talk.form.page	13 Sep 2012 16:05:36 -0000	1.3
+++ openacs-4/packages/xowiki/www/prototypes/announcement-talk.form.page	1 Feb 2015 16:47:24 -0000	1.3.2.1
@@ -5,17 +5,15 @@
     -title "Talk Announcement" \
     -set creator "Gustaf Neumann" \
     -set anon_instances t \
-    -set form {{<form> @_title@ @detail_link@ @event@ @_text@ @_description@ @_publish_date@ @_nls_language@ @_publish_status@</form>} text/html} \
+    -set form {{<form> @_title@ @event@ @detail_link@ @_description@ @_publish_date@ @_nls_language@ @_publish_status@</form>} text/html} \
     -set text {<blockquote>@event@</blockquote> 
-<p>Abstract: @_text@<br />@detail_link@</p>} \
+	<p>@_text@<br />@detail_link@</p>} \
     -set form_constraints {
-      _title:text,label=#xowiki.title_of_event#
-     _text:richtext,editor=wym,label=#xowiki.abstract#
      {event:event,label=#xowiki.event#}
      {detail_link:detail_link,label=#xowiki.details#}
      {_publish_status:radio,options={live ready} {draft production},label=#xowiki.publish_status#}
      {_description:textarea,rows=3,label=#xowiki.news-teaser#}
-     _page_order:hidden _creator:hidden
+     _page_order:hidden _creator:hidden _text:hidden
     }