Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove DL's from templates. #174

Closed
wants to merge 11 commits into from
Closed

Remove DL's from templates. #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d88cba0
https://github.com/plone/Products.CMFPlone/issues/153
khink Feb 10, 2014
f20de22
Merge branch 'main_template-remove' into remove-dt-dl-dd
khink Feb 10, 2014
ed6ea61
Remove DL's from portlet templates.
khink Feb 11, 2014
57b15f5
Remove dl's from folder_listing.pt
khink Feb 12, 2014
b5a5423
Merge branch 'main_template-remove' into remove-dt-dl-dd
khink Feb 12, 2014
5df0937
Combine changelog entries for DL removal.
khink Feb 12, 2014
6ab9695
Remove DL's from various listings.
khink Feb 12, 2014
56d0dc6
Update test_rendering
khink Feb 12, 2014
65c4a80
Merge remote-tracking branch 'origin/main_template-remove' into remov…
khink Feb 12, 2014
7b0d4ed
Merge branch 'main_template-remove' into remove-dt-dl-dd
khink Feb 13, 2014
9b757f2
Merge remote-tracking branch 'origin/main_template-remove' into remov…
khink Feb 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Expand Up @@ -8,6 +8,11 @@ Changelog
5.0a1 (unreleased)
------------------

- Remove DL/DT/DD's from portal messages, portlet templates and others.
https://github.com/plone/Products.CMFPlone/issues/153
https://github.com/plone/Products.CMFPlone/issues/163
[khink]

- PLIP #13705: Remove <base> tag.
[frapell]

Expand Down
12 changes: 6 additions & 6 deletions Products/CMFPlone/skins/plone_content/author.cpt
View file
Open in desktop
Expand Up @@ -42,14 +42,14 @@
email_from_address portal/email_from_address">

<tal:noAuthor condition="not: authorinfo">
<dl class="portalMessage error">
<dt i18n:translate="">
<div class="portalMessage error">
<strong i18n:translate="">
Error
</dt>
<dd i18n:translate="text_no_user_by_name">
</strong>
<span tal:omit-tag="" i18n:translate="text_no_user_by_name">
No user by that name.
</dd>
</dl>
</span>
</div>
<div id="content">
&nbsp;
</div>
Expand Down
16 changes: 8 additions & 8 deletions Products/CMFPlone/skins/plone_content/folder_listing.pt
View file
Open in desktop
Expand Up @@ -44,8 +44,8 @@
plone_view context/@@plone;">
<tal:listing condition="batch">

<dl metal:define-slot="entries">
<tal:entry tal:repeat="item batch" metal:define-macro="entries">
<div metal:define-slot="entries">
<article tal:repeat="item batch" metal:define-macro="entries">
<tal:block tal:define="item_url item/getURL|item/absolute_url;
item_id item/getId|item/id;
item_title_or_id item/pretty_title_or_id;
Expand All @@ -64,7 +64,7 @@
item_sametime python: item_start == item_end;
item_samedate python: (item_end - item_start &lt; 1) if item_type == 'Event' else False">
<metal:block define-slot="entry">
<dt metal:define-macro="listitem"
<header metal:define-macro="listitem"
tal:attributes="class python:test(item_type == 'Event', 'vevent', '')">

<span class="summary">
Expand Down Expand Up @@ -158,18 +158,18 @@
</tal:byline>
</span>

</dt>
</header>

<dd tal:condition="item_description">
<p tal:condition="item_description">
<span class="description"
tal:content="item_description">
description
</span>
</dd>
</p>
</metal:block>
</tal:block>
</tal:entry>
</dl>
</article>
</div>

<div metal:use-macro="context/batch_macros/macros/navigation" />

Expand Down
11 changes: 6 additions & 5 deletions Products/CMFPlone/skins/plone_content/link_view.pt
View file
Open in desktop
Expand Up @@ -9,15 +9,16 @@
<body>

<metal:header fill-slot="global_statusmessage">
<dl class="portalMessage info"
<div class="portalMessage info"
tal:define="redirect_links context/portal_properties/site_properties/redirect_links|nothing"
tal:condition="python: redirect_links and checkPermission('Modify portal content', context)">
<dt i18n:translate="">Info</dt>
<dd i18n:translate="message_permissions_blocking_link_redirect">
<strong i18n:translate="">Info</strong>
<span tal:omit-tag=""
i18n:translate="message_permissions_blocking_link_redirect">
You see this page because you have permission to edit this link.
Others will be immediately redirected to the link's target URL.
</dd>
</dl>
</span>
</div>
</metal:header>

<metal:content-core fill-slot="content-core">
Expand Down
16 changes: 8 additions & 8 deletions Products/CMFPlone/skins/plone_forms/select_default_page.cpt
View file
Open in desktop
Expand Up @@ -39,9 +39,9 @@
member context/@@plone_portal_state/member;
portal_visible_ids context/portal_properties/site_properties/visible_ids|nothing;
member_visible_ids python:member.getProperty('visible_ids', context.portal_memberdata.getProperty('visible_ids'))">
<dl>
<tal:item repeat="item items">
<dt tal:define="normalized_type python:ploneview.normalizeString(item.portal_type);
<div>
<article tal:repeat="item items">
<header tal:define="normalized_type python:ploneview.normalizeString(item.portal_type);
item_icon python:ploneview.getIcon(item);
item_id python:'(%s)' % item.getId if (portal_visible_ids and member_visible_ids) else ''">
<input type="radio" name="objectId" value=""
Expand All @@ -55,13 +55,13 @@
tal:content="string:${item/pretty_title_or_id} $item_id">
Item title
</label>
</dt>
<dd tal:content="item/Description">
</header>
<p tal:content="item/Description">
Item Description
</dd>
</tal:item>
</p>
</article>

</dl>
</div>

<div class="formControls">
<input class="context"
Expand Down
12 changes: 6 additions & 6 deletions Products/CMFPlone/skins/plone_login/failsafe_login_form.cpt
View file
Open in desktop
Expand Up @@ -43,16 +43,16 @@ If you do not have an account here, head over to the
</p>


<dl class="portalMessage error"
<div class="portalMessage error"
id="enable_cookies_message"
style="display:none">
<dt i18n:translate="">
<strong i18n:translate="">
Error
</dt>
<dd i18n:translate="enable_cookies_message_before_login">
</strong>
<span tal:omit-tag="" i18n:translate="enable_cookies_message_before_login">
Cookies are not enabled. You must enable cookies before you can log in.
</dd>
</dl>
</span>
</div>


<div tal:condition="python: not auth" i18n:translate="login_form_disabled">
Expand Down
13 changes: 7 additions & 6 deletions Products/CMFPlone/skins/plone_login/login_form.cpt
View file
Open in desktop
Expand Up @@ -55,16 +55,17 @@
target python:test(target in ('_parent', '_top', '_blank', '_self'), target, None);
ztu modules/ZTUtils;">

<dl class="portalMessage error"
<div class="portalMessage error"
id="enable_cookies_message"
style="display:none">
<dt i18n:translate="">
<strong i18n:translate="">
Error
</dt>
<dd i18n:translate="enable_cookies_message_before_login">
</strong>
<span tal:omit-tag=""
i18n:translate="enable_cookies_message_before_login">
Cookies are not enabled. You must enable cookies before you can log in.
</dd>
</dl>
</span>
</div>

<div tal:condition="python: not auth" i18n:translate="login_form_disabled">
Since cookie authentication is disabled, cookie-based login is not available.
Expand Down
13 changes: 7 additions & 6 deletions Products/CMFPlone/skins/plone_login/registered.pt
View file
Open in desktop
Expand Up @@ -45,16 +45,17 @@
Click the button to log in immediately.
</p>

<dl class="portalMessage error"
<div class="portalMessage error"
id="enable_cookies_message"
style="display:none">
<dt i18n:translate="">
<strong i18n:translate="">
Error
</dt>
<dd i18n:translate="enable_cookies_message_before_login">
</strong>
<span tal:omit-tag=""
i18n:translate="enable_cookies_message_before_login">
Cookies are not enabled. You must enable cookies before you can log in.
</dd>
</dl>
</span>
</div>


<form action=""
Expand Down
14 changes: 8 additions & 6 deletions Products/CMFPlone/skins/plone_prefs/portlet_prefs.pt
View file
Open in desktop
Expand Up @@ -9,18 +9,19 @@
groups python:controlPanel.getGroups('site');
portal_url context/portal_url;">

<dl class="portlet"
<section class="portlet"
id="portlet-prefs"
tal:condition="controlPanel/maySeeSomeConfiglets">
<dt class="portletHeader">
<header class="portletHeader">
<span class="portletTopLeft"></span>
<a href=""
tal:attributes="href string:${portal_url}/plone_control_panel"
i18n:translate="">Site Setup</a>
<span class="portletTopRight"></span>
</dt>
</header>

<dd class="portletItem"
<ul class="portletContent">
<li class="portletItem"
tal:repeat="group groups">

<tal:block tal:define="configlets python:controlPanel.enumConfiglets(group=group['id'])"
Expand Down Expand Up @@ -49,9 +50,10 @@
</tal:block>
<span class="portletBottomLeft"></span>
<span class="portletBottomRight"></span>
</dd>
</li>
</ul>

</dl>
</section>

</metal:portlet>
</body>
Expand Down
13 changes: 7 additions & 6 deletions Products/CMFPlone/skins/plone_prefs/prefs_error_log_showEntry.pt
View file
Open in desktop
Expand Up @@ -27,17 +27,18 @@

<div tal:define="entry python:context.error_log.getLogEntryById(request.get('id'))">

<dl class="portalMessage error"
<div class="portalMessage error"
tal:condition="not:entry">
<dt i18n:translate="">
<strong i18n:translate="">
Error
</dt>
<dd i18n:translate="text_errlog_notfound">
</strong>
<span tal:omit-tag=""
i18n:translate="text_errlog_notfound">
The specified log entry was not found. It may have expired.
If you are using a load-balanced ZEO (cluster) setup, try
reloading until you get the right server in the cluster.
</dd>
</dl>
</span>
</div>

<div tal:condition="entry">

Expand Down
22 changes: 11 additions & 11 deletions Products/CMFPlone/skins/plone_templates/default_error_message.pt
View file
Open in desktop
Expand Up @@ -69,15 +69,15 @@

<h3 i18n:translate="heading_not_found_suggestions">You might have been looking for&hellip;</h3>

<dl>
<div>

<tal:firstparent condition="first_parent/absolute_url | nothing">
<tal:entry define="result_url first_parent/absolute_url;
<article tal:define="result_url first_parent/absolute_url;
result_type python:hasattr(first_parent, 'getTypeInfo') and first_parent.getTypeInfo().getId();
item_icon python:plone_view.getIcon(first_parent);
url python:test(result_type in use_view_action, result_url+'/view', result_url);"
tal:condition="result_type">
<dt tal:define="item_wf_state_class python:'state-' + context.portal_workflow.getInfoFor(first_parent, 'review_state', '');"
<header tal:define="item_wf_state_class python:'state-' + context.portal_workflow.getInfoFor(first_parent, 'review_state', '');"
tal:attributes="class python:'contenttype-' + normalizeString(result_type)">
<img tal:replace="structure item_icon/html_tag" />
<a
Expand All @@ -92,19 +92,19 @@
<span tal:omit-tag="" tal:content="python:toLocalizedTime(first_parent.ModificationDate(), long_format=1)" i18n:name="date">Modification Date</span>
</span>

</dt>
</header>

<dd tal:content="python:plone_view.cropText(first_parent.Description(), desc_length, desc_ellipsis)"> Description </dd>

</tal:entry>
</article>
</tal:firstparent>

<tal:similar repeat="similar similar_items">
<tal:entry define="result_url similar/getURL;
<article tal:define="result_url similar/getURL;
result_type similar/portal_type;
item_icon python:plone_view.getIcon(similar);
url python:test(result_type in use_view_action, result_url+'/view', result_url);">
<dt tal:define="item_wf_state_class string:state-${similar/review_state};"
<header tal:define="item_wf_state_class string:state-${similar/review_state};"
tal:attributes="class python:'contenttype-' + normalizeString(result_type)">
<img tal:replace="structure item_icon/html_tag" />
<a
Expand All @@ -119,14 +119,14 @@
<span tal:omit-tag="" tal:content="python:toLocalizedTime(similar.ModificationDate, long_format=1)" i18n:name="date">Modification Date</span>
</span>

</dt>
</header>

<dd tal:content="python:plone_view.cropText(similar.Description or '', desc_length, desc_ellipsis)"> Description </dd>
<p tal:content="python:plone_view.cropText(similar.Description or '', desc_length, desc_ellipsis)"> Description </p>

</tal:entry>
</article>
</tal:similar>

</dl>
</div>

</tal:suggestions>
</div>
Expand Down
15 changes: 6 additions & 9 deletions Products/CMFPlone/skins/plone_templates/recently_modified.pt
View file
Open in desktop
Expand Up @@ -38,8 +38,8 @@

<tal:results tal:repeat="result batch">

<dl tal:define="description result/Description">
<dt tal:define="item_icon python:plone_view.getIcon(result);
<div tal:define="description result/Description">
<header tal:define="item_icon python:plone_view.getIcon(result);
item_wf_state result/review_state;
item_wf_state_class python:'state-' + normalizeString(item_wf_state);">
<span tal:attributes="class python:'contenttype-' + normalizeString(result.portal_type)">
Expand All @@ -64,17 +64,14 @@
tal:omit-tag=""
i18n:name="date">date</span>
</span>
</dt>
</header>

<dd tal:condition="description"
<p tal:condition="description"
tal:content="description">
Description
</dd>
</p>

<dd tal:condition="not:description">
&nbsp;
</dd>
</dl>
</div>

</tal:results>

Expand Down
12 changes: 6 additions & 6 deletions Products/CMFPlone/skins/plone_templates/recently_published.pt
View file
Open in desktop
Expand Up @@ -36,8 +36,8 @@

<tal:results tal:repeat="result batch">

<dl>
<dt>
<article>
<header>
<img src="" alt="" style="border: 0"
tal:attributes="src result/getIcon;
alt result/Type" />
Expand All @@ -60,16 +60,16 @@
tal:omit-tag=""
i18n:name="date">date</span>
</span>
</dt>
</header>

<dd class="link">
<p class="link">
<a href="/view"
tal:content="result/Description"
tal:attributes="href result/getURL">
Description
</a>
</dd>
</dl>
</p>
</article>

</tal:results>

Expand Down