Skip to content

Commit f9f9172

Browse files
libargutxilibargutxi
committed
spacer
1 parent 4f4c33f commit f9f9172

File tree

4 files changed

+105
-97
lines changed

4 files changed

+105
-97
lines changed

‎src/cs_dynamicpages/views/accordion_view.pt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
<div class="accordion accordion-flush" id="accordionDynamicPage" tal:define="
1+
<div class="accordion accordion-flush" id="accordionDynamicPage-${context/id}" tal:define="
22
elements view/elements;
33
" tal:condition="elements">
44
<div class="accordion-item" tal:repeat="brain elements">
55
<div class="accordion-header h3">
6-
<button class="accordion-button collapsed" aria-controls="flush-${brain/id}" aria-expanded="false" type="button"
7-
data-bs-target="#${brain/id}" data-bs-toggle="collapse">
6+
<button class="accordion-button collapsed" aria-controls="accordionDynamicPage-${context/id}-${brain/id}"
7+
aria-expanded="false" type="button" data-bs-target="#accordionDynamicPage-${context/id}-${brain/id}"
8+
data-bs-toggle="collapse">
89
${brain/Title}
910
</button>
1011
</div>
11-
<div class="accordion-collapse collapse" id="${brain/id}" data-bs-parent="#accordionDynamicPage">
12+
<div class="accordion-collapse collapse" id="accordionDynamicPage-${context/id}-${brain/id}"
13+
data-bs-parent="#accordionDynamicPage-${context/id}">
1214
<div class="accordion-body" tal:define="
1315
element brain/getObject;
1416
">

‎src/cs_dynamicpages/views/configure.zcml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@
5959
name="cs_dynamicpages-horizontal-rule-view"
6060
template="horizontal_rule_view.pt"
6161
/>
62+
63+
<browser:page
64+
name="cs_dynamicpages-spacer-view"
65+
template="spacer_view.pt"
66+
/>
67+
6268
<browser:page
6369
name="cs_dynamicpages-text-view"
6470
template="text_view.pt"

‎src/cs_dynamicpages/views/dynamic_view.pt‎

Lines changed: 90 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -10,109 +10,106 @@
1010
rows view/rows;
1111
">
1212
<tal:featured repeat="brain rows">
13-
<div tal:define="row brain/getObject;">
14-
<section class="dynamic-row state-${row/review_state}" data-elementid="${row/id}"
15-
data-elementurl="${row/absolute_url}" data-parenturl="${row/aq_parent/absolute_url}"
16-
data-delete-target="true" data-move-target="true">
17-
<div class="edit-buttons d-flex gap-2" tal:condition="row/can_edit">
18-
<small
19-
class="d-inline-flex mb-3 px-2 py-1 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-2 position-relative">
20-
Template: ${row/row_template}
21-
</small>
22-
<!-- <a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}">View</a> -->
23-
<a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}/edit">Edit</a>
24-
<a class="btn btn-sm btn-danger align-self-start btn-delete-element" href="#" data-bs-toggle="modal"
25-
data-bs-target="#deleteElementModal" data-rowid="${row/id}">Delete row</a>
13+
<section tal:define="row brain/getObject;" class="dynamic-row ${row/row_template} state-${row/review_state}"
14+
data-elementid="${row/id}" data-elementurl="${row/absolute_url}"
15+
data-parenturl="${row/aq_parent/absolute_url}" data-delete-target="true" data-move-target="true">
16+
<div class="edit-buttons d-flex gap-2" tal:condition="row/can_edit">
17+
<small
18+
class="d-inline-flex mb-3 px-2 py-1 fw-semibold text-warning-emphasis bg-warning-subtle border border-warning-subtle rounded-2 position-relative">
19+
Template: ${row/row_template}
20+
</small>
21+
<!-- <a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}">View</a> -->
22+
<a class="btn btn-outline-primary btn-sm align-self-start" href="${row/absolute_url}/edit">Edit</a>
23+
<a class="btn btn-sm btn-danger align-self-start btn-delete-element" href="#" data-bs-toggle="modal"
24+
data-bs-target="#deleteElementModal" data-rowid="${row/id}">Delete row</a>
2625

27-
<div class="ms-auto d-flex gap-2 align-items-start">
26+
<div class="ms-auto d-flex gap-2 align-items-start">
2827

29-
<a tal:condition="python:not(repeat['brain'].start)"
30-
class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-up">Move up</a>
31-
<a tal:condition="python:not(repeat['brain'].end)"
32-
class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-down">Move
33-
down</a>
34-
<div class="btn-group">
35-
<a tal:attributes="class python:row.review_state() == 'published' and
28+
<a tal:condition="python:not(repeat['brain'].start)"
29+
class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-up">Move up</a>
30+
<a tal:condition="python:not(repeat['brain'].end)"
31+
class="btn btn-outline-primary btn-sm align-self-start" href="#" data-action="move-down">Move
32+
down</a>
33+
<div class="btn-group">
34+
<a tal:attributes="class python:row.review_state() == 'published' and
3635
'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or
3736
'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle'" type="button"
38-
class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" data-bs-display="static"
39-
aria-expanded="false">
40-
Review state: ${row/review_state}
41-
<span
42-
tal:attributes="class python:row.review_state() == 'published' and 'position-absolute top-0 start-100 translate-middle p-2 bg-success border border-light rounded-circle' or 'position-absolute top-0 start-100 translate-middle p-2 bg-danger border border-light rounded-circle'">
43-
</span>
44-
</a>
45-
<ul class="dropdown-menu"
46-
tal:define="transitions python:context.portal_workflow.getTransitionsFor(row)">
47-
<tal:transitions repeat="transition transitions">
48-
<li><a class="dropdown-item"
49-
href="${transition/url}&_authenticator=${context/@@authenticator/token}">${transition/name}</a>
50-
</li>
51-
</tal:transitions>
52-
</ul>
53-
</div>
37+
class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" data-bs-display="static"
38+
aria-expanded="false">
39+
Review state: ${row/review_state}
40+
<span
41+
tal:attributes="class python:row.review_state() == 'published' and 'position-absolute top-0 start-100 translate-middle p-2 bg-success border border-light rounded-circle' or 'position-absolute top-0 start-100 translate-middle p-2 bg-danger border border-light rounded-circle'">
42+
</span>
43+
</a>
44+
<ul class="dropdown-menu"
45+
tal:define="transitions python:context.portal_workflow.getTransitionsFor(row)">
46+
<tal:transitions repeat="transition transitions">
47+
<li><a class="dropdown-item"
48+
href="${transition/url}&_authenticator=${context/@@authenticator/token}">${transition/name}</a>
49+
</li>
50+
</tal:transitions>
51+
</ul>
5452
</div>
55-
5653
</div>
57-
<tal:condition tal:condition="row/can_edit">
58-
<div class="features-list d-flex gap-2 align-items-start mb-3"
59-
tal:define="features_list row/featured_list" tal:condition="features_list">
60-
<tal:featured repeat="featured_brain features_list">
61-
<div tal:define="featured_obj featured_brain/getObject;">
62-
<div class="btn-group" data-elementid="${featured_obj/id}" data-parenturl="${row/absolute_url}"
63-
data-elementurl="${featured_obj/absolute_url}" data-delete-target="true"
64-
data-move-target="true">
65-
<a tal:attributes="class python:featured_obj.review_state() == 'published' and
54+
55+
</div>
56+
<tal:condition tal:condition="row/can_edit">
57+
<div class="features-list d-flex gap-2 align-items-start mb-3"
58+
tal:define="features_list row/featured_list" tal:condition="features_list">
59+
<tal:featured repeat="featured_brain features_list">
60+
<div tal:define="featured_obj featured_brain/getObject;">
61+
<div class="btn-group" data-elementid="${featured_obj/id}" data-parenturl="${row/absolute_url}"
62+
data-elementurl="${featured_obj/absolute_url}" data-delete-target="true" data-move-target="true">
63+
<a tal:attributes="class python:featured_obj.review_state() == 'published' and
6664
'position-relative btn btn-outline-success btn-sm bg-success-subtle dropdown-toggle' or
6765
'position-relative btn btn-outline-danger btn-sm bg-danger-subtle dropdown-toggle'"
68-
type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown"
69-
data-bs-display="static" aria-expanded="false">
70-
${featured_obj/Title}
71-
<span
72-
tal:attributes="class python:featured_obj.review_state() == 'published' and 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-success border border-light rounded-circle' or 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-danger border border-light rounded-circle'">
73-
</span>
74-
</a>
75-
<ul class="dropdown-menu">
76-
<li><a class="dropdown-item" href="${featured_obj/absolute_url}/edit">Edit</a>
77-
</li>
78-
<li>
79-
<h5 class="dropdown-header">State</h5>
80-
</li>
81-
<tal:define
82-
tal:define="featured_transitions python:context.portal_workflow.getTransitionsFor(featured_obj)">
83-
<tal:featured_transitions repeat="featured_transition featured_transitions">
84-
<li><a class="dropdown-item"
85-
href="${featured_transition/url}&_authenticator=${context/@@authenticator/token}">${featured_transition/name}</a>
86-
</li>
87-
</tal:featured_transitions>
88-
</tal:define>
89-
<li>
90-
<h5 class="dropdown-header">Move actions</h5>
91-
</li>
92-
<li><a class="dropdown-item" href="#" data-action="move-up"
93-
tal:condition="python:not(repeat['featured_brain'].start)">Move up</a></li>
94-
<li><a class="dropdown-item" href="#" data-action="move-down"
95-
tal:condition="python:not(repeat['featured_brain'].end)">Move down</a></li>
96-
<li>
97-
<hr class="dropdown-divider">
98-
</li>
99-
<li><a class="ms-3 btn btn-sm btn-danger align-self-start btn-delete-element" href="#"
100-
data-bs-toggle="modal" data-bs-target="#deleteElementModal">Delete</a></li>
101-
</ul>
102-
</div>
66+
type="button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown"
67+
data-bs-display="static" aria-expanded="false">
68+
${featured_obj/Title}
69+
<span
70+
tal:attributes="class python:featured_obj.review_state() == 'published' and 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-success border border-light rounded-circle' or 'text-white position-absolute top-0 start-100 translate-middle p-1 bg-danger border border-light rounded-circle'">
71+
</span>
72+
</a>
73+
<ul class="dropdown-menu">
74+
<li><a class="dropdown-item" href="${featured_obj/absolute_url}/edit">Edit</a>
75+
</li>
76+
<li>
77+
<h5 class="dropdown-header">State</h5>
78+
</li>
79+
<tal:define
80+
tal:define="featured_transitions python:context.portal_workflow.getTransitionsFor(featured_obj)">
81+
<tal:featured_transitions repeat="featured_transition featured_transitions">
82+
<li><a class="dropdown-item"
83+
href="${featured_transition/url}&_authenticator=${context/@@authenticator/token}">${featured_transition/name}</a>
84+
</li>
85+
</tal:featured_transitions>
86+
</tal:define>
87+
<li>
88+
<h5 class="dropdown-header">Move actions</h5>
89+
</li>
90+
<li><a class="dropdown-item" href="#" data-action="move-up"
91+
tal:condition="python:not(repeat['featured_brain'].start)">Move up</a></li>
92+
<li><a class="dropdown-item" href="#" data-action="move-down"
93+
tal:condition="python:not(repeat['featured_brain'].end)">Move down</a></li>
94+
<li>
95+
<hr class="dropdown-divider">
96+
</li>
97+
<li><a class="ms-3 btn btn-sm btn-danger align-self-start btn-delete-element" href="#"
98+
data-bs-toggle="modal" data-bs-target="#deleteElementModal">Delete</a></li>
99+
</ul>
103100
</div>
104-
</tal:featured>
105-
<tal:featured_add_button tal:condition="python:row.show_featured_add_button(request)">
106-
<a class="btn btn-outline-primary btn-sm align-self-start"
107-
href="${row/absolute_url}/++add++DynamicPageRowFeatured">Add new featured</a>
108-
</tal:featured_add_button>
109-
</div>
110-
</tal:condition>
111-
<div class="content">
112-
<replace tal:replace="structure python:row.render(request)"></replace>
101+
</div>
102+
</tal:featured>
103+
<tal:featured_add_button tal:condition="python:row.show_featured_add_button(request)">
104+
<a class="btn btn-outline-primary btn-sm align-self-start"
105+
href="${row/absolute_url}/++add++DynamicPageRowFeatured">Add new featured</a>
106+
</tal:featured_add_button>
113107
</div>
114-
</section>
115-
</div>
108+
</tal:condition>
109+
<div class="content">
110+
<replace tal:replace="structure python:row.render(request)"></replace>
111+
</div>
112+
</section>
116113
</tal:featured>
117114
</tal:features>
118115
<tal:condition tal:condition="view/can_edit">

‎src/cs_dynamicpages/views/spacer_view.pt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div class="my-5">
2+
<h6 tal:condition="context/can_edit">Spacer</h6>
3+
</div>

0 commit comments

Comments
 (0)