From e70e4c0192c1c059b257aa0494ab0f7e001b0c10 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Thu, 7 Nov 2024 07:30:17 -0500 Subject: [PATCH 1/2] fix some issues rendering the elements with the new HTMLRenderer2 --- .../003-Classes/01603-GroupLayoutOption.yaml | 7 +++++++ .../Elements/000000-LoginPage.yaml | 19 +++++++++++++++++++ .../Elements/000000-LoginPageSubedit.yaml | 16 +--------------- .../Elements/113859-HomePage.yaml | 7 ++++++- .../net.alcetech.Mocha.System/Library.yaml | 19 +++++++++++++++++++ 5 files changed, 52 insertions(+), 16 deletions(-) create mode 100644 mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/Library.yaml diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01603-GroupLayoutOption.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01603-GroupLayoutOption.yaml index b238767..ea07187 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01603-GroupLayoutOption.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/003-Classes/01603-GroupLayoutOption.yaml @@ -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' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml index 1a9a730..87b522a 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPage.yaml @@ -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;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml index c8a33cb..58fb63f 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/000000-LoginPageSubedit.yaml @@ -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;' diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113859-HomePage.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113859-HomePage.yaml index ba0cf3e..804d175 100644 --- a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113859-HomePage.yaml +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/005-UserInterface/Elements/113859-HomePage.yaml @@ -37,4 +37,9 @@ defaultDataType: '{29694806-1882-4cf9-b1c9-aaeee2d729a5}' displayOptions: - instance: '&IDI_DisplayOption_ShowSubelementsVertically;' - - instance: '&IDI_DisplayOption_Singular;' \ No newline at end of file + - instance: '&IDI_DisplayOption_Singular;' + layout: + - type: '&IDC_GroupLayout;' + globalIdentifier: '{5b324642-f539-49e8-8098-8fcd118c73c4}' + options: + - instance: '&IDI_GroupLayoutOption_FieldSet;' \ No newline at end of file diff --git a/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/Library.yaml b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/Library.yaml new file mode 100644 index 0000000..7c72e63 --- /dev/null +++ b/mocha-common/data/libraries/yaml/net.alcetech.Mocha.System/Library.yaml @@ -0,0 +1,19 @@ +# Copyright (C) 2024 Michael Becker +# +# 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 . + +--- +- library: '&IDL_MochaBaseSystem;' From a542b975e5fcd1014f0c8caab0e020c47617ebb3 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Thu, 7 Nov 2024 07:30:36 -0500 Subject: [PATCH 2/2] provide simple install script to scp libraries to SUV --- mocha-common/install | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 mocha-common/install diff --git a/mocha-common/install b/mocha-common/install new file mode 100755 index 0000000..3cf4a66 --- /dev/null +++ b/mocha-common/install @@ -0,0 +1,5 @@ +#!/bin/bash + +# usage : install blahblah@yourserver +scp -O output/*.mcl $1:/usr/share/mocha/system/ +