[Libreoffice-commits] dev-tools.git: help3/xhpeditor

Olivier Hallot (via logerrit) logerrit at kemper.freedesktop.org
Mon Dec 2 19:48:48 UTC 2019


 help3/xhpeditor/ed_transform.xsl |    8 ++++----
 help3/xhpeditor/xhpeditor.css    |   13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit d18de796c7d7a9fed727c5d900f94aa03f94b9f1
Author:     Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Mon Dec 2 16:07:02 2019 -0300
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Mon Dec 2 20:48:31 2019 +0100

    Move editor to php (4) (WIP)
    
    Fix image position
    Improve rendered CSS
    
    Change-Id: I82c756c201b5b24ec3cc2c7de84fe62b11e6904b
    Reviewed-on: https://gerrit.libreoffice.org/84265
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
    Tested-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/help3/xhpeditor/ed_transform.xsl b/help3/xhpeditor/ed_transform.xsl
index f37121a..ab998d2 100644
--- a/help3/xhpeditor/ed_transform.xsl
+++ b/help3/xhpeditor/ed_transform.xsl
@@ -55,7 +55,7 @@
 <xsl:variable name="brand4" select="'%PRODUCTVERSION'"/>
 
 <!-- Installation -->
-<xsl:variable name="target" select="'/help_editor/'"/>
+<xsl:variable name="target" select="''"/>
 <xsl:variable name="source" select="$root"/>
 
 <!-- meta data variables from the help file -->
@@ -952,7 +952,7 @@
                         <xsl:variable name="tmp1" select="substring-after(@src, '/ui/')"/>
                         <xsl:variable name="tmp2" select="substring-before($tmp1,'/')"/>
                         <xsl:variable name="tmp3" select="substring-after($tmp1,'/')"/>
-                        <xsl:value-of select="concat($source,'source/',$tmp0,'/ui/', $tmp2, '/',$lang,'/',$tmp3)"/>
+                        <xsl:value-of select="concat($source,'/',$tmp0,'/ui/', $tmp2, '/',$lang,'/',$tmp3)"/>
                     </xsl:when>
                     <xsl:otherwise>
                         <xsl:value-of select="concat($source,'source/', at src)"/>
@@ -996,7 +996,7 @@
             <xsl:call-template name="convert2px"><xsl:with-param name="value" select="@height"/></xsl:call-template>
         </xsl:if>
     </xsl:variable>
-    <p class="bug">image href: <xsl:value-of select="$src2"/></p>
+    <p class="debugembed">Image href: <xsl:value-of select="$src2"/></p>
     <img src="{$src2}" alt="{$alt}" title="{$alt}" height="{$height}" width="{$width}">
         <xsl:if test="ancestor::tablecell">
             <xsl:attribute name="class"><xsl:value-of select="'imageicon'"/></xsl:attribute>
@@ -1177,7 +1177,7 @@
             <xsl:with-param name="doc" select="$docum" />
             <xsl:with-param name="anchor" select="$anc" />
         </xsl:call-template>
-        <p class="bug">Embed href: <xsl:value-of select="$href"/>#<xsl:value-of select="$anc"/></p>
+        <p class="debugembed">Embed href: <xsl:value-of select="$href"/>#<xsl:value-of select="$anc"/></p>
     </div>
 </xsl:template>
 
diff --git a/help3/xhpeditor/xhpeditor.css b/help3/xhpeditor/xhpeditor.css
index 519ce32..797b10b 100644
--- a/help3/xhpeditor/xhpeditor.css
+++ b/help3/xhpeditor/xhpeditor.css
@@ -306,6 +306,9 @@ icontable {
 .bug {
     color: red;
 }
+.debugembed {
+    color: magenta;
+}
 .debug {
     border: 1px solid black;
     padding: 3px;
@@ -326,3 +329,13 @@ icontable {
     margin-top:15px;
     margin-bottom: 15px;
 }
+.screenshot, .genericimage {
+    border-collapse: collapse;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 2em;
+    margin-bottom: 2em;
+    border-style:none;
+    display:block;
+    box-shadow: 10px 10px 5px grey;
+}


More information about the Libreoffice-commits mailing list