diff options
author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-03-22 00:21:04 -0300 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-03-22 14:10:08 +0100 |
commit | 0d0de1b0c16334322e584fcb770db68f66d2a042 (patch) | |
tree | 777f7ea5d27aa8275fd2cf34c0a6abc2a25de2bd /help3xsl | |
parent | 4a1008b6ee7043031e9b050adcf836c2f0c88a47 (diff) |
Add vnd.oasis.opendocument.* objects in new help
Add capability to link ODF files in help page as objects
Files are stored in media/files/ folder
Example in func_imsin.xhp
Change-Id: I4704e3cc235fd31251f3a4dba403e62f2ef1de0e
Reviewed-on: https://gerrit.libreoffice.org/51721
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'help3xsl')
-rw-r--r-- | help3xsl/help.js | 5 | ||||
-rw-r--r-- | help3xsl/online_transform.xsl | 18 | ||||
-rwxr-xr-x | help3xsl/xhp2html.sh | 10 |
3 files changed, 29 insertions, 4 deletions
diff --git a/help3xsl/help.js b/help3xsl/help.js index 8386055269..cd454e6fbe 100644 --- a/help3xsl/help.js +++ b/help3xsl/help.js @@ -48,13 +48,16 @@ function setSystem(system) { } } /* add &DbPAR= and &System= to the links in DisplayArea div */ +/* skip for object files */ function fixURL(module, system) { var itemlink = document.getElementById("DisplayArea").getElementsByTagName("a"); - var pSystem = (system === null) ? "WIN" : system; + var pSystem = (system === null) ? getSystem() : system; var pAppl = (module === null) ? "WRITER" : module; var n = itemlink.length; for (var i = 0; i < n; i++) { + if (itemlink[i].getAttribute("class") != "objectfiles"){ setURLParam(itemlink[i], pSystem, pAppl); + }; } } //Set the params inside URL diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 467f093a9b..6127ca924c 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -1099,6 +1099,24 @@ <audio src="{$data}" type="{@type}" controls="'1'"></audio> </div> </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.spreadsheet'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-calc.svg')}" width="25px" height="30px"></img></a> + </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.text'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-writer.svg')}" width="25px" height="30px"></img></a> + </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.presentation'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-impress.svg')}" width="25px" height="30px"></img></a> + </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.drawing'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-draw.svg')}" width="25px" height="30px"></img></a> + </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.formula'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-math.svg')}" width="25px" height="30px"></img></a> + </xsl:when> + <xsl:when test="@type='application/vnd.oasis.opendocument.database'"> + <a class="objectfiles" href="{concat($target,@data)}"><img src="{concat($target,'media/navigation/libo-base.svg')}" width="25px" height="30px"></img></a> + </xsl:when> <xsl:otherwise> <object width="{$width}" height="{$height}" data="{$data}" type="{@type}"></object> </xsl:otherwise> diff --git a/help3xsl/xhp2html.sh b/help3xsl/xhp2html.sh index 335a1abe59..6da95dbd95 100755 --- a/help3xsl/xhp2html.sh +++ b/help3xsl/xhp2html.sh @@ -40,7 +40,7 @@ echo $stub1 >> $bookmarkFile xslfile=get_bookmark.xsl -param1=' --stringparam Language '$lang' --stringparam productversion '$productversion +param1=' --stringparam Language '$lang' --stringparam productversion '$productversion' --stringparam local no' # bookmarks for modules @@ -90,9 +90,10 @@ function convert2HTML() { # ########################################### -xsltparm='--stringparam fileTree '$6' --stringparam local '$5' --stringparam Language '$3' --stringparam productversion '$4' --stringparam root '$1'/' +xsltparm='--stringparam fileTree '$6' --stringparam local no --stringparam Language '$3' --stringparam productversion '$4' --stringparam root '$1'/' echo 'Conversion to HTML started for '$3 + for filep in $(find $1/text -name "*.xhp") do DIR=${filep##*text/} @@ -115,11 +116,13 @@ ALL_TREE='sbasic.tree scalc.tree schart.tree shared.tree simpress.tree smat xhpFiles=$here/l10n/$productversion/$3/text treeFileHTML=$outDirHTML/contents.js + rm -f $treeFileHTML touch $treeFileHTML + echo 'document.getElementById("Contents").innerHTML='$'\047''\'>$treeFileHTML -xsltparm='--stringparam lang '$3' --stringparam productversion '$4 +xsltparm='--stringparam lang '$3' --stringparam productversion '$4' --stringparam local no' for tree in $ALL_TREE do treeSourceFile=$root'/helpcontent2/source/auxiliary/'$tree @@ -155,6 +158,7 @@ fileTree='/' rootHelpex=/home/tdf/git/core ALL_LANGS='en-US am ar ast bg bn bn-IN bo bs ca ca-valencia cs da de dz el en-GB en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lo lt lv mk nb ne nl nn om pl pt-BR pt ro ru sid si sk sl sq sv ta tg tr ug uk vi zh-CN zh-TW' + here=$(pwd) root=$(realpath "$here/../..") |