Skip to content

Commit 90b8165

Browse files
libargutxilibargutxi
committed
format and lint
1 parent a462b4b commit 90b8165

File tree

5 files changed

+73
-33
lines changed

5 files changed

+73
-33
lines changed

‎src/cs_dynamicpages/utils.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from cs_dynamicpages import logger
2+
from cs_dynamicpages.content.dynamic_page_row import IDynamicPageRow
23
from plone import api
34
from zope.component import getSiteManager
45
from zope.globalrequest import getRequest
56
from zope.interface import Interface
6-
from cs_dynamicpages.content.dynamic_page_row import IDynamicPageRow
77
from zope.interface import providedBy
88

9+
910
VIEW_PREFIX = "cs_dynamicpages-"
1011

1112

@@ -56,6 +57,7 @@ def enable_behavior(behavior_dotted_name=str):
5657
f"Behavior '{behavior_dotted_name}' is already enabled on 'DynamicPageRow'."
5758
)
5859

60+
5961
def get_available_views_for_row():
6062
items = []
6163
sm = getSiteManager()
@@ -66,14 +68,19 @@ def get_available_views_for_row():
6668
)
6769

6870
values = api.portal.get_registry_record(
69-
"cs_dynamicpages.dynamic_pages_control_panel.row_type_fields", default=[]
70-
)
71+
"cs_dynamicpages.dynamic_pages_control_panel.row_type_fields", default=[]
72+
)
7173

7274
for item in available_views:
7375
if item[0].startswith(VIEW_PREFIX):
7476
for value in values:
75-
item_dict = {"row_type": item[0], "each_row_type_fields": [], "row_type_has_featured_add_button": False, "row_type_icon": "bricks"}
77+
item_dict = {
78+
"row_type": item[0],
79+
"each_row_type_fields": [],
80+
"row_type_has_featured_add_button": False,
81+
"row_type_icon": "bricks",
82+
}
7683
if item[0] == value["row_type"] and value not in items:
7784
item_dict = value
7885
items.append(item_dict)
79-
return items
86+
return items

‎src/cs_dynamicpages/views/dynamic_page_folder_view.py‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# from cs_dynamicpages import _
2-
from Products.Five.browser import BrowserView
3-
from zope.interface import implementer
4-
from zope.interface import Interface
2+
from cs_dynamicpages import _
3+
4+
# from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
5+
from cs_dynamicpages.utils import get_available_views_for_row
56
from plone import api
67
from plone.protect.interfaces import IDisableCSRFProtection
8+
from Products.Five.browser import BrowserView
9+
from Products.statusmessages.interfaces import IStatusMessage
710
from uuid import uuid4
811
from zope.interface import alsoProvides
9-
# from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
10-
from cs_dynamicpages.utils import get_available_views_for_row
11-
from cs_dynamicpages import _
12-
from Products.statusmessages.interfaces import IStatusMessage
12+
from zope.interface import implementer
13+
from zope.interface import Interface
14+
1315

1416
class IDynamicPageFolderView(Interface):
1517
"""Marker Interface for IDynamicPageFolderView"""
@@ -48,15 +50,15 @@ def __call__(self):
4850
id=str(random_id),
4951
link_text="Link Text",
5052
link_url="/",
51-
)
53+
)
5254
available_views = get_available_views_for_row()
5355
for view in available_views:
5456
if view["row_type"] == row_type:
5557
has_featured_button = view["row_type_has_featured_add_button"]
5658
if has_featured_button:
5759
created_elements_find = api.content.find(
58-
portal_type="DynamicPageRow",
59-
id=str(random_id),
60+
portal_type="DynamicPageRow",
61+
id=str(random_id),
6062
)
6163
created_element = created_elements_find[0].getObject()
6264
random_id_featured = uuid4()
@@ -68,7 +70,7 @@ def __call__(self):
6870
id=str(random_id_featured),
6971
link_text="Link Text",
7072
link_url="/",
71-
)
73+
)
7274

7375
random_id_featured_2 = uuid4()
7476
api.content.create(
@@ -79,7 +81,9 @@ def __call__(self):
7981
id=str(random_id_featured_2),
8082
link_text="Link Text",
8183
link_url="/",
82-
)
84+
)
8385
statusmessage = _("Row added successfully")
8486
IStatusMessage(self.request).add(statusmessage, type="info")
85-
return self.request.response.redirect(f"{self.context.aq_parent.absolute_url()}#{str(random_id)}")
87+
return self.request.response.redirect(
88+
f"{self.context.aq_parent.absolute_url()}#{random_id!s}"
89+
)

‎src/cs_dynamicpages/views/dynamic_title_description_view.pt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<h1 class="documentFirstHeading"
22
tal:content="context/title"
33
></h1>
4-
<p class="documentDescription" tal:condition="context/description"
4+
<p class="documentDescription"
5+
tal:condition="context/description"
56
tal:content="context/description"
67
></p>

‎src/cs_dynamicpages/views/dynamic_view.pt‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,19 @@
1414
<metal:main fill-slot="main">
1515
<main id="content">
1616
<div class="toast-container position-fixed bottom-0 end-0 p-3">
17-
<div id="liveToast" class="toast" role="alert" aria-live="assertive" aria-atomic="true">
17+
<div class="toast"
18+
id="liveToast"
19+
aria-atomic="true"
20+
aria-live="assertive"
21+
role="alert"
22+
>
1823
<div class="toast-header">
1924
<strong class="me-auto">Notification</strong>
20-
<button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
25+
<button class="btn-close"
26+
aria-label="Close"
27+
type="button"
28+
data-bs-dismiss="toast"
29+
></button>
2130
</div>
2231
<div class="toast-body">
2332
</div>
@@ -31,9 +40,9 @@
3140
<div class="form-check form-switch">
3241
<input class="form-check-input"
3342
id="editModeToggle"
43+
checked
3444
role="switch"
3545
type="checkbox"
36-
checked
3746
/>
3847
<label class="form-check-label"
3948
for="editModeToggle"
@@ -316,8 +325,10 @@
316325
tal:condition="view/dynamic_page_folder_element_url"
317326
>
318327
<a class="btn btn-primary btn-lg"
319-
data-bs-toggle="offcanvas" data-bs-target="#addrow-offcanvasRight" aria-controls="offcanvasRight"
328+
aria-controls="offcanvasRight"
320329
title="Add row"
330+
data-bs-target="#addrow-offcanvasRight"
331+
data-bs-toggle="offcanvas"
321332
i18n:attributes="title"
322333
><svg xmlns="http://www.w3.org/2000/svg"
323334
class="bi bi-plus-lg"
@@ -331,18 +342,35 @@
331342
></path>
332343
</svg></a>
333344
</div>
334-
<div tal:define="available_views_for_row view/available_views_for_row"
335-
class="offcanvas offcanvas-end" tabindex="-1" id="addrow-offcanvasRight" aria-labelledby="offcanvasRightLabel">
345+
<div class="offcanvas offcanvas-end"
346+
id="addrow-offcanvasRight"
347+
aria-labelledby="offcanvasRightLabel"
348+
tabindex="-1"
349+
tal:define="
350+
available_views_for_row view/available_views_for_row;
351+
"
352+
>
336353
<div class="offcanvas-header">
337-
<h5 class="offcanvas-title" id="offcanvasRightLabel">Add new row</h5>
338-
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
354+
<h5 class="offcanvas-title"
355+
id="offcanvasRightLabel"
356+
>Add new row</h5>
357+
<button class="btn-close"
358+
aria-label="Close"
359+
type="button"
360+
data-bs-dismiss="offcanvas"
361+
></button>
339362
</div>
340363
<div class="offcanvas-body">
341364
<ul class="list-unstyled row">
342-
<li tal:repeat="item available_views_for_row" class="col-6 mb-2">
365+
<li class="col-6 mb-2"
366+
tal:repeat="item available_views_for_row"
367+
>
343368
<div class="p-5 bg-light rounded h-100 d-flex justify-content-center align-items-center">
344-
<a data-bs-toggle="tooltip" data-bs-title="${item/row_type}" href="${view/dynamic_page_folder_element_url}/add-row-content?row_type=${item/row_type}">
345-
<span tal:replace="structure python:icons.tag(item['row_type_icon'], tag_class='fs-1')"></span>
369+
<a href="${view/dynamic_page_folder_element_url}/add-row-content?row_type=${item/row_type}"
370+
data-bs-title="${item/row_type}"
371+
data-bs-toggle="tooltip"
372+
>
373+
<span tal:replace="structure python:icons.tag(item['row_type_icon'], tag_class='fs-1')"></span>
346374
</a>
347375
</div>
348376
</li>
@@ -400,6 +428,6 @@
400428
</main>
401429
</metal:main>
402430

403-
</body>
431+
</body>
404432

405433
</html>

‎src/cs_dynamicpages/views/dynamic_view.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# from cs_dynamicpages import _
2+
from cs_dynamicpages.utils import get_available_views_for_row
23
from plone import api
34
from plone.protect.interfaces import IDisableCSRFProtection
45
from Products.Five.browser import BrowserView
56
from zope.interface import alsoProvides
67
from zope.interface import implementer
78
from zope.interface import Interface
8-
from cs_dynamicpages.utils import get_available_views_for_row
9-
from cs_dynamicpages.utils import VIEW_PREFIX
9+
1010

1111
class IDynamicView(Interface):
1212
"""Marker Interface for IDynamicView"""

0 commit comments

Comments
 (0)