Remove DL's from portal message templates.

CHANGES.rst

@@ -4,6 +4,10 @@ Changelog
 1.2.2 (unreleased)
 ------------------
 
+- Remove DL's from portal message templates.
+  https://github.com/plone/Products.CMFPlone/issues/153
+  [khink]
+
 - Fix ruleset registry test isolation so that is no longer order dependent.
   [jone]
 

README.rst

@@ -2,31 +2,46 @@
 plone.app.caching
 =================
 
-
 Introduction
 ============
 
-``plone.app.caching`` provides a Plone UI and default rules for managing HTTP response caching in Plone. It builds on ``z3c.caching``, ``plone.caching`` and ``plone.cachepurging``.
+``plone.app.caching`` provides a Plone UI and default rules for managing HTTP response caching in Plone.
+It builds on ``z3c.caching``, ``plone.caching`` and ``plone.cachepurging``.
 
 ``plone.app.caching`` requires Plone 4 or later.
 
-
 Installation
 ============
 
-From Plone 4.1 onwards, ``plone.app.caching`` is shipped as a dependancy of Plone. It is available from the Control Panel, but not enabled by default. You can enable it from the "add-ons" menu option.
+Plone >=4.1
+-----------
+
+**From Plone 4.1 onwards, ``plone.app.caching`` is shipped as a dependency of Plone core.**
+
+It is available from the Control Panel, but **not enabled by default**.
+You can enable it from the "add-ons" menu option.
 
-Installation on Plone 4.0
-=========================
+Plone 4.0
+---------
 
-To install ``plone.app.caching``, add it to the ``eggs`` list in your ``buildout.cfg``, or as a dependency of one of your own packages in ``setup.py``. ZCML configuration will be automatically loaded via a ``z3c.autoinclude`` entry point. You will also need to install the package in Plone's Add-ons control panel as normal.
+Add ``plone.app.caching`` to the ``eggs`` list in your ``buildout.cfg``, or as a dependency of one of your own packages in ``setup.py``.
+ZCML configuration will be automatically loaded via a ``z3c.autoinclude`` entry point.
+You will also need to install the package in Plone's Add-ons control panel as normal.
 
-This package depends on a number of other packages, including ``z3c.form`` and ``plone.app.registry``, that do not ship with Plone.
-You will probably want to lock down the versions for those packages using a known good set. Add this to the the ``extends`` line in your ``buildout.cfg``, *after* the line that includes the Plone KGS::
+This package depends on a number of other packages, including ``z3c.form`` and ``plone.app.registry``, that do not ship with Plone 4.0.
+You will probably want to lock down the versions for those packages using a known good set.
+Add this to the the ``extends`` line in your ``buildout.cfg``, *after* the line that includes the Plone KGS::
 
     extends =
         ...
         http://good-py.appspot.com/release/plone.app.caching/1.0a1
 
-Update the version number at the end of the URL as appropriate. You can find an overview of the versions
-`here <http://good-py.appspot.com/release/plone.app.caching>`_
+Update the version number at the end of the URL as appropriate.
+You can find here an `overview of the versions <http://good-py.appspot.com/release/plone.app.caching>`_
+
+Source Code
+===========
+
+Contributors please read the document `Process for Plone core's development <http://docs.plone.org/develop/plone-coredev/index.html>`_
+
+Sources are at the `Plone code repository hosted at Github <https://github.com/plone/plone.app.caching>`_.

plone/app/caching/browser/controlpanel.pt

@@ -63,20 +63,22 @@
             <div metal:use-macro="context/global_statusmessage/macros/portal_message">
             Portal status message
             </div>
-            <dl class="portalMessage info" tal:condition="not: view/settings/enabled">
-                <dt i18n:translate="">
+            <div class="portalMessage info"
+                tal:condition="not: view/settings/enabled">
+                <strong i18n:translate="">
                     Info
-                </dt>
-                <dd i18n:translate="label_caching_first_time_here?">
+                </strong>
+                <span tal:omit-tag=""
+                    i18n:translate="label_caching_first_time_here?">
                     First time here? We recommend that you get started by
                     <a href="@@caching-controlpanel-import"
                        tal:attributes="href string:${context/absolute_url}/@@caching-controlpanel-import"
                        title="Import caching rules"
                        i18n:name="link"
                        i18n:translate="label_caching_first_time_here_link"
                        >importing a preconfigured caching set of rules</a>.
-                </dd>
-            </dl>
+                </span>
+            </div>
 
             <div class="configlet">
 

plone/app/caching/browser/purge.pt

@@ -68,13 +68,16 @@
                     them manually below.
                 </p>
 
-                <dl tal:condition="view/purgeLog | nothing" class="portalMessage info">
-                    <dt i18n:translate="heading_purged">Status</dt>
-                    <dd i18n:translate="description_purged">
+                <div class="portalMessage info"
+                     tal:condition="view/purgeLog | nothing">
+                    <strong i18n:translate="heading_purged">Status</strong>
+                    <span tal:omit-tag="" i18n:translate="description_purged">
                         The following items were purged:
-                    </dd>
-                    <dd tal:repeat="log view/purgeLog" tal:content="log" />
-                </dl>
+                    </span>
+                    <ul>
+                      <li tal:repeat="log view/purgeLog" tal:content="log" />
+                    </ul>
+                </div>
 
                 <form name="purge" tal:attributes="action string:${request/URL}" method="post"
                     tal:define="errors view/errors">