Zachowywanie i wyświetlanie tekstu out-of-flow.

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index d6a4487..3c168c1 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -518,4 +518,9 @@
 
 #theme-edit-dialog .theme-mutli-list input:checked + label {
     font-weight: bold;
 
 #theme-edit-dialog .theme-mutli-list input:checked + label {
     font-weight: bold;

-}*/
\ No newline at end of file
+}*/
+
+.out-of-flow-text {
+    border: 1px solid #C8B849;
+    background-color: #D4CB9C;
+}
\ No newline at end of file

diff --git a/platforma/static/xsl/html2wl_client.xsl b/platforma/static/xsl/html2wl_client.xsl
index 9e6a8be..7660293 100755 (executable)
--- a/platforma/static/xsl/html2wl_client.xsl
+++ b/platforma/static/xsl/html2wl_client.xsl
@@ -33,7 +33,7 @@
         </xsl:element>\r
     </xsl:template>   \r
 \r
         </xsl:element>\r
     </xsl:template>   \r
 \r

-    <xsl:template match="*[@x-node = 'out-of-flow-text']"><xsl:value-of select="@x-content" /></xsl:template>\r
+    <xsl:template match="*[@x-node = 'out-of-flow-text']"><xsl:value-of select="." /></xsl:template>\r

 \r
     <!-- Specjalne reguły dla wersów -->\r
     <xsl:template match="*[@x-node = 'wers']">\r
 \r
     <!-- Specjalne reguły dla wersów -->\r
     <xsl:template match="*[@x-node = 'wers']">\r

diff --git a/platforma/static/xsl/wl2html_client.xsl b/platforma/static/xsl/wl2html_client.xsl
index 517d59b..8cd780e 100755 (executable)
--- a/platforma/static/xsl/wl2html_client.xsl
+++ b/platforma/static/xsl/wl2html_client.xsl
@@ -27,7 +27,7 @@
     <xsl:template match="utwor">
         <div>
             <xsl:call-template name="standard-attributes" />
     <xsl:template match="utwor">
         <div>
             <xsl:call-template name="standard-attributes" />

-            <xsl:apply-templates select="child::*">
+            <xsl:apply-templates select="child::* | text()">

                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
         </div>
                 <xsl:with-param name="mixed" select="false()" />
             </xsl:apply-templates>
         </div>


@@ -701,11 +701,11 @@
     -->
 
     <xsl:template match="text()">
     -->
 
     <xsl:template match="text()">

+        <!-- <xsl:value-of select="." /> -->

         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />
         <xsl:param name="mixed" />
         <xsl:choose>
             <xsl:when test="normalize-space(.) = ''" />

-            <xsl:when test="not($mixed)"><span x-node="out-of-flow-text" class="out-of-flow-text"
-                    x-content="{.}"></span></xsl:when>
+            <xsl:when test="not($mixed)"><div x-node="out-of-flow-text" class="out-of-flow-text"><xsl:value-of select="." /></div></xsl:when>

             <xsl:otherwise><xsl:value-of select="." /></xsl:otherwise>
         </xsl:choose>
     </xsl:template>
             <xsl:otherwise><xsl:value-of select="." /></xsl:otherwise>
         </xsl:choose>
     </xsl:template>