Skip to content

Commit ae7be93

Browse files
committed
columns
1 parent 9034334 commit ae7be93

File tree

7 files changed

+22
-21
lines changed

7 files changed

+22
-21
lines changed

src/cs_dynamicpages/controlpanels/dynamica_pages_control_panel/controlpanel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IRowTypeFieldsSchema(Interface):
2727

2828
row_type_has_featured_add_button = schema.Bool(
2929
title="Has featured add button",
30-
required=True,
30+
required=False,
3131
default=False,
3232
)
3333

@@ -70,7 +70,7 @@ class IDynamicaPagesControlPanel(Interface):
7070
"row_type_has_featured_add_button": True,
7171
},
7272
{
73-
"row_type": "cs_dynamicpages-query-three-columns-view",
73+
"row_type": "cs_dynamicpages-query-columns-view",
7474
"each_row_type_fields": ["IBasic.title", "ICollection.query", "ICollection.sort_on", "ICollection.sort_order", "ICollection.betweeen", "ICollection.limit"],
7575
"row_type_has_featured_add_button": False,
7676
},

src/cs_dynamicpages/profiles/default/types/DynamicPageRow.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<element value="plone.locking" />
5050
<element value="cs_dynamicpages.link_info" />
5151
<element value="cs_dynamicpages.related_image" />
52+
<element value="cs_dynamicpages.row_columns" />
5253
<element value="plone.collection" />
5354
<element value="plone.constraintypes" />
5455
<!--<element value="plone.leadimage"/>-->

src/cs_dynamicpages/tests/test_view_query_three_columns_view.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from cs_dynamicpages.testing import CS_DYNAMICPAGES_FUNCTIONAL_TESTING
22
from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
3-
from cs_dynamicpages.views.query_three_columns_view import IQueryThreeColumnsView
3+
from cs_dynamicpages.views.query_columns_view import IQueryColumnsView
44
from plone import api
55
from plone.app.testing import setRoles
66
from plone.app.testing import TEST_USER_ID
@@ -19,24 +19,24 @@ def setUp(self):
1919
api.content.create(self.portal, "Folder", "other-folder")
2020
api.content.create(self.portal, "Document", "front-page")
2121

22-
def test_query_three_columns_view_is_registered(self):
22+
def test_query_columns_view_is_registered(self):
2323
view = getMultiAdapter(
2424
(self.portal["other-folder"], self.portal.REQUEST),
25-
name="query-three-columns-view",
25+
name="query-columns-view",
2626
)
27-
self.assertTrue(IQueryThreeColumnsView.providedBy(view))
27+
self.assertTrue(IQueryColumnsView.providedBy(view))
2828

29-
def test_query_three_columns_view_not_matching_interface(self):
29+
def test_query_columns_view_not_matching_interface(self):
3030
view_found = True
3131
try:
3232
view = getMultiAdapter(
3333
(self.portal["front-page"], self.portal.REQUEST),
34-
name="query-three-columns-view",
34+
name="query-columns-view",
3535
)
3636
except ComponentLookupError:
3737
view_found = False
3838
else:
39-
view_found = IQueryThreeColumnsView.providedBy(view)
39+
view_found = IQueryColumnsView.providedBy(view)
4040
self.assertFalse(view_found)
4141

4242

src/cs_dynamicpages/views/configure.zcml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@
7979

8080
<browser:pages
8181
for="cs_dynamicpages.content.dynamic_page_row.IDynamicPageRow"
82-
class=".query_three_columns_view.QueryThreeColumnsView"
82+
class=".query_columns_view.QueryColumnsView"
8383
permission="zope2.View"
8484
layer="cs_dynamicpages.interfaces.IBrowserLayer"
8585
>
8686
<browser:page
87-
name="cs_dynamicpages-query-three-columns-view"
88-
template="query_three_columns_view.pt"
87+
name="cs_dynamicpages-query-columns-view"
88+
template="query_columns_view.pt"
8989
/>
9090
</browser:pages>
9191

src/cs_dynamicpages/views/query_three_columns_view.pt renamed to src/cs_dynamicpages/views/query_columns_view.pt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<tal:define tal:define="
88
element brain/getObject;
99
">
10-
<div class="col-md-4 mb-5">
10+
<div class="${context/columns} mb-5">
1111
<div class="card">
1212
<tal:image tal:define="
1313
image element/image;

src/cs_dynamicpages/views/query_three_columns_view.py renamed to src/cs_dynamicpages/views/query_columns_view.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
# from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
88

99

10-
class IQueryThreeColumnsView(Interface):
11-
"""Marker Interface for IQueryThreeColumnsView"""
10+
class IQueryColumnsView(Interface):
11+
"""Marker Interface for IQueryColumnsView"""
1212

1313

14-
@implementer(IQueryThreeColumnsView)
15-
class QueryThreeColumnsView(CollectionView, DynamicPageRowView):
14+
@implementer(IQueryColumnsView)
15+
class QueryColumnsView(CollectionView, DynamicPageRowView):
1616
# If you want to define a template here, please remove the template from
1717
# the configure.zcml registration of this view.
18-
# template = ViewPageTemplateFile('query_three_columns_view.pt')
18+
# template = ViewPageTemplateFile('query_columns_view.pt')
1919

2020
def __call__(self):
2121
# Implement your own actions:

src/cs_dynamicpages/vocabularies/row_columns.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ def __call__(self, context):
2525
# Just an example list of content for our vocabulary,
2626
# this can be any static or dynamic data, a catalog result for example.
2727
items = [
28-
VocabItem(u'2', _(u'2')),
29-
VocabItem(u'3', _(u'3')),
30-
VocabItem(u'4', _(u'4')),
28+
VocabItem(u'col-md-6', _(u'2')),
29+
VocabItem(u'col-md-4', _(u'3')),
30+
VocabItem(u'col-md-3', _(u'4')),
3131
]
3232

3333
# Fix context if you are using the vocabulary in DataGridField.

0 commit comments

Comments
 (0)