[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.2' - 4 commits - help3xsl/default.css help3xsl/online_transform.xsl
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 26 14:33:52 UTC 2019
help3xsl/default.css | 12 +++++-------
help3xsl/online_transform.xsl | 34 ++++++++++++++++------------------
2 files changed, 21 insertions(+), 25 deletions(-)
New commits:
commit 44e403cdedc700d814fc62c8f435405ced0bb85d
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 26 16:21:19 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 26 16:21:19 2019 +0200
[cp] Add version number to database name
in order not to get search results from different versions
Change-Id: I14b1546468f5bfb4bca4d0562f2f9a03caecbe11
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 04a601fee..9e1a458bd 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -220,7 +220,7 @@
<xsl:if test="$online">
<div class="xapian-omega-search">
<form name="P" method="get" action="/cgi-bin/omega/omega" target="_top">
- <input type="hidden" name="DB" value="{$lang}"/>
+ <input type="hidden" name="DB" value="{$lang}62"/>
<input type="hidden" name="FMT" value="cp-query"/>
<input type="hidden" name="DEFAULTOP" value="and"/>
<input id="omega-autofocus" type="search" name="P" size="65"/>
commit d1761aa16ae37a207e15e1579e6bcd850c574a9a
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 26 16:20:26 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 26 16:20:26 2019 +0200
[cp] Fix header's background color
Change-Id: I35c3402c6b0c8db5650ab947f6a01b2168fb1bd5
diff --git a/help3xsl/default.css b/help3xsl/default.css
index fccdc8190..a4110e4a9 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -346,7 +346,6 @@ h6 {
grid-area: header;
}
header {
- background-color: #fff;
color: #5c3de2;
height: 64px;
padding: 8px 8px 8px 16px;
commit 1e3c9fcd892d91595687b21a6143c3901a4691bc
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 26 16:19:06 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 26 16:19:06 2019 +0200
[cp] Fix style and position of search bar
Change-Id: Idf442ddadfb30e0708bc5f37cf030dc469118c0e
diff --git a/help3xsl/default.css b/help3xsl/default.css
index cfc659602..fccdc8190 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -799,11 +799,10 @@ li.disabled a {
grid-area: rightside;
}
.xapian-omega-search {
- grid-area: google;
- position: sticky;
- top: 0px;
- background-color: #FCFCFC;
- box-shadow: none;
+ margin: 0;
+ position: absolute;
+ top: 19px;
+ left: 360px;
}
.donation {
max-width: 400px;
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 40dddc353..04a601fee 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -216,9 +216,8 @@
</aside>
<div id="DisplayArea" itemprop="articleBody">
<xsl:apply-templates select="/helpdocument/body"/>
- </div>
- <div class="google-donation">
- <xsl:if test="$online">
+ <footer>
+ <xsl:if test="$online">
<div class="xapian-omega-search">
<form name="P" method="get" action="/cgi-bin/omega/omega" target="_top">
<input type="hidden" name="DB" value="{$lang}"/>
@@ -228,21 +227,20 @@
<input type="submit" class="xapian-omega-search-button" value="🔍"/>
</form>
</div>
- </xsl:if>
+ </xsl:if>
+ <xsl:if test="$online">
+ <p><a href="https://www.collaboraoffice.com/about-us/" target="_blank">About Us</a> | <a href="https://www.collaboraoffice.com/privacy-policy/" target="_blank">Privacy Policy</a> | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the <a href="https://www.mozilla.org/en-US/MPL/2.0/" target="_blank">Mozilla Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in TDF's <a href="https://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>. Collabora Office is derived from LibreOffice which was based on OpenOffice.org.</p>
+ </xsl:if>
+ <div id="DEBUG" class="debug">
+ <h3 class="bug">Help content debug info:</h3>
+ <p>This page is: <a href="https://opengrok.libreoffice.org/xref/help/source{$filename}" target="_blank"><xsl:value-of select="$filename"/></a></p>
+ <p>Title is: <xsl:value-of select="$title"/></p>
+ <p id="bm_module"></p>
+ <p id="bm_system"></p>
+ </div>
+ </footer>
+
</div>
- <footer>
- <xsl:if test="$online">
- <p><a href="https://www.collaboraoffice.com/about-us/" target="_blank">About Us</a> | <a href="https://www.collaboraoffice.com/privacy-policy/" target="_blank">Privacy Policy</a> | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the <a href="https://www.mozilla.org/en-US/MPL/2.0/" target="_blank">Mozilla Public License v2.0</a>. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in TDF's <a href="https://wiki.documentfoundation.org/TradeMark_Policy" target="_blank">trademark policy</a>. Collabora Office is derived from LibreOffice which was based on OpenOffice.org.</p>
- </xsl:if>
- <div id="DEBUG" class="debug">
- <h3 class="bug">Help content debug info:</h3>
- <p>This page is: <a href="https://opengrok.libreoffice.org/xref/help/source{$filename}" target="_blank"><xsl:value-of select="$filename"/></a></p>
- <p>Title is: <xsl:value-of select="$title"/></p>
- <p id="bm_module"></p>
- <p id="bm_system"></p>
- <p id="bm_HID"></p>
- </div>
- </footer>
</body>
</html>
</xsl:template>
commit 62b6c2023a69acd44ca744c362e1680f1c7ccf32
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Sep 26 15:50:34 2019 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 26 15:50:34 2019 +0200
[cp] Collabora color
Change-Id: I6013fe7a3ff5c120be19aee034c5c734a3a1b589
diff --git a/help3xsl/default.css b/help3xsl/default.css
index e2b0a117e..cfc659602 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -865,7 +865,7 @@ li.disabled a {
margin: 0 auto;
}
footer {
- border-top: 2px solid #148603;
+ border-top: 2px solid #5C3DE2;
}
body {
display: grid;
More information about the Libreoffice-commits
mailing list