AllLangHelp_shared.mk | 1
Package_html_media.mk | 3
help3xsl/default.css | 7 +-
help3xsl/help.html | 2
help3xsl/help2.js | 7 --
help3xsl/index.html | 2
help3xsl/index2.html | 2
help3xsl/online_transform.xsl | 18 ++---
help3xsl/xap_templ_query.xsl | 2
source/media/navigation/collabora-online-logo.svg | 77 ++++++++++++++++++++++
source/media/navigation/favicon.ico |binary
source/media/navigation/libo-symbol-black.svg | 3
source/media/navigation/libo-symbol-white.svg | 1
source/text/sbasic/shared/main0601.xhp | 1
source/text/scalc/main0000.xhp | 1
source/text/schart/main0000.xhp | 1
source/text/sdatabase/main.xhp | 1
source/text/sdraw/main0000.xhp | 1
source/text/shared/05/new_help.xhp | 1
source/text/shared/06/youtubevideos.xhp | 24 ------
source/text/shared/main0108.xhp | 2
source/text/simpress/main0000.xhp | 1
source/text/smath/main0000.xhp | 1
source/text/swriter/main0000.xhp | 1
24 files changed, 95 insertions(+), 65 deletions(-)
New commits:
commit e44fc61ece893a7c23059ede989bf19e61adf29c
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Jul 28 16:09:48 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:59:00 2023 +0100
[cp] Xapian Omega setup for help.collaboraoffice.com
Change-Id: Iaa28803be627db8915e7f426b400ac3b26e7b3a2
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 5e96aa1dd2..23b4240511 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -243,8 +243,11 @@
<xsl:if test="$online">
<xsl:if test="$xapian='yes'">
<div class="xapian-omega-search">
- <form name="P" method="get"
action="/{$productversion}/{$lang}/search" target="_top">
- <input id="omega-autofocus" type="search" name="P"
dir="auto"/>
+ <form name="P" method="get" action="/cgi-bin/omega/omega"
target="_top">
+ <input type="hidden" name="DB" value="{$lang}2305"/>
+ <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"/>
<input type="submit"
class="xapian-omega-search-button" value="🔍"/>
</form>
</div>
commit 354106a6922594c853fd0836b431f0e821e0a9e9
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Aug 22 09:55:44 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:53:31 2023 +0100
[cp] help page footer
Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 13d3de5a8f..5e96aa1dd2 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -260,12 +260,7 @@
</div>
<footer>
<xsl:if test="$online">
- <p itemscope="true" itemtype="http://schema.org/Organization";
dir="auto">
- <meta itemprop="name" content="The Document Foundation"/>
- <meta itemprop="legalName" content="The Document Foundation"/>
- <meta itemprop="alternateName" content="TDF"/>
- <meta itemprop="publishingPrinciples"
content="https://www.libreoffice.org/imprint"/>
- <a href="https://www.libreoffice.org/imprint";
target="_blank">Impressum (Legal Info)</a> | <a
href="https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy</a> |
<a href="https://www.documentfoundation.org/statutes.pdf";
target="_blank">Statutes (non-binding English translation)</a> - <a
href="https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung
(binding German version)</a> | Copyright information: Unless otherwise
specified, all text and images on this website are licensed under the <a
href="https://www.libreoffice.org/download/license/"; 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
our <a href="https://wiki.documentfoundation.org/TradeMark_Policy"; tar
get="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p>
+ <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>
diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl
index 51f2fea3cf..26da1bc4ba 100644
--- a/help3xsl/xap_templ_query.xsl
+++ b/help3xsl/xap_templ_query.xsl
@@ -246,7 +246,7 @@ $map{$cgilist{B},<input type=hidden name=B
value="$html{$_}">}
</form>
<hr><div align=right><i><small><a
href="https://xapian.org/";>$html{$version}</a></small></i></div>
<footer>
- <p><a href="https://www.libreoffice.org/imprint";
target="_blank">Impressum (Legal Info)</a> | <a
href="https://www.libreoffice.org/privacy"; target="_blank">Privacy Policy</a> |
<a href="https://www.documentfoundation.org/statutes.pdf";
target="_blank">Statutes (non-binding English translation)</a> - <a
href="https://www.documentfoundation.org/satzung.pdf"; target="_blank">Satzung
(binding German version)</a> | Copyright information: Unless otherwise
specified, all text and images on this website are licensed under the <a
href="https://www.libreoffice.org/download/license/"; 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
our <a href="https://wiki.documentfoundation.org/TradeMark_Policy"; targ
et="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p>
+ <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>
</footer>
</body>
</html>
commit 7780ed8846f5d43f9ea46bafba86673cf50bcddf
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri May 15 11:59:20 2020 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:52:06 2023 +0100
[cp] Hide 'Please support us!' button
Change-Id: I003b30b6b47e1323f4ef2a504ed72585561a386f
diff --git a/help3xsl/default.css b/help3xsl/default.css
index 5a689591ea..b84eab7d79 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -655,6 +655,7 @@ li.disabled a {
margin: auto;
max-width: 200px;
color: #ffffff;
+ display: none; /* Collabora */
}
.donation:hover {
background: linear-gradient(90deg, #1c71d8 0%, #30c877 100%);
commit a1761544141e1e6a9128c8410848fd7b2d1aac89
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Tue Aug 7 19:09:41 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:51:47 2023 +0100
[cp] Revert the .xhp parts of "Deploy videos in New Help (WIP)"
Partially reverts commit 93ebf037016819613322ef1c39951a3de893ec14.
Change-Id: I21224f97e9c47d5dfeb8e000102237a5664d3d41
diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 05ae40e093..b3f5738422 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -544,7 +544,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
helpcontent2/source/text/shared/05/00000160 \
helpcontent2/source/text/shared/05/new_help \
helpcontent2/source/text/shared/05/err_html \
- helpcontent2/source/text/shared/06/youtubevideos \
helpcontent2/source/text/shared/06/filter_screenshots \
helpcontent2/source/text/shared/06/svx_screenshots \
helpcontent2/source/text/shared/06/optionen_screenshots \
diff --git a/source/text/sbasic/shared/main0601.xhp
b/source/text/sbasic/shared/main0601.xhp
index 54872964aa..838b7f8635 100644
--- a/source/text/sbasic/shared/main0601.xhp
+++ b/source/text/sbasic/shared/main0601.xhp
@@ -30,7 +30,6 @@
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3143284"
localize="false"/>
<h1 id="hd_id3154232"><variable id="mainsbasic"><link
href="text/sbasic/shared/main0601.xhp">%PRODUCTNAME Basic
Help</link></variable></h1>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<section id="basicalt">
<paragraph id="par_id3153894" role="paragraph" xml-lang="en-US">%PRODUCTNAME
provides an Application Programming Interface (API) that allows controlling the
$[officename] components with different programming languages by using the
$[officename] Software Development Kit (SDK). For more information about the
$[officename] API and the Software Development Kit, visit <link
href="https://api.libreoffice.org/";>https://api.libreoffice.org</link></paragraph>
<paragraph id="par_id3147226" role="paragraph" xml-lang="en-US">This help
section explains the most common functions of %PRODUCTNAME Basic. For more
in-depth information please refer to the <link
href="https://wiki.documentfoundation.org/Documentation/BASIC_Guide";>OpenOffice.org
BASIC Programming Guide</link> on the Wiki.</paragraph>
diff --git a/source/text/scalc/main0000.xhp b/source/text/scalc/main0000.xhp
index e2542d1bc1..fb22834784 100644
--- a/source/text/scalc/main0000.xhp
+++ b/source/text/scalc/main0000.xhp
@@ -26,7 +26,6 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SC_HID_SC_WIN_GRIDWIN"
id="bm_id3155335" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3149255"
localize="false"/><h1 id="hd_id3147338">Welcome to the $[officename] Calc
Help</h1>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<h3 id="hd_id3153965">How to Work With $[officename] Calc</h3>
<embed href="text/scalc/guide/main.xhp#main"/>
<embed href="text/scalc/main0503.xhp#main0503"/>
diff --git a/source/text/schart/main0000.xhp b/source/text/schart/main0000.xhp
index 0a25e90ddd..7799b25c26 100644
--- a/source/text/schart/main0000.xhp
+++ b/source/text/schart/main0000.xhp
@@ -32,7 +32,6 @@
</bookmark><comment>MW added one entry</comment>
<paragraph xml-lang="en-US" id="hd_id3148664" role="heading"
level="1"><variable id="chart_main"><link href="text/schart/main0000.xhp">Using
Charts in %PRODUCTNAME</link>
</variable></paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph xml-lang="en-US" id="par_id3154685"
role="paragraph"><variable id="chart">$[officename] lets you present data
graphically in a chart, so that you can visually compare data series and view
trends in the data. You can insert charts into spreadsheets, text documents,
drawings, and presentations.
</variable></paragraph>
<paragraph xml-lang="en-US" id="hd_id3153143" role="heading"
level="2">Chart Data</paragraph>
diff --git a/source/text/sdatabase/main.xhp b/source/text/sdatabase/main.xhp
index cd69b64a19..41c8a8c95d 100644
--- a/source/text/sdatabase/main.xhp
+++ b/source/text/sdatabase/main.xhp
@@ -30,7 +30,6 @@
<bookmark_value>data sources;$[officename] Base</bookmark_value>
</bookmark><comment>mw changed "Base,..."</comment><h1
id="par_idN10579"><variable id="base"><link
href="text/sdatabase/main.xhp">Using Databases in %PRODUCTNAME Base</link>
</variable></h1>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="paragraph" id="par_idN107BD" xml-lang="en-US">In %PRODUCTNAME
Base, you can access data that is stored in a wide variety of database file
formats. %PRODUCTNAME Base natively supports some flat file database formats,
such as the dBASE format. You can also use %PRODUCTNAME Base to connect to
external relational databases, such as databases from MySQL or
Oracle.</paragraph>
</section>
<paragraph role="paragraph" id="par_id5864131" xml-lang="en-US">The following
database types are read-only types in %PRODUCTNAME Base. From within
%PRODUCTNAME Base it is not possible to change the database structure or to
edit, insert, and delete database records for these database types:</paragraph>
diff --git a/source/text/sdraw/main0000.xhp b/source/text/sdraw/main0000.xhp
index 911d45ba99..93bbe25727 100644
--- a/source/text/sdraw/main0000.xhp
+++ b/source/text/sdraw/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark branch="hid/SD_HID_SDGRAPHICVIEWSHELL" xml-lang="en-US"
id="bm_id3155333" localize="false"/><bookmark branch="hid/HID_GLOBAL_FALLBACK"
xml-lang="en-US" id="bm_id3154705" localize="false"/><paragraph role="heading"
level="1" id="hd_id3155960" xml-lang="en-US">Welcome to the $[officename] Draw
Help</paragraph>
- <embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" level="3" id="hd_id3154022" xml-lang="en-US">How
to Work With $[officename] Draw</paragraph>
<embed href="text/sdraw/guide/main.xhp#main"/>
<embed href="text/sdraw/main0503.xhp#main0503"/>
diff --git a/source/text/shared/05/new_help.xhp
b/source/text/shared/05/new_help.xhp
index 07b20a4c5b..5509978d12 100644
--- a/source/text/shared/05/new_help.xhp
+++ b/source/text/shared/05/new_help.xhp
@@ -25,7 +25,6 @@
<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3706162"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:HelpIndex" id="bm_id3806162"
localize="false"/>
<h1 id="hd_id3153884"><variable id="newhlp"><link
href="text/shared/05/new_help.xhp">The %PRODUCTNAME Help</link></variable></h1>
- <embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOX"
id="bm_id3153114" localize="false"/>
<paragraph role="paragraph" id="par_id171534888116942"
xml-lang="en-US">%PRODUCTNAME Help pages are displayed in your system default
web browser.</paragraph>
<embed href="text/shared/05/00000100.xhp#help"/>
diff --git a/source/text/shared/06/youtubevideos.xhp
b/source/text/shared/06/youtubevideos.xhp
deleted file mode 100644
index 1d282b12f0..0000000000
--- a/source/text/shared/06/youtubevideos.xhp
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- -->
-
-<meta>
- <topic id="embedyoutubevideo" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">YouTube Videos</title>
- <filename>/text/shared/06/youtubevideos.xhp</filename>
- </topic>
-</meta>
-<body>
-<section id="whatisit">
- <paragraph role="paragraph" id="par_ytvideosample" localize="false"
xml-lang="en-US"><object data="" id="ZlAmjIwUvs4" type="video/youtube"
width="700" height="394"/>
- </paragraph>
-</section>
-</body>
-</helpdocument>
diff --git a/source/text/simpress/main0000.xhp
b/source/text/simpress/main0000.xhp
index fa069665ec..18c62598c3 100644
--- a/source/text/simpress/main0000.xhp
+++ b/source/text/simpress/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark xml-lang="en-US" branch="hid/SD_HID_SDDRAWVIEWSHELL"
id="bm_id3150861" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3154560"
localize="false"/>
<paragraph role="heading" id="hd_id3150746" xml-lang="en-US" level="1">Welcome
to the $[officename] Impress Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3153000" xml-lang="en-US" level="3">How to
Work With $[officename] Impress</paragraph>
<embed href="text/simpress/guide/main.xhp#main"/>
<embed href="text/simpress/main0503.xhp#main0503"/>
diff --git a/source/text/smath/main0000.xhp b/source/text/smath/main0000.xhp
index bc99482d00..b560ef2a3f 100644
--- a/source/text/smath/main0000.xhp
+++ b/source/text/smath/main0000.xhp
@@ -26,7 +26,6 @@
</meta>
<body>
<h1 id="hd_id3148868">Welcome to the $[officename] Math Help</h1>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<h3 id="hd_id3153915">How to Work With $[officename] Math</h3>
<embed href="text/smath/guide/main.xhp#main"/>
<embed href="text/smath/main0503.xhp#main0503"/>
diff --git a/source/text/swriter/main0000.xhp b/source/text/swriter/main0000.xhp
index 405fe1b47e..bb3f1e8227 100644
--- a/source/text/swriter/main0000.xhp
+++ b/source/text/swriter/main0000.xhp
@@ -33,7 +33,6 @@
<bookmark xml-lang="en-US" branch="hid/SW_HID_EDIT_WIN" id="bm_id3147244"
localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_GLOBAL_FALLBACK" id="bm_id3147247"
localize="false"/>
<paragraph role="heading" id="hd_id3147233" xml-lang="en-US"
level="1">%PRODUCTNAME Writer Help</paragraph>
-<embed href="text/shared/06/youtubevideos.xhp#whatisit"/>
<paragraph role="heading" id="hd_id3147258" xml-lang="en-US" level="3">Working
With %PRODUCTNAME Writer</paragraph>
<embed href="text/swriter/main0503.xhp#main0503"/>
<embed href="text/swriter/guide/main.xhp#main"/>
commit 44df35e9fc6906dcd8efc5bb1e3de7b20a0e6f59
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Thu Aug 9 20:56:03 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:50:08 2023 +0100
[cp] Exchange the logo.
Change-Id: I138d97fd40764ff455354f4ad53f9a7fb72faba8
Reviewed-on: https://gerrit.libreoffice.org/58797
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Package_html_media.mk b/Package_html_media.mk
index 13db10fdea..134791c373 100644
--- a/Package_html_media.mk
+++ b/Package_html_media.mk
@@ -391,8 +391,7 @@ $(eval $(call
gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE
navigation/libo-draw.svg \
navigation/libo-impress.svg \
navigation/libo-math.svg \
- navigation/libo-symbol-black.svg \
- navigation/libo-symbol-white.svg \
+ navigation/collabora-online-logo.svg \
navigation/libo-writer.svg \
screenshots/modules/scalc/ui/deletecells/DeleteCellsDialog.png \
screenshots/modules/scalc/ui/xmlsourcedialog/XMLSourceDialog.png \
diff --git a/help3xsl/default.css b/help3xsl/default.css
index abf75f69c1..5a689591ea 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -388,10 +388,10 @@ h6 {
padding: 8px 8px 8px 20px;
}
.symbol div {
- background-image: url(media/navigation/libo-symbol-white.svg);
+ background-image: url(media/navigation/collabora-online-logo.svg);
background-repeat: no-repeat;
background-size: contain;
- width: 52px;
+ width: 60px;
height: 60px;
}
@@ -714,7 +714,7 @@ li.disabled a {
margin-right: 5px;
}
.office-icon {
- background-image: url(media/navigation/libo-symbol-black.svg);
+ background-image: url(media/navigation/collabora-online-logo.svg);
}
.calc-icon {
background-image: url(media/navigation/libo-calc.svg);
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index 49b7a4b3e2..13d3de5a8f 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -235,7 +235,7 @@
<meta itemprop="datePublished" content="2020"/>
<meta itemprop="headline" content="{$titleL10N}"/>
<meta itemprop="license"
content="https://www.libreoffice.org/download/license/"/>
- <meta itemprop="image"
content="media/navigation/libo-symbol-white.svg"/>
+ <meta itemprop="image"
content="media/navigation/collabora-online-logo.svg"/>
</xsl:if>
<xsl:apply-templates select="/helpdocument/body"/>
</div>
diff --git a/source/media/navigation/collabora-online-logo.svg
b/source/media/navigation/collabora-online-logo.svg
new file mode 100644
index 0000000000..105dbb8b6c
--- /dev/null
+++ b/source/media/navigation/collabora-online-logo.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="134.19557mm"
+ height="134.19557mm"
+ viewBox="0 0 134.19557 134.19557"
+ version="1.1"
+ id="svg4519"
+ sodipodi:docname="collabora-online-logo.svg"
+ inkscape:version="0.92.0 unknown">
+ <defs
+ id="defs4513" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.98994949"
+ inkscape:cx="256.04006"
+ inkscape:cy="260.75029"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1301"
+ inkscape:window-height="744"
+ inkscape:window-x="65"
+ inkscape:window-y="24"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4516">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(164.06501,-114.9656)">
+ <polygon
+ id="polygon14"
+ points="17.772,20.172 30.958,32.599 17.914,44.893 17.358,44.386
17.258,20.718 "
+ style="fill:#ffffff"
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ style="fill:#504999;fill-opacity:1"
+ id="polygon16"
+ points="30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55
28.561,9.362 17.763,20.162 17.772,20.172 30.379,32.053 30.958,32.599 "
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ id="polygon18"
+ points="17.358,44.386 17.258,20.718 29.864,32.599 "
+ style="fill:#c8c8c8"
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ <polygon
+ style="fill:#38257a;fill-opacity:1"
+ id="polygon20"
+ points="27.743,35.628 18.807,44.052 31.847,41.483 "
+ transform="matrix(2.8998956,0,0,2.8998956,-195.59046,87.816779)" />
+ </g>
+</svg>
diff --git a/source/media/navigation/libo-symbol-black.svg
b/source/media/navigation/libo-symbol-black.svg
deleted file mode 100644
index 7b2ed728a3..0000000000
--- a/source/media/navigation/libo-symbol-black.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="SVGRoot" width="24px" height="24px" version="1.1" viewBox="0 0 24 24"
xml:space="preserve" xmlns="http://www.w3.org/2000/svg";><defs><linearGradient
id="linearGradient4349" x1="3" x2="21" y1="23" y2="1"
gradientUnits="userSpaceOnUse"><stop stop-color="#4b4b4b" offset="0"/><stop
stop-color="#969696" offset="1"/></linearGradient><linearGradient
id="linearGradient2256" x1="18" x2="6" y1="19" y2="4"
gradientUnits="userSpaceOnUse"><stop stop-color="#fafafa" stop-opacity=".80286"
offset="0"/><stop stop-color="#fafafa" offset="1"/></linearGradient></defs><g
fill-rule="evenodd" stroke-linecap="square"><path d="m5 0c-1.662 0-3 1.338-3
3v18c0 1.662 1.338 3 3 3h14c1.662 0 3-1.338 3-3v-12l-9-9h-8zm10 0 7 7v-7h-7z"
fill="url(#linearGradient4349)"/><g fill-opacity=".19965"><path d="m2 20v1c0
1.662 1.338 3 3 3h14c1.662 0 3-1.338 3-3v-1c0 1.662-1.338 3-3 3h-14c-1.662
0-3-1.338-3-3z"/><path d="m15 0h1.4l5.6 5.6v1.4z"/></g><g fill-rule="evenodd"
stroke-linecap="round" stroke-width="2"><path d
="m5 3v17h14v-10l-7-7z" fill="url(#linearGradient2256)"/><path d="m12 3 7
7h-7z" fill="#fafafa"/><path d="m11 3v9h8v-2h-7v-7h-1z" fill-opacity=".046907"
fill-rule="evenodd" stroke-linecap="square" stroke-width="2"/></g></g></svg>
diff --git a/source/media/navigation/libo-symbol-white.svg
b/source/media/navigation/libo-symbol-white.svg
deleted file mode 100644
index bdb8d1647f..0000000000
--- a/source/media/navigation/libo-symbol-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="26" width="21.5" xmlns="http://www.w3.org/2000/svg";><g
fill="#fff" fill-rule="evenodd" transform="matrix(.31255684 0 0 .31250224
-233.40716 -366.24428)"><path d="m796.28645
1171.974c-.80495-.02-1.59796.4831-1.91259 1.2141-.31466.7309-.131 1.6434.44298
2.2004l17.27601 17.3306c.55718.5581 1.4644.7432 2.20023.4487.73584-.2944
1.256-1.0507
1.2615-1.8338v-17.3628c.002-1.0462-.96414-1.999-2.02478-1.9972z"/><path
d="m748.78346 1171.9733c-1.06249.015-2.01821.9868-2.01636 2.0494v79.1007c-.002
1.0625.9539 2.0338 2.01636 2.0493h64.72168c1.07351 0 2.05112-.9758
2.04941-2.0493v-50.9378c.003-.5376-.21596-1.0732-.59499-1.4544l-27.99758-28.1298c-.37577-.3909-.9122-.6226-1.45442-.6281z"
fill="none"/><path d="m748.78346 1171.9733a2.0460372 2.0460372 0 0 0 -2.01636
2.0494v79.1007a2.0460372 2.0460372 0 0 0 2.01636 2.0493h64.72168a2.0460372
2.0460372 0 0 0 2.04941-2.0493v-50.9378a2.0460372 2.0460372 0 0 0
-.59499-1.4544l-27.99758-28.1298a2.0460372 2.0460372 0 0 0
-1.45442-.6281zm2.04941 4.0
988h33.81526l26.8076 26.94v48.0618h-60.62286z"/></g></svg>
commit ad917fae2c07b6aeaa33340c745248845d2aea45
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 20 17:27:01 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:41:37 2023 +0100
[cp] Collabora favicon
Change-Id: I00bfc8fff17435356f393de32b585d12c37fea5e
diff --git a/source/media/navigation/favicon.ico
b/source/media/navigation/favicon.ico
index ee6560bcb3..10c055775e 100644
Binary files a/source/media/navigation/favicon.ico and
b/source/media/navigation/favicon.ico differ
commit c72b5672d85216568bdb89eb87b1565a1492c7a2
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Aug 27 15:26:05 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:41:32 2023 +0100
[cp] Collabora support link
Change-Id: I980fe8fc2779647bbe1dfce649f06b3cbd36f864
diff --git a/source/text/shared/main0108.xhp b/source/text/shared/main0108.xhp
index e705796546..07104861af 100644
--- a/source/text/shared/main0108.xhp
+++ b/source/text/shared/main0108.xhp
@@ -62,7 +62,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:QuestionAnswers" id="bm_id4124532"
localize="false"/>
<h2 id="hd_id230120170827196253">Get Help Online</h2>
-<paragraph id="par_id230120170827196850" role="paragraph"
xml-lang="en-US"><ahelp hid=".uno:QuestionAnswers">Opens the community support
page in the web browser.</ahelp> Use this page to ask questions on using
%PRODUCTNAME. For professional support with service level agreement, refer to
the <link href="https://www.documentfoundation.org/gethelp/support/";><emph>page
of professional %PRODUCTNAME support</emph></link>.</paragraph>
+<paragraph id="par_id230120170827196850" role="paragraph"
xml-lang="en-US"><ahelp hid=".uno:QuestionAnswers">Opens the community support
page in the web browser.</ahelp> Use this page to ask questions on using
%PRODUCTNAME. For professional support with service level agreement, refer to
the <link
href="https://www.collaboraoffice.com/solutions/support-and-services/";>page of
professional %PRODUCTNAME support</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:SendFeedback" id="bm_id4134532"
localize="false"/>
commit 28646c01969d7d8f08cdbcceddde8b812c118c91
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Sun Aug 26 21:50:46 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Feb 14 13:41:25 2023 +0100
[cp] remove TDF Piwik tracker
Change-Id: Icabdcae5d5828417d3540bf36f6bb747001189e3
diff --git a/help3xsl/help.html b/help3xsl/help.html
index 8ee3510cf6..eceed41a12 100644
--- a/help3xsl/help.html
+++ b/help3xsl/help.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
index 728453134b..aac2c0d76a 100644
--- a/help3xsl/help2.js
+++ b/help3xsl/help2.js
@@ -220,13 +220,6 @@ if (document.body.getElementsByTagName('meta')) {
_paq.push(['disableCookies']);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
- (function() {
- var u="//piwik.documentfoundation.org/";
- _paq.push(['setTrackerUrl', u+'piwik.php']);
- _paq.push(['setSiteId', '68']);
- var d=document, g=d.createElement('script'),
s=d.getElementsByTagName('script')[0];
- g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js';
s.parentNode.insertBefore(g,s);
- })();
var system = getParameterByName("System");
} else {
var system = getSystem();
diff --git a/help3xsl/index.html b/help3xsl/index.html
index 69d7ee6afc..fa04607c82 100644
--- a/help3xsl/index.html
+++ b/help3xsl/index.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'/>
</head>
<body>
<script type="text/javascript">
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index c08335e08c..99c61c7541 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -9,7 +9,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src 'self'
'unsafe-inline' 'unsafe-eval'"/>
<script type="text/javascript" src="polyfills.js"></script>
<script type="text/javascript" src="hid2file.js"></script>
<script type="text/javascript" src="languages.js"></script>
diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl
index c398e97a5e..49b7a4b3e2 100644
--- a/help3xsl/online_transform.xsl
+++ b/help3xsl/online_transform.xsl
@@ -151,7 +151,7 @@
<noscript><meta http-equiv="refresh" content="0;
URL={$install}{$lang}/noscript.html"/></noscript>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<xsl:if test="$online">
- <meta http-equiv="Content-Security-Policy" content="script-src
'self' 'unsafe-inline' 'unsafe-eval' piwik.documentfoundation.org"/>
+ <meta http-equiv="Content-Security-Policy" content="script-src
'self' 'unsafe-inline' 'unsafe-eval'"/>
</xsl:if>
<title><xsl:value-of disable-output-escaping="yes"
select="$titleL10N"/></title>
<link rel="shortcut icon" href="media/navigation/favicon.ico"/>
commit 17e29a631823bfc2a61d6eeb7571c6c0612f608c
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Feb 1 10:07:29 2023 -0300
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Feb 2 11:14:14 2023 +0000
Update 7.5 release video
Change-Id: I046063162992e71c60d0c3f6fba9265e172cedeb
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146446
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
(cherry picked from commit 36367761a21809320eb5e01875f5734c0cf59727)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/146403
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/source/text/shared/06/youtubevideos.xhp
b/source/text/shared/06/youtubevideos.xhp
index 2986821042..1d282b12f0 100644
--- a/source/text/shared/06/youtubevideos.xhp
+++ b/source/text/shared/06/youtubevideos.xhp
@@ -17,7 +17,7 @@
</meta>
<body>
<section id="whatisit">
- <paragraph role="paragraph" id="par_ytvideosample" localize="false"
xml-lang="en-US"><object data="" id="PC8M4UzqpqE" type="video/youtube"
width="700" height="394"/>
+ <paragraph role="paragraph" id="par_ytvideosample" localize="false"
xml-lang="en-US"><object data="" id="ZlAmjIwUvs4" type="video/youtube"
width="700" height="394"/>
</paragraph>
</section>
</body>
