.gitreview | 2 AllLangHelp_shared.mk | 1 Package_html_media.mk | 2 help3xsl/default.css | 5 - help3xsl/help.html | 2 help3xsl/help2.js | 7 -- help3xsl/index.html | 2 help3xsl/index2.html | 2 help3xsl/online_transform.xsl | 16 ++-- help3xsl/xap_templ_query.xsl | 2 source/auxiliary/swriter.tree | 2 source/media/navigation/collabora-online-logo.svg | 77 ++++++++++++++++++++++ source/media/navigation/favicon.ico |binary 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 | 23 ------ source/text/shared/guide/template_manager.xhp | 2 source/text/shared/main0108.xhp | 2 source/text/simpress/main0000.xhp | 1 source/text/smath/main0000.xhp | 1 source/text/swriter/guide/templates_styles.xhp | 2 source/text/swriter/main0000.xhp | 1 27 files changed, 97 insertions(+), 62 deletions(-)
New commits: commit 18cba6fc7fed38dbf26ceb8a4579aa5737b8ce0a Author: Andras Timar <[email protected]> AuthorDate: Wed Mar 31 19:31:13 2021 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 19:31:13 2021 +0200 Fix broken links (OK in master) Change-Id: Iaff1e962593680327437b809b8b42ce82eb42af7 diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 26d2cd238..dde7dccfe 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -135,7 +135,7 @@ <topic id="swriter/text/swriter/guide/load_styles.xhp">Using Styles From Another Document or Template</topic> <topic id="swriter/text/swriter/guide/stylist_fromselect.xhp">Creating New Styles From Selections</topic> <topic id="swriter/text/swriter/guide/stylist_update.xhp">Updating Styles From Selections</topic> -<topic id="swriter/text/swriter/guide/standard_template.xhp">Creating and Changing Default and Custom Templates</topic> +<topic id="swriter/text/shared/guide/standard_template.xhp">Creating and Changing Default and Custom Templates</topic> </node> <topic id="swriter/text/swriter/guide/pageorientation.xhp">Changing Page Orientation (Landscape or Portrait)</topic> <topic id="swriter/text/swriter/guide/text_capital.xhp">Changing the Case of Text</topic> diff --git a/source/text/shared/guide/template_manager.xhp b/source/text/shared/guide/template_manager.xhp index 9d6a16f9b..9e33b1aea 100644 --- a/source/text/shared/guide/template_manager.xhp +++ b/source/text/shared/guide/template_manager.xhp @@ -189,7 +189,7 @@ <section id="relatedtopics"> <paragraph id="par_id04162017072352773" role="paragraph" xml-lang="en-US">See <link href="text/swriter/guide/templates_styles.xhp">Templates and Styles</link> for related information.</paragraph> -<paragraph id="par_id041620170723523966" role="paragraph" xml-lang="en-US">See <link href="text/swriter/guide/standard_template.xhp">Creating a Document Template</link> for related information.</paragraph> +<paragraph id="par_id041620170723523966" role="paragraph" xml-lang="en-US">See <link href="text/shared/guide/standard_template.xhp">Creating a Document Template</link> for related information.</paragraph> <paragraph id="par_id04162017072352674" role="paragraph" xml-lang="en-US">See Chapter 3 – Using Styles and Templates in the Getting Started Guide, available from the <link href="https://documentation.libreoffice.org/en/english-documentation/getting-started-guide/";>documentation website</link>.</paragraph> <paragraph id="par_id041620170723529524" role="paragraph" xml-lang="en-US">Refer to <link href="https://templates.libreoffice.org";>https://templates.libreoffice.org</link> for templates to download.</paragraph> </section> diff --git a/source/text/swriter/guide/templates_styles.xhp b/source/text/swriter/guide/templates_styles.xhp index 0606faa15..4b00d0a2b 100644 --- a/source/text/swriter/guide/templates_styles.xhp +++ b/source/text/swriter/guide/templates_styles.xhp @@ -40,7 +40,7 @@ <embed href="text/swriter/guide/change_header.xhp#change_header"/> <embed href="text/swriter/guide/stylist_fillformat.xhp#stylist_fillformat"/> <embed href="text/swriter/guide/stylist_fromselect.xhp#stylist_fromselect"/> - <embed href="text/swriter/guide/standard_template.xhp#standard_template"/> + <embed href="text/shared/guide/standard_template.xhp#standard_template"/> </section> </body> </helpdocument> commit f29a89ac06b0465c74efe1923fadc7cee64e34ff Author: Andras Timar <[email protected]> AuthorDate: Tue Jul 28 16:09:48 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 19:04:19 2021 +0200 [cp] Xapian Omega setup for help.collaboraoffice.com Change-Id: Iaa28803be627db8915e7f426b400ac3b26e7b3a2 diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 79390d7c1..0f70329c1 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -229,8 +229,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"/> + <form name="P" method="get" action="/cgi-bin/omega/omega" target="_top"> + <input type="hidden" name="DB" value="{$lang}2021"/> + <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 1b6cf494abd3c3892d071c41e6cb2c248340a8db Author: Andras Timar <[email protected]> AuthorDate: Wed Aug 22 09:55:44 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 19:04:19 2021 +0200 [cp] help page footer Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331 diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 988ed6380..79390d7c1 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -246,12 +246,7 @@ </div> <footer> <xsl:if test="$online"> - <p itemscope="true" itemtype="http://schema.org/Organization";> - <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 a606d2fc2..e1ceb58bd 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 edb2c6ec161435d8a49fcc50e162e623e7e35ee8 Author: Andras Timar <[email protected]> AuthorDate: Fri May 15 11:59:20 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 19:04:19 2021 +0200 [cp] Hide 'Please support us!' button Change-Id: I003b30b6b47e1323f4ef2a504ed72585561a386f diff --git a/help3xsl/default.css b/help3xsl/default.css index 257521c2d..d09fe0f60 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -584,6 +584,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 6f3b486120b3fcf4bbfecb1b87a4a4e1727a5de7 Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Aug 7 19:09:41 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 19:04:19 2021 +0200 [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 888d70baf..bc9a97271 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -536,7 +536,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 27d3a2c28..24fb728cf 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" name="$[officename] Basic Help">%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/"; name="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"; name="wiki.documentfoundation.org 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 ab1504912..6341084e7 100644 --- a/source/text/scalc/main0000.xhp +++ b/source/text/scalc/main0000.xhp @@ -31,7 +31,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"/><paragraph role="heading" id="hd_id3147338" xml-lang="en-US" level="1">Welcome to the $[officename] Calc Help</paragraph> -<embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <paragraph role="heading" id="hd_id3153965" xml-lang="en-US" level="3">How to Work With $[officename] Calc</paragraph> <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 d3aadef2b..c87d4e813 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" name="Charts in $[officename]">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 2925265dc..98c7dedfd 100644 --- a/source/text/sdatabase/main.xhp +++ b/source/text/sdatabase/main.xhp @@ -35,7 +35,6 @@ <bookmark_value>data sources;$[officename] Base</bookmark_value> </bookmark><comment>mw changed "Base,..."</comment><paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="1"><variable id="base"><link href="text/sdatabase/main.xhp">Using Databases in %PRODUCTNAME Base</link> </variable></paragraph> -<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 911d45ba9..93bbe2572 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 5c2400b7e..9e7cc9529 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" name="The %PRODUCTNAME Help Window">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#neuehilfe"/> diff --git a/source/text/shared/06/youtubevideos.xhp b/source/text/shared/06/youtubevideos.xhp deleted file mode 100644 index 5fac26c70..000000000 --- a/source/text/shared/06/youtubevideos.xhp +++ /dev/null @@ -1,23 +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="https://www.youtube-nocookie.com/embed/PLutwM8XKvo"; id="vid_id61521568603544" 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 fa069665e..18c62598c 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 9cf4ef897..670514817 100644 --- a/source/text/smath/main0000.xhp +++ b/source/text/smath/main0000.xhp @@ -26,7 +26,6 @@ </meta> <body> <paragraph role="heading" id="hd_id3148868" xml-lang="en-US" level="1">Welcome to the $[officename] Math Help</paragraph> -<embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <paragraph role="heading" id="hd_id3153915" xml-lang="en-US" level="3">How to Work With $[officename] Math</paragraph> <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 8e271d35d..97a443e2f 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 37e2a282389fc5592eef89c3166755d9828f5a0b Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Aug 9 20:56:03 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 18:45:06 2021 +0200 [cp] Exchange the logo. Change-Id: I138d97fd40764ff455354f4ad53f9a7fb72faba8 Reviewed-on: https://gerrit.libreoffice.org/58797 Reviewed-by: Andras Timar <[email protected]> Tested-by: Andras Timar <[email protected]> diff --git a/Package_html_media.mk b/Package_html_media.mk index 2fb33193b..7a7dc2707 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -368,6 +368,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/warning_small.png \ helpimg/what-if.png \ helpimg/zellvor.png \ + navigation/collabora-online-logo.svg \ navigation/favicon.ico \ navigation/libo-base.svg \ navigation/libo-basic.svg \ @@ -376,7 +377,6 @@ $(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-white.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 197052902..257521c2d 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -365,10 +365,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; } diff --git a/source/media/navigation/collabora-online-logo.svg b/source/media/navigation/collabora-online-logo.svg new file mode 100644 index 000000000..105dbb8b6 --- /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-white.svg b/source/media/navigation/libo-symbol-white.svg deleted file mode 100644 index bdb8d1647..000000000 --- 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 5344cde8c380db6a102ef1fb92439c256ceb6c01 Author: Andras Timar <[email protected]> AuthorDate: Mon Aug 20 17:27:01 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 18:42:23 2021 +0200 [cp] Collabora favicon Change-Id: I00bfc8fff17435356f393de32b585d12c37fea5e diff --git a/source/media/navigation/favicon.ico b/source/media/navigation/favicon.ico index ee6560bcb..10c055775 100644 Binary files a/source/media/navigation/favicon.ico and b/source/media/navigation/favicon.ico differ commit 4b6eed2f4226b776fcb5cf984eb89c0abb7443ec Author: Andras Timar <[email protected]> AuthorDate: Mon Aug 27 15:26:05 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 18:42:17 2021 +0200 [cp] Collabora support link Change-Id: I980fe8fc2779647bbe1dfce649f06b3cbd36f864 diff --git a/source/text/shared/main0108.xhp b/source/text/shared/main0108.xhp index e8f8d4d60..0d14529a7 100644 --- a/source/text/shared/main0108.xhp +++ b/source/text/shared/main0108.xhp @@ -66,7 +66,7 @@ <bookmark xml-lang="en-US" branch="hid/.uno:QuestionAnswers" id="bm_id4124532" localize="false"/> <paragraph id="hd_id230120170827196253" role="heading" level="2" xml-lang="en-US">Get Help Online</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.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"/> <paragraph id="hd_id2752763" role="heading" level="2" xml-lang="en-US">Send Feedback</paragraph> commit a34ef69b30e0a489a22648346547dc696c9f4762 Author: Andras Timar <[email protected]> AuthorDate: Sun Aug 26 21:50:46 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 18:42:08 2021 +0200 [cp] remove TDF Piwik tracker Change-Id: Icabdcae5d5828417d3540bf36f6bb747001189e3 diff --git a/help3xsl/help.html b/help3xsl/help.html index 8ee3510cf..eceed41a1 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 f40492afb..8b5bc9585 100644 --- a/help3xsl/help2.js +++ b/help3xsl/help2.js @@ -219,13 +219,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 69d7ee6af..fa04607c8 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 f0585c8b8..13b349616 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 c6e2ee1bb..988ed6380 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -137,7 +137,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 select="$titleL10N"/></title> <link rel="shortcut icon" href="media/navigation/favicon.ico"/> commit ac5cc122ef559832499a0f0fc0fb3f8514b1c07d Author: Andras Timar <[email protected]> AuthorDate: Sun Jul 14 20:49:58 2019 +0200 Commit: Andras Timar <[email protected]> CommitDate: Wed Mar 31 18:41:47 2021 +0200 [cp] set branch to distro/collabora/co-2021 in .gitreview Change-Id: I3611766b7aa9da1444d4aab118fc2a10e0f1d706 diff --git a/.gitreview b/.gitreview index f31508045..c0a04fbf9 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=help defaultremote=logerrit -defaultbranch=master +defaultbranch=distro/collabora/co-2021 _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
