Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix #31 and re-align UI a bit.

- Re-align form buttons and tiny bit of UI cleanup.
- #31 Fix action bar and VersionX component in IE
  • Loading branch information...
commit 6b66f19745819b4f5c7a8a9a848c79f0ba302b09 1 parent 3bdd62f
@Mark-H authored
View
33 assets/components/versionx/js/mgr/chunks/panel.chunks.js
@@ -10,14 +10,14 @@ VersionX.panel.Chunks = function(config) {
layout: 'column',
border: false,
items: [{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'textfield', //'versionx-combo-chunks',
fieldLabel: _('chunk'),
name: 'fltr_chunk',
- width: 200,
+ width: '95%',
id: 'chk-f-chunk',
value: (VersionX.inVersion) ? MODx.request.id : ''
@@ -26,24 +26,24 @@ VersionX.panel.Chunks = function(config) {
fieldLabel: _('user'),
name: 'fltr_user',
hiddenName: 'fltr_user',
- width: 200,
+ anchor: '1',
id: 'chk-f-user'
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.datefrom'),
name: 'fltr_from',
- width: 200,
+ anchor: '1',
id: 'chk-f-from'
}]
},{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'modx-combo-category',
fieldLabel: _('category'),
name: 'fltr_category',
- width: 200,
+ anchor: '1',
id: 'chk-f-category'
},{
fieldLabel: '',
@@ -53,7 +53,7 @@ VersionX.panel.Chunks = function(config) {
xtype: 'datefield',
fieldLabel: _('versionx.filter.dateuntil'),
name: 'fltr_until',
- width: 200,
+ anchor: '1',
id: 'chk-f-until'
}]
}]
@@ -61,22 +61,33 @@ VersionX.panel.Chunks = function(config) {
layout: 'column',
padding: '10px 0 0 0',
border: false,
+ defaults: {
+ border: false
+ },
items: [{
- columnWidth: '30%',
- border: false,
+ width: 90,
+ items: [{
+ border: false,
+ html: ' '
+ }]
+ },{
items: [{
xtype: 'button',
handler: this.doFilter,
text: _('versionx.filter',{what: _('chunks')})
}]
},{
- columnWidth: '30%',
- border: false,
items: [{
xtype: 'button',
handler: this.resetFilter,
text: _('versionx.filter.reset')
}]
+ },{
+ columnWidth: 1,
+ items: [{
+ html: ' ',
+ border: false
+ }]
}]
}],
listeners: {
View
38 assets/components/versionx/js/mgr/resources/panel.resources.js
@@ -10,52 +10,51 @@ VersionX.panel.Resources = function(config) {
layout: 'column',
border: false,
items: [{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'textfield', //'versionx-combo-resources',
fieldLabel: _('resource'),
name: 'fltr_resource',
- width: 200,
+ width: '95%',
id: 'res-f-resource',
value: (VersionX.inVersion) ? MODx.request.id : ''
-
},{
xtype: 'modx-combo-user',
fieldLabel: _('user'),
name: 'fltr_user',
hiddenName: 'fltr_user',
- width: 200,
+ anchor: '1',
id: 'res-f-user'
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.datefrom'),
name: 'fltr_from',
- width: 200,
+ anchor: '1',
id: 'res-f-from'
}]
},{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'modx-combo-context',
fieldLabel: _('context'),
name: 'fltr_context_key',
- width: 200,
+ anchor: '1',
id: 'res-f-context'
},{
xtype: 'modx-combo-class-map',
fieldLabel: _('class_key'),
name: 'fltr_class',
- width: 200,
+ anchor: '1',
id: 'res-f-class'
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.dateuntil'),
name: 'fltr_until',
- width: 200,
+ anchor: '1',
id: 'res-f-until'
}]
}]
@@ -63,22 +62,33 @@ VersionX.panel.Resources = function(config) {
layout: 'column',
padding: '10px 0 0 0',
border: false,
+ defaults: {
+ border: false
+ },
items: [{
- columnWidth: '30%',
- border: false,
+ width: 90,
+ items: [{
+ border: false,
+ html: ' '
+ }]
+ },{
items: [{
xtype: 'button',
handler: this.doFilter,
text: _('versionx.filter',{what: _('resources')})
}]
},{
- columnWidth: '30%',
- border: false,
items: [{
- xtype: 'button',
+ xtype: 'button',
handler: this.resetFilter,
text: _('versionx.filter.reset')
}]
+ },{
+ columnWidth: 1,
+ items: [{
+ html: ' ',
+ border: false
+ }]
}]
}],
listeners: {
View
39 assets/components/versionx/js/mgr/templates/panel.templates.js
@@ -10,14 +10,14 @@ VersionX.panel.Templates = function(config) {
layout: 'column',
border: false,
items: [{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'textfield', //'versionx-combo-templates',
fieldLabel: _('template'),
name: 'fltr_template',
- width: 200,
+ width: '95%',
id: 'tpl-f-template',
value: (VersionX.inVersion) ? MODx.request.id : ''
@@ -26,34 +26,30 @@ VersionX.panel.Templates = function(config) {
fieldLabel: _('user'),
name: 'fltr_user',
hiddenName: 'fltr_user',
- width: 200,
+ anchor: '1',
id: 'tpl-f-user'
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.datefrom'),
name: 'fltr_from',
- width: 200,
+ anchor: '1',
id: 'tpl-f-from'
}]
},{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'modx-combo-category',
fieldLabel: _('category'),
name: 'fltr_category',
- width: 200,
+ anchor: '1',
id: 'tpl-f-category'
- },{
- fieldLabel: '',
- style: 'height: 36px !important',
- border: false
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.dateuntil'),
name: 'fltr_until',
- width: 200,
+ anchor: '1',
id: 'tpl-f-until'
}]
}]
@@ -61,22 +57,33 @@ VersionX.panel.Templates = function(config) {
layout: 'column',
padding: '10px 0 0 0',
border: false,
+ defaults: {
+ border: false
+ },
items: [{
- columnWidth: '30%',
- border: false,
+ width: 90,
+ items: [{
+ border: false,
+ html: ' '
+ }]
+ },{
items: [{
xtype: 'button',
handler: this.doFilter,
text: _('versionx.filter',{what: _('templates')})
}]
},{
- columnWidth: '30%',
- border: false,
items: [{
- xtype: 'button',
+ xtype: 'button',
handler: this.resetFilter,
text: _('versionx.filter.reset')
}]
+ },{
+ columnWidth: 1,
+ items: [{
+ html: ' ',
+ border: false
+ }]
}]
}],
listeners: {
View
35 assets/components/versionx/js/mgr/templatevars/panel.templatevars.js
@@ -10,14 +10,14 @@ VersionX.panel.TemplateVariables = function(config) {
layout: 'column',
border: false,
items: [{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'textfield', //'versionx-combo-templates',
- fieldLabel: _('tmplvar'),
+ fieldLabel: _('tv'),
name: 'fltr_templatevar',
- width: 200,
+ width: '95%',
id: 'tmplvar-f-templatevar',
value: (VersionX.inVersion) ? MODx.request.id : ''
@@ -26,24 +26,24 @@ VersionX.panel.TemplateVariables = function(config) {
fieldLabel: _('user'),
name: 'fltr_user',
hiddenName: 'fltr_user',
- width: 200,
+ anchor: '1',
id: 'tmplvar-f-user'
},{
xtype: 'datefield',
fieldLabel: _('versionx.filter.datefrom'),
name: 'fltr_from',
- width: 200,
+ anchor: '1',
id: 'tmplvar-f-from'
}]
},{
- columnWidth: '48%',
+ columnWidth:.5,
layout: 'form',
border: false,
items: [{
xtype: (VersionX.inVersion) ? 'hidden' : 'modx-combo-category',
fieldLabel: _('category'),
name: 'fltr_category',
- width: 200,
+ anchor: '1',
id: 'tmplvar-f-category'
},{
fieldLabel: '',
@@ -53,7 +53,7 @@ VersionX.panel.TemplateVariables = function(config) {
xtype: 'datefield',
fieldLabel: _('versionx.filter.dateuntil'),
name: 'fltr_until',
- width: 200,
+ anchor: '1',
id: 'tmplvar-f-until'
}]
}]
@@ -61,22 +61,33 @@ VersionX.panel.TemplateVariables = function(config) {
layout: 'column',
padding: '10px 0 0 0',
border: false,
+ defaults: {
+ border: false
+ },
items: [{
- columnWidth: '30%',
- border: false,
+ width: 90,
+ items: [{
+ border: false,
+ html: ' '
+ }]
+ },{
items: [{
xtype: 'button',
handler: this.doFilter,
text: _('versionx.filter',{what: _('tmplvars')})
}]
},{
- columnWidth: '30%',
- border: false,
items: [{
xtype: 'button',
handler: this.resetFilter,
text: _('versionx.filter.reset')
}]
+ },{
+ columnWidth: 1,
+ items: [{
+ html: ' ',
+ border: false
+ }]
}]
}],
listeners: {
View
2  core/components/versionx/docs/changelog.txt
@@ -1,5 +1,7 @@
This changelog shows an overview of what changed throughout VersionX releases, with the latest release or development log on top.
+Re-align form buttons and tiny bit of UI cleanup.
+#31 Fix action bar and VersionX component in IE
#29 Fix issue with empty grids until applying a filter in 2.2.4.
++++++++++++++++++++++++++++++++
View
2  core/components/versionx/templates/mgr/tabs/resources.tpl
@@ -6,7 +6,7 @@
width: '95%',
items: [{
xtype: 'versionx-panel-resources',
- layout: 'anchor',
+ //layout: 'anchor',
width: 500
},{
html: '<hr />',
Please sign in to comment.
Something went wrong with that request. Please try again.