Browse Source

Themenbaum-Suche ignoriert Groß/Kleinschreibung, Maskenfelder mit Pflichtkennzeichen lassen sich nun über Pseudoklasse #7

master
Daniel Quathamer 6 days ago
parent
commit
bafdd0db8a
  1. 7
      superx/style/sx_common.css
  2. 4
      superx/xml/js/memtext/nd_functions.js
  3. 5
      superx/xml/menue_html.xsl
  4. 51
      superx/xml/nd_templates.xsl
  5. 5
      superx/xml/pageComponents_html.xsl
  6. 7
      superx/xml/submenu_html.xsl

7
superx/style/sx_common.css

@ -476,7 +476,14 @@ ol.themenbaumSearchResults { /*für Suchergebnisse*/
.labelSichtorComboButton { .labelSichtorComboButton {
color: var(--bulma-link-text); } /*#3273dc*/ /*für Linkfarbe; !important entfernt für CD-HS*/ color: var(--bulma-link-text); } /*#3273dc*/ /*für Linkfarbe; !important entfernt für CD-HS*/
.labelSichtorComboButtonPflicht::before {
content: "* "
}
.labelPflicht::before {
content: "* "
}
.label-container-dialog { /*für Dialogfelder*/ .label-container-dialog { /*für Dialogfelder*/
display: flex; display: flex;
justify-content: left; justify-content: left;

4
superx/xml/js/memtext/nd_functions.js

@ -80,7 +80,7 @@ function toggleNavpanelFrame(buttonElem) {
function themenbaumsuche(inpElem) function themenbaumsuche(inpElem)
{ {
var searchterm=inpElem.value; var searchterm=inpElem.value.toLowerCase();
var searchResultsElem=document.getElementById("themenbaumSearchResults"); var searchResultsElem=document.getElementById("themenbaumSearchResults");
if(searchterm=="") if(searchterm=="")
{ {
@ -96,7 +96,7 @@ function themenbaumsuche(inpElem)
var atLeastOneEntryFound=false; var atLeastOneEntryFound=false;
zs=""; zs="";
for (i = 0; i < menue.length; i++) { for (i = 0; i < menue.length; i++) {
if(menue[i].title.indexOf(searchterm) >-1) if(menue[i].title.toLowerCase().indexOf(searchterm) >-1)
{ {
if(menue[i].isMaske) if(menue[i].isMaske)
zs+= "<li><a style=\"display:inline;\" onclick=\"document.location='/superx/servlet/SuperXmlMaske?tid="+menue[i].maskeninfo_id +"&amp;navi=true';\">"+menue[i].title+"</a></li>"; zs+= "<li><a style=\"display:inline;\" onclick=\"document.location='/superx/servlet/SuperXmlMaske?tid="+menue[i].maskeninfo_id +"&amp;navi=true';\">"+menue[i].title+"</a></li>";

5
superx/xml/menue_html.xsl

@ -52,14 +52,15 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<!--</section> Ende Hero = Ende Info-Card--> <!--</section> Ende Hero = Ende Info-Card-->
</div> <!--Ende Site-Columns--> </div> <!--Ende Site-Columns-->
</body>
<footer> <footer>
<!--#Template Beginn Bottom-Navigation--> <!--#Template Beginn Bottom-Navigation-->
<xsl:call-template name="nd_navi_bottom" /> <xsl:call-template name="nd_navi_bottom" />
<!--#Template Ende Bottom-Navigation--> <!--#Template Ende Bottom-Navigation-->
</footer> </footer>
</body>
</html> </html>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

51
superx/xml/nd_templates.xsl

@ -2023,8 +2023,25 @@ Seite 1 von 1
<xsl:template name="nd_selectionform_field"> <xsl:template name="nd_selectionform_field">
<xsl:choose> <xsl:choose>
<xsl:when test="attribut!='hidden' and name!='##line##' and art!=18 and art != 13"> <xsl:when test="attribut!='hidden' and name!='##line##' and art!=18 and art != 13">
<xsl:variable name="DataTooltip">
<xsl:variable name="MaskFieldTooltipPosition">
<xsl:call-template name="MaskFieldTooltipPosition" />
</xsl:variable>
<xsl:if test="$MaskFieldTooltipPosition='left' or $MaskFieldTooltipPosition='both'">
<xsl:call-template name="br_to_newline">
<xsl:with-param name="string"><![CDATA[]]><xsl:value-of select="caption_long"/><![CDATA[]]></xsl:with-param>
<xsl:with-param name="search">&lt;br&gt;</xsl:with-param>
<!--<xsl:with-param name="replace"><xsl:text>&#10;</xsl:text></xsl:with-param>-->
</xsl:call-template>
</xsl:if>
</xsl:variable>
<div class="field is-grouped"> <div class="field is-grouped">
<div class="label-container" lang="de"> <div class="label-container" lang="de">
<xsl:if test="$DataTooltip!=''">
<xsl:attribute name="data-tooltip">
<xsl:value-of select="$DataTooltip"/>
</xsl:attribute>
</xsl:if>
<xsl:call-template name="nd_selectionform_field_label" /> <xsl:call-template name="nd_selectionform_field_label" />
</div> </div>
@ -2066,8 +2083,14 @@ Seite 1 von 1
<!-- end 0 --> <!-- end 0 -->
<!-- start 1,2--> <!-- start 1,2-->
<xsl:when test="(art='1' or art='2') and (@isDynamic='true' or zeilenanzahl &gt; 1)"> <xsl:when test="(art='1' or art='2') and (@isDynamic='true' or zeilenanzahl &gt; 1)">
<xsl:if test="obligatorisch='1'"><xsl:text>* </xsl:text></xsl:if> <span><xsl:attribute name="class">
<span class="labelSichtorComboButton"> <xsl:choose>
<xsl:when test="obligatorisch='1'"><xsl:text>labelSichtorComboButtonPflicht</xsl:text>
</xsl:when>
<xsl:otherwise><xsl:text>labelSichtorComboButton</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="onClick"> <xsl:attribute name="onClick">
<xsl:call-template name="ndMaskeComboLadenOnClick" /> <xsl:call-template name="ndMaskeComboLadenOnClick" />
</xsl:attribute> </xsl:attribute>
@ -2097,7 +2120,7 @@ Seite 1 von 1
<span> <span>
<xsl:choose> <xsl:choose>
<xsl:when test="obligatorisch='1'"> <xsl:when test="obligatorisch='1'">
<xsl:attribute name="class">labelPflicht</xsl:attribute><xsl:text>* </xsl:text></xsl:when> <xsl:attribute name="class">labelPflicht</xsl:attribute></xsl:when>
<xsl:otherwise><xsl:attribute name="class">labelNormal</xsl:attribute></xsl:otherwise> <xsl:otherwise><xsl:attribute name="class">labelNormal</xsl:attribute></xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:choose> <xsl:choose>
@ -2115,11 +2138,21 @@ Seite 1 von 1
<!-- start dojosicht--> <!-- start dojosicht-->
<xsl:template name="nd_SichtBtn"> <xsl:template name="nd_SichtBtn">
<span class="labelSichtorComboButton"> <xsl:param name="DataTooltip" />
<span>
<xsl:attribute name="class">
<xsl:choose>
<xsl:when test="obligatorisch='1'"><xsl:text>labelSichtorComboButtonPflicht</xsl:text>
</xsl:when>
<xsl:otherwise><xsl:text>labelSichtorComboButton</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="onClick"> <xsl:attribute name="onClick">
<xsl:call-template name="ndMaskeSichtLadenOnClick" /> <xsl:call-template name="ndMaskeSichtLadenOnClick" />
</xsl:attribute> </xsl:attribute>
<xsl:if test="obligatorisch='1'"><xsl:text>* </xsl:text></xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test="caption_short != ''"><![CDATA[]]><xsl:value-of select="caption_short"/><![CDATA[]]></xsl:when> <xsl:when test="caption_short != ''"><![CDATA[]]><xsl:value-of select="caption_short"/><![CDATA[]]></xsl:when>
<xsl:otherwise> <xsl:otherwise>
@ -2280,6 +2313,9 @@ Seite 1 von 1
<xsl:template name="nd_selectionform_field_input"> <xsl:template name="nd_selectionform_field_input">
<xsl:variable name="feldbreite_faktor">6</xsl:variable> <xsl:variable name="feldbreite_faktor">6</xsl:variable>
<xsl:variable name="MaskFieldTooltipPosition">
<xsl:call-template name="MaskFieldTooltipPosition" />
</xsl:variable>
<xsl:choose> <xsl:choose>
<xsl:when test="art='0' and zeilenanzahl!='1'"> <xsl:when test="art='0' and zeilenanzahl!='1'">
<textarea WRAP="on" class="resizable-textarea input is-small" > <textarea WRAP="on" class="resizable-textarea input is-small" >
@ -2597,7 +2633,7 @@ Seite 1 von 1
</div><!--Ende control is-expanded --> </div><!--Ende control is-expanded -->
<xsl:if test="caption_long != '' and art != '13' and art != '18' and art != '8' and art !='10' and art !='17'"> <xsl:if test="($MaskFieldTooltipPosition='right' or $MaskFieldTooltipPosition='both') and caption_long != '' and art != '13' and art != '18' and art != '8' and art !='10' and art !='17'">
<!--<span class="info" onclick="if(document.getElementById('{concat('f_',tid)}').style.display=='none')document.getElementById('{concat('f_',tid)}').style.display='block'; else document.getElementById('{concat('f_',tid)}').style.display='none'; return false;"> <!--<span class="info" onclick="if(document.getElementById('{concat('f_',tid)}').style.display=='none')document.getElementById('{concat('f_',tid)}').style.display='block'; else document.getElementById('{concat('f_',tid)}').style.display='none'; return false;">
<figure class="image is-24x24"> <figure class="image is-24x24">
@ -4032,7 +4068,10 @@ function exportTreeContents(what) {
<input name="RPTContentype" id="RPTContentype" type="hidden" value="" /> <input name="RPTContentype" id="RPTContentype" type="hidden" value="" />
<!-- nun der Dialog:--> <!-- nun der Dialog:-->
<xsl:call-template name="nd_tableExportDialogRPTA" />
</xsl:template>
<xsl:template name="nd_tableExportDialogRPTA">
<div dojoType="dialog" id="rpta_export_shortcut_dlg" bgColor="darkgray" bgOpacity="0.7" toggle="fade" toggleDuration="250" closeNode="rpta_export_shortcut_dlg" style="display:none"> <div dojoType="dialog" id="rpta_export_shortcut_dlg" bgColor="darkgray" bgOpacity="0.7" toggle="fade" toggleDuration="250" closeNode="rpta_export_shortcut_dlg" style="display:none">
<p align="center"><strong>Exportmenü für <label id="dlg_outformat">Dokumentformate</label></strong></p> <p align="center"><strong>Exportmenü für <label id="dlg_outformat">Dokumentformate</label></strong></p>
<table width="100%" border="1"> <table width="100%" border="1">

5
superx/xml/pageComponents_html.xsl

@ -2257,5 +2257,8 @@ jQuery.ajaxPrefilter( function( s ) {
<xsl:template name="customValidationCode" > <xsl:template name="customValidationCode" >
<!-- zum Überlagern durch pageComponents_html_final.xsl --> <!-- zum Überlagern durch pageComponents_html_final.xsl -->
</xsl:template> </xsl:template>
<xsl:template name="MaskFieldTooltipPosition" >
<!-- Zeige Tooltip und (bei "right" Icon). Default ist rechts vom Formularfeld, kann aber in pageComponents_html_final.xsl überlagert werden nach "left" oder "both" -->
<xsl:text>right</xsl:text>
</xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

7
superx/xml/submenu_html.xsl

@ -57,7 +57,12 @@
<xsl:call-template name="nd_menu_content" /> <xsl:call-template name="nd_menu_content" />
</div> <!--columns --> </div> <!--columns -->
<xsl:call-template name="footer" /> <footer>
<!--#Template Beginn Bottom-Navigation-->
<xsl:call-template name="nd_navi_bottom" />
<!--#Template Ende Bottom-Navigation-->
</footer>
</body> </body>
</html> </html>

Loading…
Cancel
Save