Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed the order of the fields in Form Customization #16052

Merged
merged 2 commits into from Feb 22, 2022
Merged

Changed the order of the fields in Form Customization #16052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd9c69f
Set the headings of the regions in the same style
Ruslan-Aleev Feb 11, 2022
78db2d9
Changed the order of the fields as in the resource form
Ruslan-Aleev Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 14 additions & 16 deletions core/model/schema/modx.action.fields.schema.xml
View file
Open in desktop
Expand Up @@ -22,10 +22,14 @@
<field name="description" />
<field name="introtext" />
</tab>
<tab name="modx-resource-content">
<field name="modx-resource-content" />
</tab>
<tab name="modx-resource-main-right">
</tab>
<tab name="modx-resource-main-right-top">
<field name="published" />
<field name="deleted" />
<field name="publishedon" />
<field name="pub_date" />
<field name="unpub_date" />
Expand All @@ -34,9 +38,9 @@
<field name="template" />
</tab>
<tab name="modx-resource-main-right-bottom">
<field name="hidemenu" />
<field name="menutitle" />
<field name="link_attributes" />
<field name="hidemenu" />
<field name="menuindex" />
</tab>
<tab name="modx-page-settings">
Expand All @@ -51,25 +55,20 @@
</tab>
<tab name="modx-page-settings-box-left">
<field name="isfolder" />
<field name="alias_visible" />
<field name="show_in_tree" />
<field name="hide_children_in_tree" />
<field name="alias_visible" />
<field name="richtext" />
<field name="uri_override" />
<field name="uri" />
</tab>
<tab name="modx-page-settings-box-right">
<field name="richtext" />
<field name="cacheable" />
<field name="searchable" />
<field name="show_in_tree" />
<field name="syncsite" />
<field name="deleted" />
</tab>
<tab name="modx-panel-resource-tv" other="tv" />
<tab name="modx-resource-access-permissions" />
<tab name="modx-resource-content">
<field name="modx-resource-content" />
</tab>
</action>

<action controller="resource/create" form="modx-panel-resource">
Expand All @@ -83,10 +82,14 @@
<field name="description" />
<field name="introtext" />
</tab>
<tab name="modx-resource-content">
<field name="modx-resource-content" />
</tab>
<tab name="modx-resource-main-right">
</tab>
<tab name="modx-resource-main-right-top">
<field name="published" />
<field name="deleted" />
<field name="publishedon" />
<field name="pub_date" />
<field name="unpub_date" />
Expand All @@ -95,9 +98,9 @@
<field name="template" />
</tab>
<tab name="modx-resource-main-right-bottom">
<field name="hidemenu" />
<field name="menutitle" />
<field name="link_attributes" />
<field name="hidemenu" />
<field name="menuindex" />
</tab>
<tab name="modx-page-settings">
Expand All @@ -112,24 +115,19 @@
</tab>
<tab name="modx-page-settings-box-left">
<field name="isfolder" />
<field name="show_in_tree" />
<field name="hide_children_in_tree" />
<field name="alias_visible" />
<field name="alias_visible" />
<field name="richtext" />
<field name="uri_override" />
<field name="uri" />
</tab>
<tab name="modx-page-settings-box-right">
<field name="richtext" />
<field name="cacheable" />
<field name="searchable" />
<field name="show_in_tree" />
<field name="syncsite" />
<field name="deleted" />
</tab>
<tab name="modx-panel-resource-tv" other="tv" />
<tab name="modx-resource-access-permissions" />
<tab name="modx-resource-content">
<field name="modx-resource-content" />
</tab>
</action>
</actions>
16 changes: 10 additions & 6 deletions manager/assets/modext/widgets/fc/modx.panel.fcset.js
View file
Open in desktop
Expand Up @@ -240,22 +240,26 @@ MODx.grid.FCSetFields = function(config) {
,fields: ['id','action','name','tab','tab_rank','other','rank','visible','label','default_value']
,autoHeight: true
,grouping: true
,groupBy: 'tab'
,groupBy: 'tab_rank'
,plugins: [this.vcb]
,stateful: false
,remoteSort: false
,sortBy: 'rank'
,sortDir: 'ASC'
,hideGroupedColumn: true
,groupTextTpl: '{group} ({[values.rs.length]} {[values.rs.length > 1 ? "'+_('fields')+'" : "'+_('field')+'"]})'
,groupTextTpl: '{[values.rs[0].data.tab]} ({[values.rs.length]} {[values.rs.length > 1 ? "'+_('fields')+'" : "'+_('field')+'"]})'
,columns: [{
header: _('name')
,dataIndex: 'name'
,width: 200
},{
header: _('region')
header: _('region')+' ('+_('tab_id')+')'
,dataIndex: 'tab'
,width: 100
},{
header: _('tab_rank')
,dataIndex: 'tab_rank'
,width: 100
},this.vcb,{
header: _('label')
,dataIndex: 'label'
Expand Down Expand Up @@ -310,7 +314,7 @@ MODx.grid.FCSetTabs = function(config) {
,plugins: [this.vcb]
,stateful: false
,columns: [{
header: _('tab_id')
header: _('region')+' ('+_('tab_id')+')'
,dataIndex: 'name'
,width: 100
},this.vcb,{
Expand Down Expand Up @@ -433,7 +437,7 @@ MODx.grid.FCSetTVs = function(config) {
,dataIndex: 'default_text'
,editable: false
},{
header: _('region')
header: _('region')+' ('+_('tab_id')+')'
,dataIndex: 'tab'
,width: 100
,editor: { xtype: 'textfield' }
Expand Down Expand Up @@ -486,7 +490,7 @@ MODx.window.AddTabToSet = function(config) {
},{
xtype: 'textfield'
,name: 'name'
,fieldLabel: _('tab_id')
,fieldLabel: _('region')+' ('+_('tab_id')+')'
,id: 'modx-fcatab-id'
,allowBlank: false
,anchor: '100%'
Expand Down