From 56cd45393209c74ec4925e91ff62c768cce54903 Mon Sep 17 00:00:00 2001
From: Ozbolt Menegatti <ozbolt.menegatti@gmail.com>
Date: Wed, 31 Oct 2018 14:49:01 +0100
Subject: [PATCH] Changed zgled list from <div>s to <ul><li>s

Also, highlighting kolokator and iztocnica in zgled-s.
---
 view.xsl | 56 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/view.xsl b/view.xsl
index cb130ed..d355a0f 100644
--- a/view.xsl
+++ b/view.xsl
@@ -35,7 +35,8 @@
     <style type="text/css">
         :root {
             --light-gray: #999999;
-            --dark-gray: #666666
+            --dark-gray: #666666;
+            --light-red: #dd8899;
         }
 
         .xslt-clanek {
@@ -63,7 +64,26 @@
             color: var(--light-gray); 
             font-weight: bold;
         }
+        .xslt-indicator {
+            color: var(--light-gray); 
+            font-style: italic; 
+            text-transform: uppercase;
+        }
+        .xslt-zgledi {
+            list-style-type: circle; 
+            float: left; 
+            margin-left: 0em; 
+            color: var(--dark-gray); 
+            margin: 0.5em 0;"
+        }
+        .xslt-zgled-highlight {
+            color: var(--light-red);
+        }
         
+        .xslt-clear {
+            clear:both; 
+            font-size:0;
+        }
     </style>
     </xsl:variable>
     
@@ -72,11 +92,11 @@
          ******************************** -->
         
     <xsl:template name="pomen_podpomen_logic">
-         <xsl:apply-templates select="indikator | oznaka | pomenska_shema"/>
+        <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">
+        <div class="hideable" style="display: none; ">
             <xsl:apply-templates select="skladenjske_skupine"/>
         </div>
     </xsl:template>
@@ -93,7 +113,7 @@
                          
     <!-- Tags to convert to insert space before -->
     
-    <xsl:template match="zgled//* | kolokacije//p | kolokacije//i">
+    <xsl:template match="kolokacije//p | kolokacije//i">
         <xsl:text xml:space="preserve"> </xsl:text>
         <xsl:apply-templates/>
     </xsl:template>
@@ -166,9 +186,10 @@
     <xsl:template match="kolokacija | r_kolokacija">
         <xsl:text xml:space="preserve"> </xsl:text>
         <span style="color: #cc3366;">
-            <xsl:apply-templates/>
+            <xsl:apply-templates select="ks | p | i"/>
         </span>
         <xsl:text xml:space="preserve"> </xsl:text>
+        <xsl:apply-templates select="zgledi"/>
     </xsl:template>
     
     <xsl:template match="kolokacije//ks">
@@ -184,27 +205,26 @@
     
     <xsl:template match="indikator | oznaka">
         <xsl:text xml:space="preserve"> </xsl:text>
-        <span style="color: #999999; font-style: italic; text-transform: uppercase">
+        <span class="xslt-indicator">
             <xsl:apply-templates/>
         </span>
         <xsl:text xml:space="preserve"> </xsl:text>
     </xsl:template>
     
    <xsl:template match="zgledi">
-        <div style="margin: 0.5em 0;">
+        <ul class="xslt-zgledi" >
             <xsl:apply-templates/>
-        </div>
+        </ul>
+        <div class="xslt-clear"></div>
     </xsl:template>
     
     <xsl:template match="zgled">
-        <div>
-            <div style="float: left; margin-left: 0.5em; color: #999999;">
-                »
-            </div>
-            <div style="margin-left: 2em; color: #666666; font-weight: bold;">
-                <xsl:apply-templates/>
-            </div>
-            <div style="clear: left;"></div>
-        </div>
-    </xsl:template>    
+        <li><xsl:apply-templates/></li>
+    </xsl:template>
+    
+    <xsl:template match="zgled//i | zgled//k | zgled//l">
+        <xsl:text xml:space="preserve"> </xsl:text>
+        <span class="xslt-zgled-highlight"><xsl:apply-templates/></span>
+    </xsl:template>
+        
   </xsl:stylesheet>