From 265901414c69523e68cd14d9f5c5dbd2e4414881 Mon Sep 17 00:00:00 2001
From: Brian Read <brianr@bjsystems.co.uk>
Date: Sun, 15 Sep 2024 16:01:09 +0100
Subject: [PATCH] Fix capitalisation of fields

---
 .../CreateStarterWebsite-Custom.pm.new        |  2 +-
 .../CreateStarterWebsite.pm                   |  2 +-
 .../CreateStarterWebsite/_csw_PARAMS.html.ep  | 17 +++++++-----
 .../createstarterwebsite.html.ep              |  2 +-
 .../createstarterwebsite_en.lex               | 26 +++++++++----------
 Templates/html_controls.html.ep.xml           | 14 +++-------
 sm2gen.py                                     |  2 +-
 7 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/Targets/CreateStarterWebsite/CreateStarterWebsite-Custom.pm.new b/Targets/CreateStarterWebsite/CreateStarterWebsite-Custom.pm.new
index dd245ab..fcf8ae0 100644
--- a/Targets/CreateStarterWebsite/CreateStarterWebsite-Custom.pm.new
+++ b/Targets/CreateStarterWebsite/CreateStarterWebsite-Custom.pm.new
@@ -2,7 +2,7 @@
 # Routines to be edited by the developer to provide validation for parameters
 # and provison of the control data for table(s)
 #
-# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 12:03 
+# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 15:56 
 #
 
 use esmith::util;
diff --git a/Targets/CreateStarterWebsite/CreateStarterWebsite.pm b/Targets/CreateStarterWebsite/CreateStarterWebsite.pm
index 971e2ac..4f034fa 100644
--- a/Targets/CreateStarterWebsite/CreateStarterWebsite.pm
+++ b/Targets/CreateStarterWebsite/CreateStarterWebsite.pm
@@ -1,6 +1,6 @@
 package SrvMngr::Controller::CreateStarterWebsite;
 #
-# Generated by version:SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 12:03 
+# Generated by version:SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 15:56 
 #
 #----------------------------------------------------------------------
 # heading     : Miscellaneous
diff --git a/Targets/CreateStarterWebsite/_csw_PARAMS.html.ep b/Targets/CreateStarterWebsite/_csw_PARAMS.html.ep
index 9748321..5408422 100644
--- a/Targets/CreateStarterWebsite/_csw_PARAMS.html.ep
+++ b/Targets/CreateStarterWebsite/_csw_PARAMS.html.ep
@@ -1,5 +1,5 @@
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 12:03 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 15:56 
 %#
 <div id="CreateStarterWebsite-PARAMS" class="partial CreateStarterWebsite-PARAMS">
   <script>
@@ -38,8 +38,9 @@
 		<p><span class=label>
 			%=l('csw_')
 		</span><span class=data>
-			% text_field 
-		</span></p>
+			% param 'companyName' => $csw_data->{companyName} unless param 'companyName';
+			%= text_field 'companyName', size => '50', class => 'input' , pattern=>'.*' , placeholder=>'companyName'
+		<br></span></p>
 	
 		<p>
 			%=l('csw_First_header,_typically_used_for')
@@ -48,8 +49,9 @@
 		<p><span class=label>
 			%=l('csw_')
 		</span><span class=data>
-			% text_field 
-		</span></p>
+			% param 'header1' => $csw_data->{header1} unless param 'header1';
+			%= text_field 'header1', size => '50', class => 'input' , pattern=>'.*' , placeholder=>'header1'
+		<br></span></p>
 	
 		<p>
 			%=l('csw_Text_following_first_header,_typically')
@@ -69,8 +71,9 @@
 		<p><span class=label>
 			%=l('csw_')
 		</span><span class=data>
-			% text_field 
-		</span></p>
+			% param 'header2' => $csw_data->{header2} unless param 'header2';
+			%= text_field 'header2', size => '50', class => 'input' , pattern=>'.*' , placeholder=>'header2'
+		<br></span></p>
 	
 		<p>
 			%=l('csw_Text_following_second_header,_typically')
diff --git a/Targets/CreateStarterWebsite/createstarterwebsite.html.ep b/Targets/CreateStarterWebsite/createstarterwebsite.html.ep
index 5133f36..c0ccd66 100644
--- a/Targets/CreateStarterWebsite/createstarterwebsite.html.ep
+++ b/Targets/CreateStarterWebsite/createstarterwebsite.html.ep
@@ -1,6 +1,6 @@
 % layout 'default', title => "Sme server 2 - Create Starter Website", share_dir => './';
 %#
-%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 12:03 
+%# Generated by SM2Gen version:0.8 Chameleon version:4.5.4 On Python:3.12.3 at 2024-09-15 15:56 
 %#
 % content_for 'module' => begin
 <div id="module" class="module CreateStarterWebsite-panel">
diff --git a/Targets/CreateStarterWebsite/createstarterwebsite_en.lex b/Targets/CreateStarterWebsite/createstarterwebsite_en.lex
index afe695c..afe0e59 100644
--- a/Targets/CreateStarterWebsite/createstarterwebsite_en.lex
+++ b/Targets/CreateStarterWebsite/createstarterwebsite_en.lex
@@ -1,17 +1,17 @@
-'csw_Text_following_second_header,_typically' => 'Text following second header, Typically used for contact or ordering information:',
-'csw_Hello_PARAMS' => 'Hello PARAMS',
-'csw_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
-'csw_Do_you_wish_to_proceed?' => 'Do you wish to proceed?',
-'csw_Create' => 'Create',
-'csw_When_you_create_this_web' => 'When you create this web page, The file 'index.  Htm' will be overwritten in your web site directory.  ',
-'csw_Manage_CreateStarterWebsite_settings:' => 'Manage CreateStarterWebsite settings:',
-'csw_' => '',
-'csw_The_text_that_you_enter' => 'The text that you enter below will be line wrapped for a nicer appearance in your web page.  Leave a blank line whenever you want to start a new paragraph.  If you need to force a line break without starting a new paragraph (for example after each line of a mailing address), Then type the four-character sequence',
 'csw_You_can_leave_any_field' => 'You can leave any field blank if you do not need it.  ',
-'csw_First_header,_typically_used_for' => 'First header, Typically used for short phrases such as 'Leader in the field of textile manufacturing'',
+'csw_To_create_a_simple_web' => 'To create a simple web page for your company, Fill in the fields below and click onCreate.  ',
 'csw_Text_following_first_header,_typically' => 'Text following first header, Typically used for a paragraph of marketing information.  ',
 'csw_Do_not_use_this_optionif' => 'Do not use this optionif you have already customized your web site, Since it will overwrite the 'index.  Htm' file in your web site directory.  ',
-'csw_Create_Starter_Website' => 'Create Starter Website',
-'csw_To_create_a_simple_web' => 'To create a simple web page for your company, Fill in the fields below and click onCreate.  ',
-'csw_APPLY' => 'Apply',
+'csw_Text_following_second_header,_typically' => 'Text following second header, Typically used for contact or ordering information:',
+'csw_First_header,_typically_used_for' => 'First header, Typically used for short phrases such as 'Leader in the field of textile manufacturing'',
 'csw_Second_header,_typically_used_for' => 'Second header, Typically used for short phrases such as 'For more information' or 'To order our products':',
+'csw_PARAMS_panel_action_was_successful' => 'PARAMS panel action was successful',
+'csw_Manage_CreateStarterWebsite_settings:' => 'Manage CreateStarterWebsite settings:',
+'csw_The_text_that_you_enter' => 'The text that you enter below will be line wrapped for a nicer appearance in your web page.  Leave a blank line whenever you want to start a new paragraph.  If you need to force a line break without starting a new paragraph (for example after each line of a mailing address), Then type the four-character sequence',
+'csw_Hello_PARAMS' => 'Hello PARAMS',
+'csw_' => '',
+'csw_Do_you_wish_to_proceed?' => 'Do you wish to proceed?',
+'csw_Create_Starter_Website' => 'Create Starter Website',
+'csw_When_you_create_this_web' => 'When you create this web page, The file 'index.  Htm' will be overwritten in your web site directory.  ',
+'csw_Create' => 'Create',
+'csw_APPLY' => 'Apply',
diff --git a/Templates/html_controls.html.ep.xml b/Templates/html_controls.html.ep.xml
index 6155aa0..246aefe 100644
--- a/Templates/html_controls.html.ep.xml
+++ b/Templates/html_controls.html.ep.xml
@@ -1,12 +1,4 @@
 <root>
-	<Text><![CDATA[
-		<p><span class=label>
-			%=l('${prefix}_${Label}')
-		</span><span class=data>
-			% text_field ${Value}
-		</span></p>
-	]]></Text>
-
 	<Selection><![CDATA[
 		<p><span class=label>
 			%=l('${prefix}_${Label}')
@@ -45,14 +37,14 @@
 	]]></Time>
 
 
-	<Textinput><![CDATA[
+	<Text><![CDATA[
 		<p><span class=label>
 			%=l('${prefix}_${Label}')
 		</span><span class=data>
 			% param '${Name}' => $$${prefix}_data->{${Name}} unless param '${Name}';
 			%= text_field '${Name}', size => '${size | 50}', class => 'input' , pattern=>'${regexp | ".*"}' , placeholder=>'${placeholder | Name}'
 		<br></span></p>
-	]]></Textinput>
+	]]></Text>
 
 	<SubHeader><![CDATA[
 		<h2><%=l('${value}')%></h2>]]>
@@ -218,7 +210,7 @@
 	
 	<Preformatted><![CDATA[
 <pre>
-	${value}'
+	${Value}'
 </pre>
 	]]>
 	</Preformatted>
diff --git a/sm2gen.py b/sm2gen.py
index 1812072..19921ca 100644
--- a/sm2gen.py
+++ b/sm2gen.py
@@ -543,7 +543,7 @@ if __name__ == "__main__":
                     simple_control_template = PageTemplate(html_controls[html_Type])
                     try:
                         simple_control_html = simple_control_template.render(
-                            version=strVersion, value=inner_html, prefix=prefix_is
+                            version=strVersion, Value=inner_html, prefix=prefix_is
                         )
                         all_controls_html = all_controls_html + simple_control_html
                     except Exception as e: