Merge pull request #287 from 'update-resources'

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-\ (unreleased)
+3.2.0 (unreleased)
 --------------
 
 Breaking changes:
@@ -14,7 +14,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Update plone.app.event resources. Requires plonetheme.barceloneta >= 1.9.
+  [agitator]
 
 
 3.1.1 (2018-06-04)

plone/app/event/browser/configure.zcml

@@ -1,14 +1,14 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:plone="http://namespaces.plone.org/plone"
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="plone">
 
-    <browser:resourceDirectory
+    <plone:static
         name="plone.app.event"
+        type="plone"
         directory="resources"
-        permission="zope.Public"
-        layer="..interfaces.IBrowserLayer"
         />
 
     <!-- Event listing -->

plone/app/event/browser/event_listing.pt

@@ -63,61 +63,10 @@
           </a></h2>
           <div class="documentByLine">
             <tal:date tal:replace="structure python:view.formatted_date(data)"/>
-            <div itemprop="location" class="location"
-                tal:condition="data/location"
-                tal:content="data/location">location</div>
           </div>
 
           <p itemprop="description" class="description" tal:condition="data/description" tal:content="data/description" />
 
-          <ul class="horizontal metadata">
-
-            <li tal:condition="data/subjects" itemprop="eventType" class="category">
-              <span tal:repeat="cat data/subjects" tal:content="cat" />
-            </li>
-
-            <li tal:condition="data/event_url">
-              <a class="event_url" title="External Website"
-                  tal:attributes="href data/event_url"
-                  i18n:attributes="title external_website"
-                  i18n:translate="label_web">Web</a>
-            </li>
-
-            <li tal:define="contact_email data/contact_email|nothing;
-                            contact_name data/contact_name|nothing"
-                tal:condition="contact_email|contact_name">
-              <span tal:condition="contact_email">
-                <i18n:label_email translate="label_email">Email</i18n:label_email>:
-              </span>
-              <a class="contact_email" title=""
-                  tal:omit-tag="not:contact_email"
-                  tal:attributes="href string:mailto:${contact_email}; title contact_name">
-                <span tal:condition="python:contact_email and not contact_name"
-                      tal:replace="contact_email">Email</span>
-                <span tal:condition="contact_name" tal:content="contact_name"/>
-              </a>
-            </li>
-
-            <li tal:condition="data/contact_phone" title="Phone" i18n:attributes="title label_phone">
-              <span i18n:translate="label_phone">Phone</span>:
-              <a class="contact_phone" title=""
-                  tal:attributes="href string:tel:${data/contact_phone}"
-                  tal:content="data/contact_phone">123</a>
-            </li>
-
-            <li>
-              <a class="event_ical" rel="nofollow"
-                  tal:define="portal_url context/@@plone_portal_state/portal_url;"
-                  tal:attributes="href string:${data/url}/ics_view"
-                  title="Download this event in iCal format"
-                  i18n:attributes="title title_add_to_ical;">
-                <img src="" alt=""
-                    tal:attributes="src string:${portal_url}/++resource++plone.app.event/calendar-o.svg" width="12" height="12" />
-                <span i18n:translate="label_add_to_ical">iCal</span>
-              </a>
-            </li>
-
-          </ul>
 
         </div>
 

plone/app/event/browser/event_summary.pt

@@ -124,8 +124,8 @@
              tal:attributes="href string:$here_url/ics_view"
              title="Download this event in iCal format"
              i18n:attributes="title title_add_to_ical;">
-            <img src="" alt=""
-                tal:attributes="src string:${portal_url}/++resource++plone.app.event/icon_export_ical.png"/>
+            <img src="" alt="" width="14" height="14" class="icalIcon"
+                tal:attributes="src string:${portal_url}/++plone++plone.app.event/calendar.svg"/>
             <span i18n:translate="label_add_to_ical">iCal</span></a>
         </tal:span>
       </li>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<registry>
+
+  <records prefix="plone.resources/plone-app-event"
+            interface='Products.CMFPlone.interfaces.IResourceRegistry'>
+      <value key="js">++plone++plone.app.event/event.js</value>
+  </records>
+  <records prefix="plone.bundles/plone-legacy"
+            interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="resources" purge="false">
+      <element>plone-app-event</element>
+    </value>
+    <value key="last_compilation"></value>
+  </records>
+
+</registry>