Skip to content

Commit

Permalink
wrap messages in container
Browse files Browse the repository at this point in the history
  • Loading branch information
pbauer committed Feb 19, 2024
1 parent 67c1709 commit b49b097
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 61 deletions.
68 changes: 36 additions & 32 deletions plone/app/iterate/browser/info_baseline.pt
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
<div class="portalMessage ${python:display_info['cssclass']}"
tal:define="working_copy view/working_copy;
isAnon context/@@plone_portal_state/anonymous;
display_info python:view.display_info_for_mtype('warning');
icons nocall: context/@@iconresolver;
"
i18n:domain="plone"
tal:condition="python: not isAnon"
role="alert">
<div class="container">
<div class="portalMessage ${python:display_info['cssclass']}"
role="alert"
tal:define="
working_copy view/working_copy;
isAnon context/@@plone_portal_state/anonymous;
display_info python:view.display_info_for_mtype('warning');
icons nocall: context/@@iconresolver;
"
tal:condition="python: not isAnon"
i18n:domain="plone"
>

<tal:icon tal:replace="structure python:icons.tag(display_info['icon'], tag_alt=display_info['msg'], tag_class='statusmessage-icon mb-1 me-2')" />

<strong>${python:display_info['msg']}</strong>
<tal:block i18n:translate="working_copy_info">
This item is being edited by
<a tal:content="view/creator_name"
tal:omit-tag="not: view/creator_url"
tal:attributes="
href view/creator_url;
"
i18n:name="creator"
>john smith</a>
<a tal:content="view/creator_name"
tal:omit-tag="not: view/creator_url"
tal:attributes="
href view/creator_url;
"
i18n:name="creator"
>john smith</a>
in
<a tal:attributes="
href working_copy/@@plone_context_state/view_url;
title working_copy/Description;
"
i18n:name="working_copy"
i18n:translate="label_working_copy"
>a working copy</a>
<a tal:attributes="
href working_copy/@@plone_context_state/view_url;
title working_copy/Description;
"
i18n:name="working_copy"
i18n:translate="label_working_copy"
>a working copy</a>
created on
<span tal:content="view/created"
i18n:name="created"
></span>.
<span tal:content="view/created"
i18n:name="created"
></span>.

</tal:block>
</tal:block>

(<a tal:attributes="
href string:${context/absolute_url}/@@iterate_diff;
"
i18n:translate="label_view_changes"
>View changes</a>)
(<a tal:attributes="
href string:${context/absolute_url}/@@iterate_diff;
"
i18n:translate="label_view_changes"
>View changes</a>)
</div>
</div>
62 changes: 33 additions & 29 deletions plone/app/iterate/browser/info_checkout.pt
Original file line number Diff line number Diff line change
@@ -1,42 +1,46 @@
<div class="portalMessage ${python:display_info['cssclass']}"
tal:define="baseline view/baseline;
display_info python:view.display_info_for_mtype('warning');
icons nocall: context/@@iconresolver;
"
i18n:domain="plone">
<div class="container">
<div class="portalMessage ${python:display_info['cssclass']}"
tal:define="
baseline view/baseline;
display_info python:view.display_info_for_mtype('warning');
icons nocall: context/@@iconresolver;
"
i18n:domain="plone"
>

<tal:icon tal:replace="structure python:icons.tag(display_info['icon'], tag_alt=display_info['msg'], tag_class='statusmessage-icon mb-1 me-2')" />

<strong>${python:display_info['msg']}</strong>
<tal:block i18n:translate="checkout_info">

This is a working copy of
<a tal:content="baseline/Title"
tal:attributes="
href baseline/@@plone_context_state/view_url;
title baseline/Description;
"
i18n:name="baseline_title"
></a>, made by
<a tal:content="baseline/Title"
tal:attributes="
href baseline/@@plone_context_state/view_url;
title baseline/Description;
"
i18n:name="baseline_title"
></a>, made by

<a tal:content="view/creator_name"
tal:omit-tag="not: view/creator_url"
tal:attributes="
href view/creator_url;
"
i18n:name="creator"
>john smith</a>
<a tal:content="view/creator_name"
tal:omit-tag="not: view/creator_url"
tal:attributes="
href view/creator_url;
"
i18n:name="creator"
>john smith</a>

on

<span tal:content="view/created"
i18n:name="created"
></span>.
</tal:block>
<span tal:content="view/created"
i18n:name="created"
></span>.
</tal:block>

(<a tal:attributes="
href string:${context/absolute_url}/@@iterate_diff;
"
i18n:translate="view_changes"
>View changes</a>)
(<a tal:attributes="
href string:${context/absolute_url}/@@iterate_diff;
"
i18n:translate="view_changes"
>View changes</a>)
</div>
</div>

0 comments on commit b49b097

Please sign in to comment.