SuperX
/
kern
6
0
Fork 0
Code Issues 8 Pull Requests Projects Releases Wiki Activity
Browse Source

Layoutverbesserung Manager, Patch #4

RELEASE_kern5.0
Daniel Quathamer 8 months ago
parent
bb8d45c28c
commit
066906a594
5 changed files with 75 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      superx/WEB-INF/conf/edustore/db/conf/build.xml
  2. 10
      superx/WEB-INF/patch/xml/patch_2024-03-08.xml
  3. 16
      superx/edit/kern/webapp_manager.jsp
  4. 60
      superx/images/icons/arrow_refresh.svg
  5. 1
      superx/xml/tabelle_fo_pdf.xsl

1
superx/WEB-INF/conf/edustore/db/conf/build.xml
Unescape View File

@ -400,6 +400,7 @@ @@ -400,6 +400,7 @@
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/edustore_kern.xml" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore_kern.xml"/>
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/edustore_kern.xml" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/edustore.xml"/>
<copy file="${ROOT_DIR_WEBAPP}/../src/edustore/custom.xml.sam" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/custom.xml.sam"/>
<copy file="${ROOT_DIR_WEBAPP}/WEB-INF/http_get_masken_blacklist.txt" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/http_get_masken_blacklist.txt"/>
<!-- <copy file="${ROOT_DIR_WEBAPP}/../src/edustore/mondrian.xsd" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/WEB-INF/classes/edustore/mondrian.xsd"/> -->
<copy file="${ROOT_DIR_WEBAPP}/xml/font_activ/angle-circled-left.svg" overwrite="true" failonerror="false" tofile="${ZIELPFAD}/webserver/tomcat/webapps/superx/images/icons/arrow_left_fat.svg"/>

10
superx/WEB-INF/patch/xml/patch_2024-03-08.xml
Unescape View File

@ -28,13 +28,13 @@ @@ -28,13 +28,13 @@
<patch-data>
<files>
<file path="WEB-INF/conf/edustore/db/install/schluesseltabellen/release_unloads/fm_templates.unl"><patch-description feature_id="">Left Outer Join bei Datenblättern</patch-description></file>
<file path="xml/maskComponents_html.xsl"><patch-description feature_id="">Bugfix Lesezeichen + Vorlagen</patch-description></file>
<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="">HTTP-GET blacklist</patch-description></file>
<file path="edit/kern/sx_repository_edit_content.inc"><patch-description feature_id="">Bugfix Repository Bearbeitung</patch-description></file>
<file path="WEB-INF/conf/edustore/db/install/upgrade/cif_fuellen_key_2.sql"><patch-description feature_id="">Bugfix Repository Bearbeitung</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>

16
superx/edit/kern/webapp_manager.jsp
Unescape View File

@ -63,6 +63,10 @@ function getLogs(logtype,caption,loglines) @@ -63,6 +63,10 @@ function getLogs(logtype,caption,loglines)
document.getElementById("MaskHeader").innerHTML=(logtype.startsWith("server")?"Server-Logdateien":"Maskenprotokolle");
document.getElementById("MaskSubHeader").innerHTML=caption;
if(document.forms['log'] && document.forms['log'].elements['logtype'])
{
document.forms['log'].elements['logtype'].value=logtype;
}
var xhttp = new XMLHttpRequest();
xhttp.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
@ -173,11 +177,7 @@ if(tab == null) @@ -173,11 +177,7 @@ if(tab == null)
<a class="navbar-item" href="webapp_manager.jsp">Webanwendung Manager</a>
<div class="navbar-burger burger" data-target="navMenu">
<span>dd</span>
<span>dd</span>
<span>dd</span>
</div>
</div>
<!-- <div id="navMenu" class="navbar-menu">
<div class="navbar-start">
@ -302,7 +302,7 @@ if(tab.equals("")) @@ -302,7 +302,7 @@ if(tab.equals(""))
<p class="subtitle">der Webanwendung</p>
<p align="left">Version: <%= sxversion %><br />
Builddatum: <%= builddatum %><br />
Platform: <%= platform %><br />
Plattform: <%= platform %><br />
Aktueller Mandant: <%= mandantenid %><br />
Installierte Mandanten: <br />
<%= finRechteInfos %>
@ -418,10 +418,10 @@ if(tab.equals("log")) @@ -418,10 +418,10 @@ if(tab.equals("log"))
</div>
</section>
<section class="section">
<form name="log" >
<form name="log" onsubmit="getLogs(document.forms['log'].elements['logtype'].value,document.getElementById('MaskSubHeader').innerHTML,document.forms['log'].elements['loglines'].value);return false;" >
<div class="container" id="loadMask" >
<div> (max. letzte <input type="text" size="5" maxlength="5" name="loglines" value="100" /> Zeilen)
<div> (max. letzte <input type="hidden" name="logtype" value="" /> <input type="text" size="5" maxlength="5" name="loglines" value="100" /> 100 Zeilen)
<textarea id="Inhalt" name="Inhalt" class="textarea" placeholder="Inhalt..." rows="20"></textarea>

60
superx/images/icons/arrow_refresh.svg
Unescape View File

@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="25"
version="1.1"
id="svg4"
sodipodi:docname="arrows-cw.svg"
height="25"
inkscape:version="0.92.2 5c3e80d, 2017-08-06">
<metadata
id="metadata10">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs8" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1051"
id="namedview6"
showgrid="false"
inkscape:zoom="1.8433992"
inkscape:cx="224.82479"
inkscape:cy="50"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg4" />
<path
d="m 24.562937,851.19324 q 0,0.0874 0,0.11655 -1.048951,4.37063 -4.370629,7.08042 -3.321679,2.70979 -7.779721,2.70979 -2.360139,0 -4.5745917,-0.90326 -2.2144522,-0.90327 -3.9627039,-2.56411 l -2.0979021,2.09791 q -0.3205128,0.32051 -0.7284383,0.32051 -0.40792536,0 -0.72843818,-0.32051 Q 0,859.41002 0,859.0021 v -7.28438 q 0,-0.40793 0.32051282,-0.72844 0.32051282,-0.32052 0.72843818,-0.32052 h 7.2843823 q 0.4079254,0 0.7284383,0.32052 0.3205128,0.32051 0.2913753,0.72844 -0.029138,0.40792 -0.2913753,0.72843 l -2.2435898,2.24359 q 1.1655012,1.07809 2.6223776,1.66084 1.4568766,0.58275 3.0594406,0.58275 2.156177,0 4.050117,-1.07809 1.893939,-1.07808 3.030303,-2.88461 0.174825,-0.29138 0.844988,-1.92308 0.145688,-0.37879 0.495338,-0.37879 h 3.117716 q 0.2331,0 0.378787,0.17483 0.145688,0.17482 0.145688,0.34965 z m 0.407925,-12.99534 v 7.28438 q 0,0.40793 -0.291375,0.72844 -0.291375,0.32052 -0.757576,0.32052 h -7.284382 q -0.407925,0 -0.728438,-0.32052 -0.320513,-0.32051 -0.291375,-0.72844 0.02914,-0.40792 0.291375,-0.72843 l 2.24359,-2.24359 Q 15.763403,840.26667 12.5,840.26667 q -2.185315,0 -4.0792541,1.07809 -1.8939394,1.07808 -3.030303,2.88461 -0.1748252,0.29138 -0.8449884,1.92308 -0.1456876,0.37879 -0.4953379,0.37879 H 0.81585082 q -0.20396271,0 -0.37878788,-0.17483 -0.17482518,-0.17482 -0.14568765,-0.34965 v -0.11655 Q 1.3403263,841.51958 4.6911422,838.80979 8.041958,836.1 12.5,836.1 q 2.36014,0 4.60373,0.90326 2.243589,0.90327 3.991841,2.56411 l 2.097902,-2.09791 q 0.320513,-0.32051 0.728438,-0.32051 0.407926,0 0.757576,0.32051 0.349651,0.32052 0.291375,0.72844 z"
id="path2"
inkscape:connector-curvature="0"
style="stroke-width:0.02913753" />
<path
style="stroke-width:0.02913753"
inkscape:connector-curvature="0"
id="path817"
d="m 24.573343,15.09324 q 0,0.0874 0,0.11655 -1.048951,4.37063 -4.370629,7.08042 Q 16.881035,25 12.422993,25 10.062854,25 7.8484017,24.09674 5.6339495,23.19347 3.8856978,21.53263 l -2.0979021,2.09791 q -0.3205128,0.32051 -0.7284383,0.32051 -0.40792538,0 -0.7284382,-0.32051 Q 0.01040638,23.31002 0.01040638,22.9021 v -7.28438 q 0,-0.40793 0.32051282,-0.72844 0.32051282,-0.32052 0.7284382,-0.32052 h 7.2843823 q 0.4079254,0 0.7284383,0.32052 0.3205128,0.32051 0.2913753,0.72844 -0.029138,0.40792 -0.2913753,0.72843 l -2.2435898,2.24359 q 1.1655012,1.07809 2.6223776,1.66084 1.4568762,0.58275 3.0594402,0.58275 2.156177,0 4.050117,-1.07809 1.893939,-1.07808 3.030303,-2.88461 0.174825,-0.29138 0.844988,-1.92308 0.145688,-0.37879 0.495338,-0.37879 h 3.117716 q 0.2331,0 0.378787,0.17483 0.145688,0.17482 0.145688,0.34965 z M 24.981268,2.0979 v 7.28438 q 0,0.40793 -0.291375,0.72844 -0.291375,0.32052 -0.757576,0.32052 h -7.284382 q -0.407925,0 -0.728438,-0.32052 -0.320513,-0.32051 -0.291375,-0.72844 0.02914,-0.40792 0.291375,-0.72843 l 2.24359,-2.24359 q -2.389278,-2.24359 -5.652681,-2.24359 -2.185315,0 -4.0792537,1.07809 Q 6.5372129,6.32284 5.4008493,8.12937 5.2260241,8.42075 4.5558609,10.05245 4.4101733,10.43124 4.060523,10.43124 H 0.8262572 q -0.20396271,0 -0.37878788,-0.17483 Q 0.27264414,10.08159 0.30178167,9.90676 V 9.79021 Q 1.3507327,5.41958 4.7015486,2.70979 8.0523644,0 12.510406,0 q 2.36014,0 4.60373,0.90326 2.243589,0.90327 3.991841,2.56411 l 2.097902,-2.09791 q 0.320513,-0.32051 0.728438,-0.32051 0.407926,0 0.757576,0.32051 0.349651,0.32052 0.291375,0.72844 z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.7 KiB

1
superx/xml/tabelle_fo_pdf.xsl
Unescape View File

@ -514,6 +514,7 @@ line-height="{$font_size_normal}" language="en" hyphenate="true"> @@ -514,6 +514,7 @@ line-height="{$font_size_normal}" language="en" hyphenate="true">
</xsl:otherwise>
</xsl:choose>
</fo:block>
</fo:table-cell><xsl:text>
</xsl:text>
</xsl:template>

Write Preview
Loading…
Cancel
Save