Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
9817d24f
Commit
9817d24f
authored
Jun 06, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
ERP5JS,xhtml_style: display form groups legends
See merge request
nexedi/erp5!1949
parents
fbccd18f
4f84f243
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
13 deletions
+13
-13
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+1
-1
bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalJsonStyle.py
...plateItem/portal_components/test.erp5.testHalJsonStyle.py
+1
-1
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/form_render.zpt
...inTemplateItem/portal_skins/erp5_km_theme/form_render.zpt
+1
-2
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_render.zpt
...nTemplateItem/portal_skins/erp5_mobile_ui/form_render.zpt
+1
-2
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/navigation_arrows.zpt
...ateItem/portal_skins/erp5_mobile_ui/navigation_arrows.zpt
+1
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.js
...thTemplateItem/web_page_module/rjs_gadget_erp5_form_js.js
+4
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
...inTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
+2
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.zpt
...emplateItem/portal_skins/erp5_xhtml_style/form_dialog.zpt
+1
-1
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.zpt
...emplateItem/portal_skins/erp5_xhtml_style/form_render.zpt
+1
-2
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
9817d24f
...
@@ -1254,7 +1254,7 @@ def renderFormDefinition(form, response_dict):
...
@@ -1254,7 +1254,7 @@ def renderFormDefinition(form, response_dict):
for
field
in
form
.
get_fields_in_group
(
group
[
'goid'
],
include_disabled
=
1
):
for
field
in
form
.
get_fields_in_group
(
group
[
'goid'
],
include_disabled
=
1
):
field_list
.
append
((
field
.
id
,
{
'meta_type'
:
field
.
meta_type
}))
field_list
.
append
((
field
.
id
,
{
'meta_type'
:
field
.
meta_type
}))
group_list
.
append
((
group
[
'gid'
],
field_list
))
group_list
.
append
((
group
[
'gid'
],
field_list
,
group
[
'gtitle'
]
))
# some forms might not have any fields so we put empty bottom group
# some forms might not have any fields so we put empty bottom group
if
not
group_list
:
if
not
group_list
:
...
...
bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalJsonStyle.py
View file @
9817d24f
...
@@ -1069,7 +1069,7 @@ class TestERP5Document_getHateoas_mode_traverse(ERP5HALJSONStyleSkinsMixin):
...
@@ -1069,7 +1069,7 @@ class TestERP5Document_getHateoas_mode_traverse(ERP5HALJSONStyleSkinsMixin):
"application/hal+json"
"application/hal+json"
)
)
result_dict
=
json
.
loads
(
result
)
result_dict
=
json
.
loads
(
result
)
_
,
group_fields
=
result_dict
[
'group_list'
][
-
1
]
_
,
group_fields
,
_
=
result_dict
[
'group_list'
][
-
1
]
field_names
=
[
field_name
for
field_name
,
_
in
group_fields
]
field_names
=
[
field_name
for
field_name
,
_
in
group_fields
]
self
.
assertIn
(
"form_id"
,
field_names
)
self
.
assertIn
(
"form_id"
,
field_names
)
self
.
assertIn
(
"dialog_id"
,
field_names
)
self
.
assertIn
(
"dialog_id"
,
field_names
)
...
...
bt5/erp5_km/SkinTemplateItem/portal_skins/erp5_km_theme/form_render.zpt
View file @
9817d24f
...
@@ -19,8 +19,7 @@ Breaks strict compatibility:
...
@@ -19,8 +19,7 @@ Breaks strict compatibility:
It is possible to specify a group id and a group title by naming a group following the
It is possible to specify a group id and a group title by naming a group following the
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
class and as tag id. The group title will be used as a legend for the fieldset. If no group
class and as tag id. The group title will be used as a legend for the fieldset.
title is found, we use group id as title.
-->
-->
</tal:block>
</tal:block>
...
...
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/form_render.zpt
View file @
9817d24f
...
@@ -37,8 +37,7 @@ Breaks strict compatibility:
...
@@ -37,8 +37,7 @@ Breaks strict compatibility:
It is possible to specify a group id and a group title by naming a group following the
It is possible to specify a group id and a group title by naming a group following the
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
class and as tag id. The group title will be used as a legend for the fieldset. If no group
class and as tag id. The group title will be used as a legend for the fieldset.
title is found, we use group id as title.
-->
-->
</tal:block>
</tal:block>
...
...
bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/navigation_arrows.zpt
View file @
9817d24f
...
@@ -37,8 +37,7 @@ Breaks strict compatibility:
...
@@ -37,8 +37,7 @@ Breaks strict compatibility:
It is possible to specify a group id and a group title by naming a group following the
It is possible to specify a group id and a group title by naming a group following the
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
class and as tag id. The group title will be used as a legend for the fieldset. If no group
class and as tag id. The group title will be used as a legend for the fieldset.
title is found, we use group id as title.
-->
-->
</tal:block>
</tal:block>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.js
View file @
9817d24f
...
@@ -84,9 +84,12 @@
...
@@ -84,9 +84,12 @@
function
addGroup
(
group
,
rendered_document
,
form_definition
,
form_gadget
,
modification_dict
)
{
function
addGroup
(
group
,
rendered_document
,
form_definition
,
form_gadget
,
modification_dict
)
{
var
group_name
=
group
[
0
],
var
group_name
=
group
[
0
],
field_list
=
group
[
1
],
field_list
=
group
[
1
],
group_title
=
group
[
2
],
// XXX: > Romain: fieldset will be needed later for menus
// XXX: > Romain: fieldset will be needed later for menus
fieldset_element
=
domsugar
(
"
div
"
,
{
"
class
"
:
group_name
});
fieldset_element
=
domsugar
(
"
div
"
,
{
"
class
"
:
group_name
});
if
(
group_title
)
{
fieldset_element
.
appendChild
(
domsugar
(
'
label
'
,
{
"
class
"
:
"
group_title
"
},
group_title
));
}
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
var
first_listbox_found
=
false
;
var
first_listbox_found
=
false
;
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/erp5.css.css
View file @
9817d24f
...
@@ -342,7 +342,8 @@ table.fake tr td {
...
@@ -342,7 +342,8 @@ table.fake tr td {
}
}
.group_title
{
.group_title
{
display
:
none
;
padding-bottom
:
0.5em
;
font-size
:
larger
;
}
}
table
.fake
,
table
.fake
,
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_dialog.zpt
View file @
9817d24f
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
<tal:block tal:define="gid group/gid">
<tal:block tal:define="gid group/gid">
<fieldset tal:condition="python: 'hidden' not in gid and 'bottom' not in gid and 'head' not in gid"
<fieldset tal:condition="python: 'hidden' not in gid and 'bottom' not in gid and 'head' not in gid"
tal:attributes="class gid;">
tal:attributes="class gid;">
<legend
tal:content="group/gtitle" class="group_title" /
>
<legend
i18n:translate="" i18n:domain="ui" tal:condition="group/gtitle" tal:content="group/gtitle" class="group_title"></legend
>
<tal:block tal:repeat="field python: form.get_fields_in_group(group['goid'])">
<tal:block tal:repeat="field python: form.get_fields_in_group(group['goid'])">
<tal:block metal:use-macro="field_render" />
<tal:block metal:use-macro="field_render" />
</tal:block>
</tal:block>
...
...
product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/form_render.zpt
View file @
9817d24f
...
@@ -19,8 +19,7 @@ Breaks strict compatibility:
...
@@ -19,8 +19,7 @@ Breaks strict compatibility:
It is possible to specify a group id and a group title by naming a group following the
It is possible to specify a group id and a group title by naming a group following the
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
"group id (Group Title)" pattern. In this case the group id will be used as fieldset css
class and as tag id. The group title will be used as a legend for the fieldset. If no group
class and as tag id. The group title will be used as a legend for the fieldset.
title is found, we use group id as title.
-->
-->
</tal:block>
</tal:block>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment