Skip to content

Commit

Permalink
Merge pull request #65 from plone/config-with-default-template-ed4d6fe6
Browse files Browse the repository at this point in the history
Config with default template
  • Loading branch information
jensens authored Apr 10, 2023
2 parents ed4d6fe + 150a9c7 commit b3d6d31
Show file tree
Hide file tree
Showing 28 changed files with 507 additions and 254 deletions.
39 changes: 39 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types

# top-most EditorConfig file:
# Will ignore other EditorConfig files in Home directory or upper tree level.
root = true


[*] # For All Files
# Unix-style newlines with a newline ending every file
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# Set default charset
charset = utf-8
# Indent style default
indent_style = space
# Max Line Length - a hard line wrap, should be disabled
max_line_length = off

[*.{py,cfg,ini}]
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml,zcml}]
# 2 space indentation
indent_size = 2

[{Makefile,.gitmodules}]
# Tab indentation (no size specified, but view as 4 spaces)
indent_style = tab
indent_size = unset
tab_width = unset
5 changes: 5 additions & 0 deletions .meta.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
[meta]
template = "default"
commit-id = "5623f8b3"
38 changes: 38 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Generated from:
# https://github.com/plone/meta/tree/master/config/default
ci:
autofix_prs: false
autoupdate_schedule: monthly

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.3.1
hooks:
- id: pyupgrade
args: [--py38-plus]
- repo: https://github.com/pycqa/isort
rev: 5.12.0
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: 23.1.0
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
hooks:
- id: codespell
additional_dependencies:
- tomli
- repo: https://github.com/mgedmin/check-manifest
rev: "0.49"
hooks:
- id: check-manifest
- repo: https://github.com/regebro/pyroma
rev: "4.2"
hooks:
- id: pyroma
2 changes: 2 additions & 0 deletions news/5623f8b3.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Update configuration files.
[plone devs]
2 changes: 1 addition & 1 deletion plone/app/registry/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Detailed documentation
class IMyPackage(Interface):

field1 = TextLine(title="Field1", default="")
field2 = TextLine(title="Field2", defualt="Initial value")
field2 = TextLine(title="Field2", default="Initial value")



Expand Down
2 changes: 1 addition & 1 deletion plone/app/registry/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from plone.app.registry.registry import Registry
from plone.app.registry.registry import Registry # noqa: F401
77 changes: 39 additions & 38 deletions plone/app/registry/browser/configure.zcml
Original file line number Diff line number Diff line change
@@ -1,49 +1,50 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="plone">
i18n_domain="plone"
>

<include package="plone.app.z3cform" />
<include package="plone.autoform" />
<include package="plone.app.z3cform" />
<include package="plone.autoform" />

<!-- <browser:resourceDirectory
<!-- <browser:resourceDirectory
name="plone.app.registry"
directory="resources"
/> -->

<browser:defaultView
for="plone.registry.interfaces.IRegistry"
name="configuration_registry"
/>

<browser:page
name="configuration_registry"
for="plone.registry.interfaces.IRegistry"
class=".records.RecordsControlPanel"
permission="cmf.ManagePortal"
/>

<browser:page
name="edit"
for="plone.registry.interfaces.IRegistry"
class=".edit.RecordEditView"
template="templates/edit_layout.pt"
permission="cmf.ManagePortal"
/>

<browser:page
name="delete-record"
for="plone.registry.interfaces.IRegistry"
class=".delete.RecordDeleteView"
template="templates/delete_layout.pt"
permission="cmf.ManagePortal"
/>

<browser:page
for="plone.registry.interfaces.IRegistry"
name="configuration_registry_export_xml"
class=".exportxml.RegistryExporterView"
permission="cmf.ManagePortal"
/>
<browser:defaultView
name="configuration_registry"
for="plone.registry.interfaces.IRegistry"
/>

<browser:page
name="configuration_registry"
for="plone.registry.interfaces.IRegistry"
class=".records.RecordsControlPanel"
permission="cmf.ManagePortal"
/>

<browser:page
name="edit"
for="plone.registry.interfaces.IRegistry"
class=".edit.RecordEditView"
template="templates/edit_layout.pt"
permission="cmf.ManagePortal"
/>

<browser:page
name="delete-record"
for="plone.registry.interfaces.IRegistry"
class=".delete.RecordDeleteView"
template="templates/delete_layout.pt"
permission="cmf.ManagePortal"
/>

<browser:page
name="configuration_registry_export_xml"
for="plone.registry.interfaces.IRegistry"
class=".exportxml.RegistryExporterView"
permission="cmf.ManagePortal"
/>

</configure>
43 changes: 24 additions & 19 deletions plone/app/registry/browser/templates/controlpanel_layout.pt
Original file line number Diff line number Diff line change
@@ -1,31 +1,36 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal"
lang="en"
metal:use-macro="context/@@prefs_main_template/macros/master"
i18n:domain="plone">
xml:lang="en"
i18n:domain="plone"
>

<body>
<tal:main metal:fill-slot="prefs_configlet_main">
<body>
<tal:main metal:fill-slot="prefs_configlet_main">

<header>
<header>

<h1 tal:content="view/label">View Title</h1>
<p class="lead" tal:condition="view/description | nothing" tal:content="structure view/description">View Description</p>
<h1 tal:content="view/label">View Title</h1>
<p class="lead"
tal:condition="view/description | nothing"
tal:content="structure view/description"
>View Description</p>

</header>
</header>

<div metal:use-macro="context/@@global_statusmessage/macros/portal_message">
<div metal:use-macro="context/@@global_statusmessage/macros/portal_message">
Portal status message
</div>
</div>

<div id="content-core">
<div id="layout-contents">
<span tal:replace="structure view/contents" />
</div>
</div>
<div id="content-core">
<div id="layout-contents">
<span tal:replace="structure view/contents"></span>
</div>
</div>

</tal:main>
</body>
</tal:main>
</body>
</html>
70 changes: 47 additions & 23 deletions plone/app/registry/browser/templates/delete_layout.pt
Original file line number Diff line number Diff line change
@@ -1,36 +1,60 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal"
lang="en"
metal:use-macro="context/@@prefs_main_template/macros/master"
i18n:domain="plone">
xml:lang="en"
i18n:domain="plone"
>

<metal:block fill-slot="top_slot"
tal:define="dummy python:request.set('disable_border',1)" />
<metal:block fill-slot="top_slot"
tal:define="
dummy python:request.set('disable_border',1);
"
/>

<body>
<div id="content" metal:fill-slot="prefs_configlet_content">
<body>
<div id="content"
metal:fill-slot="prefs_configlet_content"
>

<h1 class="documentFirstHeading" i18n:translate="">Delete Record</h1>
<h1 class="documentFirstHeading"
i18n:translate=""
>Delete Record</h1>

<p class="documentDescription" i18n:translate="description_record_delete">
<p class="documentDescription"
i18n:translate="description_record_delete"
>
Are you certain you want to delete this record? This can not be undone
and can be potentially harmful if you don't know what you are doing.
</p>
</p>

<b i18n:translate="">Record</b>: ${request/form/name}
<b i18n:translate="">Record</b>: ${request/form/name}

<form method="POST">
<input type="hidden" name="name" value="${request/form/name}" />
<div class="formControls">
<input id="form-buttons-delete" name="form.buttons.delete" i18n:attributes="value"
class="submit-widget button-field btn btn-danger" value="Yes, delete" type="submit">
<input id="form-buttons-cancel" name="form.buttons.cancel" i18n:attributes="value"
class="submit-widget button-field btn btn-secondary" value="Cancel" type="submit">
</div>
</form>
<form method="POST">
<input name="name"
type="hidden"
value="${request/form/name}"
/>
<div class="formControls">
<input class="submit-widget button-field btn btn-danger"
id="form-buttons-delete"
name="form.buttons.delete"
type="submit"
value="Yes, delete"
i18n:attributes="value"
/>
<input class="submit-widget button-field btn btn-secondary"
id="form-buttons-cancel"
name="form.buttons.cancel"
type="submit"
value="Cancel"
i18n:attributes="value"
/>
</div>
</form>

</div>
</body>
</div>
</body>
</html>
43 changes: 27 additions & 16 deletions plone/app/registry/browser/templates/edit_layout.pt
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
xmlns:metal="http://xml.zope.org/namespaces/metal"
xmlns:tal="http://xml.zope.org/namespaces/tal"
lang="en"
metal:use-macro="context/@@prefs_main_template/macros/master"
i18n:domain="plone">
xml:lang="en"
i18n:domain="plone"
>

<metal:block fill-slot="top_slot"
tal:define="dummy python:request.set('disable_border',1)" />
<metal:block fill-slot="top_slot"
tal:define="
dummy python:request.set('disable_border',1);
"
/>

<body>
<div id="content" metal:fill-slot="prefs_configlet_content">
<body>
<div id="content"
metal:fill-slot="prefs_configlet_content"
>

<h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
<h1 class="documentFirstHeading"
tal:content="view/label"
>View Title</h1>

<p class="documentDescription" i18n:translate="description_record_edit">
<p class="documentDescription"
i18n:translate="description_record_edit"
>
Use the form below to edit the value of this particular record.
</p>
</p>

<div id="layout-contents">
<span tal:replace="structure view/contents" />
</div>
<div id="layout-contents">
<span tal:replace="structure view/contents"></span>
</div>

</div>
</body>
</div>
</body>
</html>
Loading

0 comments on commit b3d6d31

Please sign in to comment.