[Libreoffice-commits] help.git: source/default.css source/help.js source/index.html source/online_transform.xsl
Olivier Hallot
ohallot at collabora.co.uk
Fri Nov 11 19:49:25 UTC 2016
source/default.css | 28 +++++++++++------------
source/help.js | 3 ++
source/index.html | 4 +--
source/online_transform.xsl | 53 ++++++++------------------------------------
4 files changed, 29 insertions(+), 59 deletions(-)
New commits:
commit 383f9c4105ba03f86aa722b4881e7f690e017baa
Author: Olivier Hallot <ohallot at collabora.co.uk>
Date: Thu Nov 10 19:27:26 2016 -0200
Cleanups and debug info for online help
Add display of help page filename on top right
Normalize media files (part)
Change-Id: Ib6123efde1113adeb1470565a036e605a9d82b7e
Reviewed-on: https://gerrit.libreoffice.org/30765
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Reviewed-by: Olivier Hallot <olivier.hallot at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/source/default.css b/source/default.css
index 8863bbe..3df6e8a 100644
--- a/source/default.css
+++ b/source/default.css
@@ -33,7 +33,7 @@ body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .ta
pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
{ font-family: "Cumberland AMT",Cumberland,"Courier New","Nimbus Mono L","Bitstream Vera Sans Mono",Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
-.acronym
+.acronym
{ font-weight: bold; }
.related
@@ -69,7 +69,7 @@ h4, h5, h6
.relatedtopics
{ font-weight: normal; }
-.relatedbody
+.relatedbody
{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
.howtoget
@@ -78,13 +78,13 @@ h4, h5, h6
.howtogetbody
{ background:#EEEEEE; margin: 0px;}
-.wide
+.wide
{ width: 100%; }
.topalign
{ vertical-align: top; border: 1px;}
-.bug
+.bug
{ color: red; border: 1px solid red;}
.debug
@@ -94,7 +94,7 @@ h4, h5, h6
.identifier, .unknown
{ color: green;}
-.keyword
+.keyword
{ color: blue;}
.comment
@@ -102,7 +102,7 @@ h4, h5, h6
.number, .string
{ color: red;}
-
+
.operator, .parameter
{ color: black;}
@@ -118,7 +118,7 @@ h4, h5, h6
.topmenu{
color: green;
background-color: white;
- font-size:16pt;
+ font-size:24pt;
font-weight:bold;
}
.indexlink{font-size: 10pt; margin-top: 2px; margin-bottom: 2px;}
@@ -126,8 +126,8 @@ h4, h5, h6
#DisplayArea{
position: fixed;
bottom: 5px;
-right: 5px;
-overflow:auto;
+right: 5px;
+overflow:auto;
width: 70%;
height: 90%;
}
@@ -135,8 +135,8 @@ height: 90%;
#BottomLeft {
position: fixed;
bottom: 5px;
-left: 5px;
-overflow:auto;
+left: 5px;
+overflow:auto;
width: 29%;
height: 90%;
}
@@ -164,9 +164,9 @@ left:25%;
background-color: green;
font-family: Arial;
font-weight: bold;
-font-size: 24pt;
-border: 1px solid black;
-padding-bottom: 6px;
+font-size: 24pt;
+border: 1px solid black;
+padding-bottom: 6px;
margin-bottom: 6px;
}
.embedded {
diff --git a/source/help.js b/source/help.js
index 03b7e6f..7cc7157 100644
--- a/source/help.js
+++ b/source/help.js
@@ -66,6 +66,7 @@ function displayResult(file, moduleName, language, system)
var usedb = urlVars["UseDB"];
document.getElementById("DisplayArea").innerHTML= null;
document.getElementById("BottomLeft").innerHTML= null;
+ document.getElementById("TopRight").innerHTML= null;
if (window.ActiveXObject || xhttp.responseType == "msxml-document") {
// code for IE
@@ -86,6 +87,7 @@ function displayResult(file, moduleName, language, system)
var xml = loadXMLDoc($(this).attr('href'), 1);
var resultDocument = xsltProcessor.transformToFragment(xml, document);
$("#DisplayArea").html($(resultDocument).find('#DisplayArea').html());
+ $("#TopRight").html('<p class="bug">Contents displayed is: '+$(this).attr('href')+'</p>');
return false;
});
@@ -94,6 +96,7 @@ function displayResult(file, moduleName, language, system)
$("#DisplayArea").html($(resultDocument).find('#DisplayArea').html());
// Handle bookmar panel
$("#BottomLeft").load('bookmark_'+moduleName+'.html');
+ $("#TopRight").html('<p class="bug">Contents displayed is: '+$(this).attr('href')+'</p>');
}
}
diff --git a/source/index.html b/source/index.html
index 90b5726..0ed44ed 100644
--- a/source/index.html
+++ b/source/index.html
@@ -31,8 +31,8 @@
</tr>
</table>
</div>
- <div id="BottomLeft">
- </div>
+ <div id="BottomLeft"></div>
+ <div id="TopRight"></div>
<script>
if (window.location.href.indexOf('?') && getParameterByName('page')) {
var module = getParameterByName("DbPAR");
diff --git a/source/online_transform.xsl b/source/online_transform.xsl
index b5f1157..42e5def 100644
--- a/source/online_transform.xsl
+++ b/source/online_transform.xsl
@@ -111,7 +111,7 @@
<!-- parts of help and image urls -->
<!--<xsl:variable name="help_url_prefix" select="'vnd.sun.star.help://'"/>-->
<xsl:variable name="help_url_prefix" select="''"/>
-<xsl:variable name="img_url_prefix" select="concat('/media',$imgtheme,'/')"/>
+<xsl:variable name="img_url_prefix" select="concat('media',$imgtheme,'/')"/>
<!-- <xsl:variable name="img_url_prefix" select="concat('vnd.libreoffice.image://',$imgtheme,'/')"/> -->
<!--<xsl:variable name="urlpost" select=""/>-->
<xsl:variable name="urlpost" select="concat('?Language=',$lang,$am,'System=',$System,$am,'UseDB=no')"/>
@@ -121,11 +121,12 @@
<xsl:variable name="css" select="'default.css'"/>
+<xsl:variable name="csslink" select="concat($urlpre,$css)"/>
<!-- images for notes, tips and warnings -->
-<xsl:variable name="note_img" select="concat($img_url_prefix,'/helpimg/note.png')"/>
-<xsl:variable name="tip_img" select="concat($img_url_prefix,'/helpimg/tip.png')"/>
-<xsl:variable name="warning_img" select="concat($img_url_prefix,'/helpimg/warning.png')"/>
+<xsl:variable name="note_img" select="concat($img_url_prefix,'helpimg/note.png')"/>
+<xsl:variable name="tip_img" select="concat($img_url_prefix,'helpimg/tip.png')"/>
+<xsl:variable name="warning_img" select="concat($img_url_prefix,'helpimg/warning.png')"/>
<!--<xsl:variable name="note_img" select="concat($img_url_prefix,$lang,'res/helpimg/note.png')"/>
<xsl:variable name="tip_img" select="concat($img_url_prefix,'res/helpimg/tip.png')"/>
<xsl:variable name="warning_img" select="concat($img_url_prefix,'res/helpimg/warning.png')"/>-->
@@ -137,43 +138,9 @@
<!-- Create the document skeleton -->
<xsl:template match="/">
- <!--<xsl:variable name="csslink" select="concat($urlpre,'/',$urlpost)"/>-->
- <xsl:variable name="csslink" select="concat($urlpre,'default.css')"/>
-<!--<![CDATA[<!DOCTYPE html>]]>-->
- <html>
- <head>
- <title><xsl:value-of select="$title"/></title>
- <link href="{$csslink}" rel="Stylesheet" type="text/css" />
- <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
- </head>
- <body lang="{$lang}">
- <div id="DisplayArea" style="position: fixed;bottom: 5px;right: 5px; overflow:auto; width: 70%;height: 90%;">
- <xsl:apply-templates select="/helpdocument/body"/>
- </div>
- <div id="BottomLeft" style="position: fixed;bottom: 5px;left: 5px; overflow:auto; width: 30%;height: 90%;">
- <p>Index will be put here</p>
- </div>
- <div id="TopRight" style="position: fixed;top: 5px;right: 5px;">
- <p> Top Right Area</p>
- </div>
- <div id="TopLeft" style="display:none; position: fixed;top: 5px;left: 5px;">
- <table>
- <tr>
- <td class="topmenu"><a href="text/scalc/main0000.xhp">Calc</a></td>
- <td class="topmenu"><a href="text/swriter/main0000.xhp">Writer</a></td>
- <td class="topmenu"><a href="text/simpress/main0000.xhp">Impress</a></td>
- <td class="topmenu"><a href="text/sdraw/main0000.xhp">Draw</a></td>
- <td class="topmenu"><a href="text/schart/main0000.xhp">Chart</a></td>
- <td class="topmenu"><a href="text/sbasic/shared/main0601.xhp">Basic</a></td>
- <td class="topmenu"><a href="text/smath/main0000.xhp">Math</a></td>
- <td class="topmenu"><a href="text/shared/explorer/database/main.xhp">Base</a></td>
- <td class="topmenu"><a href="text/shared/guide/main.xhp">Guide</a></td>
- </tr>
- </table>
- <div id="xmfile"><p class="infopage">This page is: <xsl:value-of select="$filename"/></p></div>
- </div>
- </body>
- </html>
+ <div id="DisplayArea">
+ <xsl:apply-templates select="/helpdocument/body"/>
+ </div>
</xsl:template>
<!-- AHELP -->
@@ -280,7 +247,7 @@
</xsl:template>
<!-- FILENAME -->
-<xsl:template match="filename" />
+<xsl:template match="filename"/>
<!-- HISTORY -->
<xsl:template match="history" />
@@ -688,7 +655,7 @@
<!-- <p>href: <xsl:value-of select="$href"/></p>
<p>anchor: <xsl:value-of select="$anchor"/></p>
<p>document: <xsl:value-of select="$doc"/></p>-->
- <p>image source: <xsl:value-of select="$imgsrc"/></p>
+ <p class="bug">image source: <xsl:value-of select="$imgsrc"/></p>
<div class="{$type}">
<table border="0" class="{$type}" cellspacing="0" cellpadding="5">
<tr>
More information about the Libreoffice-commits
mailing list