X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c076154f1220c417c4cd17d178d5f94c5c88d83b..f7135da39f77154495d308d05c46e7b30e964d2d:/redakcja/static/xsl/wl2html_client.xsl

diff --git a/redakcja/static/xsl/wl2html_client.xsl b/redakcja/static/xsl/wl2html_client.xsl
index 97f5de3b..f115a4b7 100644
--- a/redakcja/static/xsl/wl2html_client.xsl
+++ b/redakcja/static/xsl/wl2html_client.xsl
@@ -213,6 +213,20 @@
         </div>
     </xsl:template>
 
+    <!--
+        Tagi obejmujące tekst w ramce (styl wieloakapitowy bądź wielostrofowy):
+        <ramka> tekst-w-ramce </ramka>
+    -->
+    <xsl:template match="ramka">
+        <xsl:param name="mixed" />
+        <div>
+            <xsl:call-template name="standard-attributes" />
+            <xsl:apply-templates select="child::node()">
+                <xsl:with-param name="mixed" select="false()" />
+            </xsl:apply-templates>
+        </div>
+    </xsl:template>
+
     <!--
         Tagi obejmujące tekst motta (styl wieloakapitowy bądź wielostrofowy):
         <motto> tekst-motta </motto>
@@ -800,41 +814,29 @@
     <!--
         Tabela
     -->
-    <xsl:template match="tabela">
-      <table x-node="tabela" class="tabela">
-        <xsl:call-template name="standard-attributes" />
-	<tbody x-pass-thru="true">
-            <xsl:apply-templates select="child::node()">
-                <xsl:with-param name="mixed" select="true()" />
-            </xsl:apply-templates>
-	</tbody>
-      </table>
-    </xsl:template>
 
     <xsl:template match="wiersz">
-      <tr x-node="wiersz" class="wiersz">
-            <xsl:call-template name="standard-attributes" />
-            <xsl:apply-templates select="child::node()">
-                <xsl:with-param name="mixed" select="true()" />
-            </xsl:apply-templates>
-      </tr>
+      <span>
+        <xsl:call-template name="standard-attributes" />
+        <xsl:apply-templates select="child::node()">
+	  <xsl:with-param name="mixed" select="true()" />
+        </xsl:apply-templates>
+      </span>
     </xsl:template>
 
 
     <xsl:template match="kol">
-      <td x-pass-thru="true">
-	    <div x-editable="true" x-node="kol" class="kol">
-	      <!-- this wrapper div is necessary for 
-		   relative element to appear correctly
-		   here it's a 'edit' button -->
+      <span>
             <xsl:call-template name="standard-attributes" />
+	    <div x-editable="true" x-node="kol-inside" x-pass-thru="true">
               <xsl:apply-templates select="child::node()">
-                <xsl:with-param name="mixed" select="true()" />
+		<xsl:with-param name="mixed" select="true()" />
               </xsl:apply-templates>
 	    </div>
-      </td>
+      </span>
     </xsl:template>
 
+
     <!--
         Obraz
     -->
@@ -847,7 +849,7 @@
     <!--
         Semantyczne pudełka
     -->
-    <xsl:template match="pomoce|forma|czas|opis">
+    <xsl:template match="pomoce|forma|czas|opis|kol-inside">
       <span x-editable="true">
             <xsl:call-template name="standard-attributes" />
             <xsl:apply-templates select="child::node()">
@@ -907,8 +909,10 @@
     </xsl:template>
 
     <xsl:template match="*">
-        <span class="unknown-tag" x-node="{name()}">
-            <xsl:call-template name="standard-attributes" />
+        <span>
+            <xsl:call-template name="standard-attributes">
+                <xsl:with-param name="extra-class">unknown-tag</xsl:with-param>
+            </xsl:call-template>
             <xsl:apply-templates select="child::node()">
                 <xsl:with-param name="mixed" select="true()" />
             </xsl:apply-templates>