From da8cfae738c4a34c4e46e223410fa8f6ae1feb1a Mon Sep 17 00:00:00 2001
From: Andre Knieschewski <andrek@memtext.de>
Date: Wed, 8 May 2024 08:50:39 +0200
Subject: [PATCH] =?UTF-8?q?Patch=20erweitert=20um=20Datenschutz=20und=20Im?=
 =?UTF-8?q?pressum=20=C3=BCberlagern=20Buttons=20und=20Links=20aus=20Maske?=
 =?UTF-8?q?n=20und=20Themenbaum=20#307740?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 superx/WEB-INF/patch/xml/patch_2024-04-29.xml | 93 +++++++++++++++++++
 superx/xml/maske_html.xsl                     |  2 +-
 superx/xml/maske_html_12410240.xsl            |  2 +-
 superx/xml/maske_html_18100.xsl               |  2 +-
 superx/xml/maske_html_18240.xsl               |  2 +-
 superx/xml/maske_html_28200.xsl               |  2 +-
 superx/xml/maske_html_402.xsl                 |  2 +-
 superx/xml/maske_html_888880210.xsl           |  2 +-
 superx/xml/maske_html_covering_note.xsl       |  2 +-
 superx/xml/maske_html_his1.xsl                |  2 +-
 superx/xml/maske_html_kenn_presubmit.xsl      |  2 +-
 superx/xml/maske_html_multicolumn.xsl         |  2 +-
 superx/xml/maske_html_superx_old.xsl          |  2 +-
 13 files changed, 105 insertions(+), 12 deletions(-)
 create mode 100644 superx/WEB-INF/patch/xml/patch_2024-04-29.xml

diff --git a/superx/WEB-INF/patch/xml/patch_2024-04-29.xml b/superx/WEB-INF/patch/xml/patch_2024-04-29.xml
new file mode 100644
index 0000000..fb72049
--- /dev/null
+++ b/superx/WEB-INF/patch/xml/patch_2024-04-29.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<patch patch_id="2024-04-29">
+<systeme>
+<!--<system name="his1" codierung="utf8"/>-->
+<system name="superx" codierung="utf8"/>
+<system name="superx" codierung="iso"/>
+</systeme>
+
+
+<module name="kern" systeminfo_id="xxx" inst_from="xx">
+<patch-description feature_id="307740">
+<ul><strong>Kernmodul 5.0 Bugfixes</strong>
+<li>Bugfix Freemarker Makro Konstanten</li>
+<li>Bugfix Masken-Lesezeichen erzeugen</li>
+<li>Neues Datenblatt-Makro mit Left outer join</li>
+<li>Bugfix PDF Generation in Macros</li>
+<li>BUGFIX Datenschutz und Impressum überlagern Buttons und Links aus Masken und Themenbaum</li>
+<li>BUGFIX Sichtenauswahl Box - Buttons ragen über Fenster</li>
+</ul>
+<p>
+<strong>Achtung:</strong>Dieser Patch ist für SuperX 5.0 geeignet, nicht für HISinOne-BI. In HISinOne-BI ist dies in Version 2024.06 enthalten.<br />
+</p>
+</patch-description>
+
+<patch-test>
+<!-- Bisher nur sql erlaubt. Ergebniss muss 0 sein, um zu erlauben, dass der Patch eingespielt wird! -->
+<nativeaction sql="select 0 from xdummy where (select count(*) from db_version where his_system='kern') > 0 " scriptfile="" database=""/>
+</patch-test>
+
+<patch-data>
+
+<files>
+<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl"><patch-description feature_id="317536">Left Outer Join bei Datenblättern</patch-description></file>
+<file path="xml/maskComponents_html.xsl"><patch-description feature_id="294250">Bugfix Lesezeichen + Vorlagen</patch-description></file>
+<file path="xml/tabelle_fo_pdf.xsl"><patch-description feature_id="314899">Bugfix PDF Generation in Macros</patch-description></file>
+<file path="WEB-INF/lib/superx5.0.jar"><patch-description feature_id="314899">Bugfix PDF Generation in Macros</patch-description></file>
+<file path="WEB-INF/http_get_masken_blacklist.txt"><patch-description feature_id="283628">HTTP-GET blacklist Upgrade</patch-description></file>
+<file path="edit/kern/sx_repository_edit_content.inc"><patch-description feature_id="283628">Bugfix Repository Bearbeitung</patch-description></file>
+<file path="WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql"><patch-description feature_id="307740">Bugfix Metadaten Stammdaten-Verwaltung</patch-description></file>
+<file path="xml/js/memtext/sx_functions.js"></file>
+<file path="xml/maskComponents_html.xsl"><patch-description>Bugfix Lesezeichen-Vorlagen</patch-description></file>
+<file path="xml/maske_html.xsl"></file>
+<file path="xml/menue_html.css"><patch-description feature_id="322854">BUGFIX Datenschutz und Impressum überlagern Buttons und Links aus Masken und Themenbaum</patch-description></file>
+<file path="edit/kern/webapp_manager.jsp"><patch-description feature_id="315314">Bugfix bei Auswahl Zeilenanzahl im Logdateien</patch-description></file>
+</files>
+
+<database name="superx">
+<!-- TODO: hier können beliebige Elemente der normalen Modul-XML stehen-->
+<masken>
+
+</masken>
+</database>
+
+<upgrade>
+<upgrade-step>
+<action>
+<nativeaction sql="create table tmp_templates(tid integer,
+	id char(200)  not null, 
+content text  not null, 
+description char(200) , 
+comment char(200) , 
+version integer  default 1 
+
+) 
+;" scriptfile="" database=""><patch-description feature_id=""></patch-description></nativeaction>
+
+
+</action>
+<action>
+<loadtable refresh="true" delimiter="^" header="false"
+					tabname="tmp_templates">
+					<file
+						path="$SUPERX_DIR/db/install/schluesseltabellen/release_unloads/fm_templates.unl" />
+				</loadtable>
+				
+</action>
+<action>
+<nativeaction sql="" scriptfile="$SUPERX_DIR/db/install/schluesseltabellen/fm_templates_fuellen.sql" database="POSTGRES"><patch-description feature_id="307740">FM-Templates einfügen</patch-description></nativeaction>
+
+</action>
+<action>
+<nativeaction sql="drop  table tmp_templates;" scriptfile="" database=""><patch-description feature_id=""></patch-description></nativeaction>
+</action>
+</upgrade-step>
+</upgrade>
+
+</patch-data>
+
+</module>
+
+
+
+</patch>
diff --git a/superx/xml/maske_html.xsl b/superx/xml/maske_html.xsl
index 3d70cb8..8fcf32f 100644
--- a/superx/xml/maske_html.xsl
+++ b/superx/xml/maske_html.xsl
@@ -338,7 +338,7 @@ xmlns:html="http://www.w3.org/1999/xhtml">
   <xsl:template name="maskCSS">
   <style type="text/css">
 body <!-- { font-family : sans-serif; } -->
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_12410240.xsl b/superx/xml/maske_html_12410240.xsl
index d62b2b5..d947002 100644
--- a/superx/xml/maske_html_12410240.xsl
+++ b/superx/xml/maske_html_12410240.xsl
@@ -131,7 +131,7 @@ location.href=url;
 <!-- end Javascript-->
 	<style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;align:center}
 form {	margin-bottom : 0;}
diff --git a/superx/xml/maske_html_18100.xsl b/superx/xml/maske_html_18100.xsl
index c4d45ff..4ce3c14 100644
--- a/superx/xml/maske_html_18100.xsl
+++ b/superx/xml/maske_html_18100.xsl
@@ -528,7 +528,7 @@ combodlg.show();
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_18240.xsl b/superx/xml/maske_html_18240.xsl
index 9bbdcd0..2eb04e6 100644
--- a/superx/xml/maske_html_18240.xsl
+++ b/superx/xml/maske_html_18240.xsl
@@ -201,7 +201,7 @@ function inhalt_field_endsign()
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form {	margin-bottom : 0;}
diff --git a/superx/xml/maske_html_28200.xsl b/superx/xml/maske_html_28200.xsl
index 9bc4f44..547388f 100644
--- a/superx/xml/maske_html_28200.xsl
+++ b/superx/xml/maske_html_28200.xsl
@@ -220,7 +220,7 @@ xmlns:html="http://www.w3.org/1999/xhtml">
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_402.xsl b/superx/xml/maske_html_402.xsl
index 8ff7eeb..4e4e29e 100644
--- a/superx/xml/maske_html_402.xsl
+++ b/superx/xml/maske_html_402.xsl
@@ -161,7 +161,7 @@ function inhalt_field_endsign()
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form {	margin-bottom : 0;}
diff --git a/superx/xml/maske_html_888880210.xsl b/superx/xml/maske_html_888880210.xsl
index 3b983ab..44945a2 100644
--- a/superx/xml/maske_html_888880210.xsl
+++ b/superx/xml/maske_html_888880210.xsl
@@ -198,7 +198,7 @@ function inhalt_field_endsign()
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form {	margin-bottom : 0;}
diff --git a/superx/xml/maske_html_covering_note.xsl b/superx/xml/maske_html_covering_note.xsl
index 0ffe83d..c9642c6 100644
--- a/superx/xml/maske_html_covering_note.xsl
+++ b/superx/xml/maske_html_covering_note.xsl
@@ -276,7 +276,7 @@ xmlns:html="http://www.w3.org/1999/xhtml">
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_his1.xsl b/superx/xml/maske_html_his1.xsl
index 37b5ae4..dc6b371 100644
--- a/superx/xml/maske_html_his1.xsl
+++ b/superx/xml/maske_html_his1.xsl
@@ -278,7 +278,7 @@ xmlns:html="http://www.w3.org/1999/xhtml">
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_kenn_presubmit.xsl b/superx/xml/maske_html_kenn_presubmit.xsl
index 9e922f6..1a267ab 100644
--- a/superx/xml/maske_html_kenn_presubmit.xsl
+++ b/superx/xml/maske_html_kenn_presubmit.xsl
@@ -397,7 +397,7 @@ ts.options[1] = new Option ("Kameraler Quartalsbericht","18980_quartalsbericht.j
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee; border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form { margin-bottom : 0;}
diff --git a/superx/xml/maske_html_multicolumn.xsl b/superx/xml/maske_html_multicolumn.xsl
index 350a7e5..5fea0e5 100644
--- a/superx/xml/maske_html_multicolumn.xsl
+++ b/superx/xml/maske_html_multicolumn.xsl
@@ -89,7 +89,7 @@
   <xsl:template name="maskCSS">
   <style type="text/css">
 body { font-family : sans-serif; }
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:550px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form {	margin-bottom : 0;}
diff --git a/superx/xml/maske_html_superx_old.xsl b/superx/xml/maske_html_superx_old.xsl
index cb91131..129884f 100644
--- a/superx/xml/maske_html_superx_old.xsl
+++ b/superx/xml/maske_html_superx_old.xsl
@@ -165,7 +165,7 @@ function inhalt_field_endsign()
   <!-- start CSS -->
   <xsl:template name="maskCSS">
   <style type="text/css">
-.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;height:500px;overflow:scroll}
+.dojoDialog {background : #eee;	border : 1px solid #999;-moz-border-radius : 5px;padding : 4px;width:800px;overflow:scroll}
 .sichtstand {font-size:80%;}
 .header {font-size:150%;text-align:center}
 form {	margin-bottom : 0;}