fix some issues rendering the elements with the new HTMLRenderer2

This commit is contained in:
Michael Becker 2024-11-07 07:30:17 -05:00
parent 3fb99e1159
commit e70e4c0192
5 changed files with 52 additions and 16 deletions

View File

@ -2,6 +2,7 @@
- IDC_GroupLayoutOption: '{cafe4a35-f89c-4d73-a645-8788c5781757}'
- IDI_GroupLayoutOption_Tabbed: '{f600c4f6-964b-4a27-b5b0-24fd4c8d0878}'
- IDI_GroupLayoutOption_FieldSet: '{7dd84757-e1c1-4bbb-9ef6-5b88fb9a76fc}'
- library: '&IDL_MochaBaseSystem;'
instances:
@ -9,6 +10,12 @@
name: 'Group Layout Option'
index: 1603
customTagName: 'groupLayoutOption'
attributes:
- instance: '&IDA_Name;'
customTagName: name
- groupLayoutOption: '&IDI_GroupLayoutOption_Tabbed;'
name: 'Tabbed'
- groupLayoutOption: '&IDI_GroupLayoutOption_FieldSet;'
name: 'Field Set'

View File

@ -1,12 +1,31 @@
---
- library: '&IDL_MochaBaseSystem;'
instances:
- imageLayout: '{b50f8614-07bf-4c35-829b-aafbb3d67fab}'
style: {
width: { value: 256, unit: '&IDI_MeasurementUnit_Pixel;' },
height: { value: 256, unit: '&IDI_MeasurementUnit_Pixel;' },
horizontalAlignment: '&IDI_Alignment_Center;'
}
- element: '&IDE_LoginPage;'
name: login page
label: Log In
elementContents:
- globalIdentifier: '{13997179-656c-4034-b12f-046a7925bc3b}'
defaultDataType: '&IDI_File_SignonLogo;'
order: a
layout: '{b50f8614-07bf-4c35-829b-aafbb3d67fab}'
displayOptions:
- instance: '&IDI_DisplayOption_DoNotShowLabel;'
- globalIdentifier: '{079fbdf6-26cc-45bc-9c66-1bcb97638659}'
defaultDataType: '&IDE_LoginPageSubedit;'
layout:
- type: '&IDC_GroupLayout;'
globalIdentifier: '{24ae6c37-f43f-4db8-a5da-f50939451de2}'
options:
- instance: '&IDI_GroupLayoutOption_FieldSet;'
displayOptions:
- instance: '&IDI_DisplayOption_ShowSubelementsVertically;'
- instance: '&IDI_DisplayOption_Singular;'

View File

@ -4,7 +4,6 @@
name: login page subedit
moduleId: '&IDI_Module_MochaBaseSystem;'
elementContents:
- instance: '{13997179-656c-4034-b12f-046a7925bc3b}'
- instance: '{4a827e38-e07a-4b8b-a19f-9217299f5c45}'
- instance: '{c67f305e-bd4d-4628-816b-55fb85ea1b67}'
- instance: '{51b51be3-44fd-48f1-971f-682aee0a6132}'
@ -24,20 +23,6 @@
contentEncoding: 'base64'
# emits "background-image: url('data:$contentType;$contentEncoding,$data');"
- imageLayout: '{b50f8614-07bf-4c35-829b-aafbb3d67fab}'
style: {
width: { value: 256, unit: '&IDI_MeasurementUnit_Pixel;' },
height: { value: 256, unit: '&IDI_MeasurementUnit_Pixel;' },
horizontalAlignment: '&IDI_Alignment_Center;'
}
- elementContent: '{13997179-656c-4034-b12f-046a7925bc3b}'
defaultDataType: '&IDI_File_SignonLogo;'
order: a
layout: '{b50f8614-07bf-4c35-829b-aafbb3d67fab}'
displayOptions:
- instance: '&IDI_DisplayOption_DoNotShowLabel;'
- textAttribute: '&IDA_LoginPageInstructions;'
name: 'Login Page Instructions'
index: 1034
@ -59,6 +44,7 @@
- elementContent: '{c67f305e-bd4d-4628-816b-55fb85ea1b67}'
defaultDataType: '&IDA_UserName;'
order: c
label: 'User name'
displayOptions:
- instance: '&IDI_DisplayOption_Required;'

View File

@ -38,3 +38,8 @@
displayOptions:
- instance: '&IDI_DisplayOption_ShowSubelementsVertically;'
- instance: '&IDI_DisplayOption_Singular;'
layout:
- type: '&IDC_GroupLayout;'
globalIdentifier: '{5b324642-f539-49e8-8098-8fcd118c73c4}'
options:
- instance: '&IDI_GroupLayoutOption_FieldSet;'

View File

@ -0,0 +1,19 @@
# Copyright (C) 2024 Michael Becker <alcexhim@gmail.com>
#
# This file is part of Mocha.NET.
#
# Mocha.NET is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Mocha.NET is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Mocha.NET. If not, see <https://www.gnu.org/licenses/>.
---
- library: '&IDL_MochaBaseSystem;'