From bf91f9dbd975419173bccccc67c8bcebda4dffe1 Mon Sep 17 00:00:00 2001
From: Ozbolt Menegatti <ozbolt.menegatti@gmail.com>
Date: Wed, 31 Oct 2018 12:43:42 +0100
Subject: [PATCH] Uniting pomen/podpomen logic within single template

---
 view.xsl | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/view.xsl b/view.xsl
index 96904f5..cb130ed 100644
--- a/view.xsl
+++ b/view.xsl
@@ -65,7 +65,21 @@
         }
         
     </style>
-    </xsl:variable>    
+    </xsl:variable>
+    
+    <!-- ********************************
+         Pomen/podpomen logic
+         ******************************** -->
+        
+    <xsl:template name="pomen_podpomen_logic">
+         <xsl:apply-templates select="indikator | oznaka | pomenska_shema"/>
+        <div style="padding: 0.5em 0;">
+            <a class="morelessbutton"  href="javascript:void(null)">▼ more</a>
+        </div>
+        <div class="hideable" style="display: none">
+            <xsl:apply-templates select="skladenjske_skupine"/>
+        </div>
+    </xsl:template>
     
     <!-- ********************************
         Here are all of xslt rules
@@ -125,20 +139,8 @@
                 <xsl:number />
             </div>
             <div style="margin-left: 2em;">
-                <xsl:apply-templates select="podpomen | indikator | oznaka | pomenska_shema"/>
-                <xsl:choose>
-                    <xsl:when test="count(../pomen)&gt;1 and skladenjske_skupine//text()">
-                        <div style="padding: 0.5em 0;">
-                            <a class="morelessbutton"  href="javascript:void(null)">▼ more</a>
-                        </div>
-                        <div class="hideable" style="display: none">
-                            <xsl:apply-templates select="skladenjske_skupine"/>
-                        </div>
-                    </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:apply-templates select="skladenjske_skupine"/>
-                    </xsl:otherwise>
-                </xsl:choose>
+                <xsl:call-template name="pomen_podpomen_logic"/>
+                <xsl:apply-templates select="podpomen"/>
             </div>
             <div style="clear: left;"></div>
         </div>
@@ -151,7 +153,7 @@
     
         <div style="margin-bottom: 0.5em;">
             <xsl:value-of select="$pomenNum"/>.<xsl:number/>
-            <xsl:apply-templates/>
+            <xsl:call-template name="pomen_podpomen_logic"/>
         </div>
     </xsl:template>