Merge pull request #571 from openSUSE/suseheader-fix

Fix SUSE header to avoid issues with new+old header code
openSUSE · Aug 28, 2023 · 1fb0820 · 1fb0820
2 parents ff360ed + 5bb9048
commit 1fb0820
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 30 deletions.
diff --git a/suse2022-ns/xhtml/chunk-common.xsl b/suse2022-ns/xhtml/chunk-common.xsl
@@ -257,23 +257,27 @@
       <body>
         <xsl:call-template name="body.attributes" />
         <xsl:call-template name="outerelement.class.attribute" />
-        <xsl:if test="$include.suse.header">
-          <xsl:variable name="candidate.suse.header.body">
-            <xsl:call-template name="string.subst">
-              <xsl:with-param name="string" select="$include.ssi.body" />
-              <xsl:with-param name="target" select="$placeholder.ssi.language" />
-              <xsl:with-param name="replacement" select="$lang-attr" />
+        <xsl:choose>
+          <xsl:when test="number($include.suse.header) = 1">
+            <xsl:variable name="candidate.suse.header.body">
+              <xsl:call-template name="string.subst">
+                <xsl:with-param name="string" select="$include.ssi.body" />
+                <xsl:with-param name="target" select="$placeholder.ssi.language" />
+                <xsl:with-param name="replacement" select="$lang-attr" />
+              </xsl:call-template>
+            </xsl:variable>
+            <xsl:text>&#10;</xsl:text>
+            <xsl:comment>#include virtual="<xsl:value-of select="$candidate.suse.header.body" />"</xsl:comment>
+            <xsl:text>&#10;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="bypass">
+              <xsl:with-param name="format" select="'chunk'" />
             </xsl:call-template>
-          </xsl:variable>
-          <xsl:text>&#10;</xsl:text>
-          <xsl:comment>#include virtual="<xsl:value-of select="$candidate.suse.header.body" />"</xsl:comment>
-          <xsl:text>&#10;</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="bypass">
-          <xsl:with-param name="format" select="'chunk'" />
-        </xsl:call-template>
 
-        <xsl:call-template name="user.header.content" />
+            <xsl:call-template name="user.header.content" />
+          </xsl:otherwise>
+        </xsl:choose>
 
         <xsl:call-template name="breadcrumbs.navigation" />
 

diff --git a/suse2022-ns/xhtml/docbook.xsl b/suse2022-ns/xhtml/docbook.xsl
@@ -755,14 +755,17 @@
         <xsl:call-template name="body.attributes"/>
         <xsl:call-template name="outerelement.class.attribute"/>
 
-        <xsl:if test="$include.suse.header">
-          <xsl:text>&#10;</xsl:text>
-          <xsl:comment>#include virtual="<xsl:value-of select="$candidate.suse.header.body"/>"</xsl:comment>
-          <xsl:text>&#10;</xsl:text>
-        </xsl:if>
-        <xsl:call-template name="bypass"/>
-
-        <xsl:call-template name="user.header.content"/>
+        <xsl:choose>
+          <xsl:when test="number($include.suse.header) = 1">
+            <xsl:text>&#10;</xsl:text>
+            <xsl:comment>#include virtual="<xsl:value-of select="$candidate.suse.header.body"/>"</xsl:comment>
+            <xsl:text>&#10;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:call-template name="bypass" />
+            <xsl:call-template name="user.header.content" />
+          </xsl:otherwise>
+        </xsl:choose>
 
         <xsl:call-template name="breadcrumbs.navigation"/>
 
@@ -915,13 +918,11 @@ if (window.location.protocol.toLowerCase() != 'file:') {
       </xsl:call-template>
     </xsl:variable>
 
-      <xsl:if test="$include.suse.header = 0">
-        <header id="_mainnav">
-          <div class="growth-inhibitor">
-            <xsl:call-template name="create.header.logo"/>
-          </div>
-        </header>
-      </xsl:if>
+    <header id="_mainnav">
+      <div class="growth-inhibitor">
+        <xsl:call-template name="create.header.logo" />
+      </div>
+    </header>
   </xsl:template>
 
   <xsl:template name="user.footer.content">