AllLangHelp_shared.mk | 1 Package_html_media.mk | 3 help3xsl/default.css | 7 +- help3xsl/online_transform.xsl | 14 +--- help3xsl/xap_templ_query.xsl | 2 source/media/navigation/collabora-online-logo.svg | 77 ++++++++++++++++++++++ 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/01/05070000.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/01/01100000.xhp | 1 source/text/shared/01/05210200.xhp | 2 source/text/shared/01/themescolordialog.xhp | 1 source/text/shared/01/themesdialog.xhp | 3 source/text/shared/05/new_help.xhp | 1 source/text/shared/06/youtubevideos.xhp | 24 ------ source/text/simpress/main0000.xhp | 1 source/text/smath/main0000.xhp | 1 source/text/swriter/01/accessibility_check.xhp | 1 source/text/swriter/01/pagenumbering.xhp | 4 - source/text/swriter/main0000.xhp | 1 25 files changed, 94 insertions(+), 60 deletions(-)
New commits: commit e5d0bcb12bde1a726205c3e21338a625fba625a5 Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 8 21:55:51 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 21:01:33 2024 +0100 remove references to missing embeds Change-Id: I9e98ae0a4b283cafc7d6066d399226e661da3aed diff --git a/source/text/shared/01/themescolordialog.xhp b/source/text/shared/01/themescolordialog.xhp index 569d33cf67..64fcac15d3 100644 --- a/source/text/shared/01/themescolordialog.xhp +++ b/source/text/shared/01/themescolordialog.xhp @@ -27,7 +27,6 @@ <paragraph role="paragraph" id="par_id701691103384432">Creates a color theme.</paragraph> </section> <section id="howtoget"> - <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> <paragraph role="paragraph" id="par_id441691102910404">Choose <menuitem>Format - Theme</menuitem> and click on <widget>Add</widget>.</paragraph> </section> <bookmark branch="hid/hid/svx/ui/themecoloreditdialog/entryThemeColorsName" id="bm_id731691103275007" localize="false"/> diff --git a/source/text/shared/01/themesdialog.xhp b/source/text/shared/01/themesdialog.xhp index c374955425..ebf18b4b91 100644 --- a/source/text/shared/01/themesdialog.xhp +++ b/source/text/shared/01/themesdialog.xhp @@ -27,10 +27,7 @@ <paragraph role="paragraph" id="par_id601691097282479">The bundling of color, font and format settings is possible under the concept of <emph>Theme</emph>.</paragraph> </section> <section id="howtoget"> - <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> <paragraph role="paragraph" id="par_id101691100079162">Choose <menuitem>Format - Themes</menuitem>.</paragraph> - <embed href="text/shared/00/00000004.xhp#from_sidebar"/> - <paragraph role="paragraph" id="par_id171691100137681">Open the <menuitem>Design</menuitem> panel.</paragraph> </section> <paragraph role="paragraph" id="par_id261691098998130"><emph>Theme colors</emph> is a set of twelve colors, each color has 5 variations computed internally, defined by their RGB-value and only the RGB-value is written to document file. A color of an object can be defined by a reference into a color of the <emph>Theme colors</emph> set. This reference is done by keyword or index, depending on the context. </paragraph> commit fd3ac75dccdf977d1d26952e546b3a530db7202f Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 8 20:16:17 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 21:01:23 2024 +0100 remove references to missing embeds Change-Id: Icb87f444535516b6aa02db6fdd1f975f612afe99 diff --git a/source/text/swriter/01/pagenumbering.xhp b/source/text/swriter/01/pagenumbering.xhp index 5e54de2baf..ada78ec078 100644 --- a/source/text/swriter/01/pagenumbering.xhp +++ b/source/text/swriter/01/pagenumbering.xhp @@ -25,11 +25,7 @@ <paragraph id="par_id821673185633504" role="paragraph">Use this command to quickly insert a page number in the header or footer of the current page style.</paragraph> </section> <section id="howtoget"> - <embed href="text/shared/00/00000004.xhp#from_menu_bar"/> <paragraph role="paragraph" id="par_id431673185755598">Choose <menuitem>Insert - Page Number</menuitem>.</paragraph> - <embed href="text/shared/00/00000004.xhp#from_tabUI"/> - <paragraph role="paragraph" id="par_id961690025511791">Choose <menuitem>Layout - Page Number</menuitem>.</paragraph> - <paragraph role="paragraph" id="par_id591687459917812">In the <menuitem>Insert</menuitem> menu of the <menuitem>Insert</menuitem> tab, choose <menuitem>Page Numbers</menuitem>.</paragraph> </section> <bookmark branch="hid/modules/swriter/ui/pagenumberdlg/positionCombo" id="bm_id451673187286751" localize="false"/> <h2 id="hd_id811673185909124">Position</h2> commit 72d99d70b3fcae4d16df95f3c1910edb97762f92 Author: Andras Timar <[email protected]> AuthorDate: Sun Nov 19 23:11:00 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:57:23 2024 +0100 added 2 missing HIDs (2nd attempt) Change-Id: Ib8d7c4c2c6a25bb6d3f7df05ae5bc3469ad13126 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index 52424f1322..4b2adfb10f 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,8 +30,8 @@ <body> <bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/ColorPage" id="bm_id981578762093731" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/@@nowidget@@" id="bm_id981578762093731" localize="false"/> - <bookmark xml-lang="en-US" branch="SVX_HID_POPUP_COLOR" id="bm_id981578762093732" localize="false"/> - <bookmark xml-lang="en-US" branch="SVX_HID_POPUP_COLOR_CTRL" id="bm_id981578762093734" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/SVX_HID_POPUP_COLOR" id="bm_id981578762093732" localize="false"/> + <bookmark xml-lang="en-US" branch="hid/SVX_HID_POPUP_COLOR_CTRL" id="bm_id981578762093734" localize="false"/> <bookmark xml-lang="en-US" branch="index" id="bm_id37440771"> <bookmark_value>colors;palette</bookmark_value> <bookmark_value>palette;document colors</bookmark_value> commit 85fc2f4d232ebd726462a3c4a9896d7b7ac2ca18 Author: Andras Timar <[email protected]> AuthorDate: Sun Nov 19 22:23:34 2023 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:57:22 2024 +0100 added 2 missing HIDs Change-Id: I9e06554c33fcdf97f6ce7a40d87b1448298e8250 diff --git a/source/text/shared/01/05210200.xhp b/source/text/shared/01/05210200.xhp index dafde66c1f..52424f1322 100644 --- a/source/text/shared/01/05210200.xhp +++ b/source/text/shared/01/05210200.xhp @@ -30,6 +30,8 @@ <body> <bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/ColorPage" id="bm_id981578762093731" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/colorpage/@@nowidget@@" id="bm_id981578762093731" localize="false"/> + <bookmark xml-lang="en-US" branch="SVX_HID_POPUP_COLOR" id="bm_id981578762093732" localize="false"/> + <bookmark xml-lang="en-US" branch="SVX_HID_POPUP_COLOR_CTRL" id="bm_id981578762093734" localize="false"/> <bookmark xml-lang="en-US" branch="index" id="bm_id37440771"> <bookmark_value>colors;palette</bookmark_value> <bookmark_value>palette;document colors</bookmark_value> commit ee386edd45a3b8f251cdd5cb18934b1efed2b35c Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 8 22:49:49 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:57:20 2024 +0100 add a bookmark to Calc's Page Style page - COOL looks for this Change-Id: I74f42cc2e19761c380dde43c725d18ab482ef603 diff --git a/source/text/scalc/01/05070000.xhp b/source/text/scalc/01/05070000.xhp index 080822aae6..78de237056 100644 --- a/source/text/scalc/01/05070000.xhp +++ b/source/text/scalc/01/05070000.xhp @@ -34,6 +34,7 @@ <bookmark_value>formatting;page</bookmark_value> </bookmark> <bookmark branch="hid/.uno:PageFormatDialog" id="bm_id3153561" localize="false"/> +<bookmark branch="hid/modules/scalc/ui/pagetemplatedialog/tabcontrol" id="bm_id3153562" localize="false"/> <section id="pagestyle"> <h1 id="hd_id3157910"><link href="text/scalc/01/05070000.xhp">Page Style</link></h1> <paragraph role="paragraph" id="par_id3156023"><variable id="seitetext"><ahelp hid=".uno:PageFormatDialog" visibility="visible">Opens a dialog where you can define the appearance of all pages in your document.</ahelp></variable></paragraph> commit 50858a3e47a81df49e6707d0d2e36314f88dff44 Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 8 21:09:33 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:56:12 2024 +0100 add a bookmark to Document Properties page - COOL looks for this Change-Id: If62790ac10535fd560844c7a1931c7e2040ba3d5 diff --git a/source/text/shared/01/01100000.xhp b/source/text/shared/01/01100000.xhp index 359fee45b0..125ad9495c 100644 --- a/source/text/shared/01/01100000.xhp +++ b/source/text/shared/01/01100000.xhp @@ -30,6 +30,7 @@ </bookmark> <section id="properties"> <bookmark branch="hid/.uno:SetDocumentProperties" id="bm_id1332604" localize="false"/> +<bookmark branch="hid/sfx/ui/documentpropertiesdialog/tabcontrol" id="bm_id1332605" localize="false"/> <h1 id="hd_id3152876"><variable id="eigen_von"><link href="text/shared/01/01100000.xhp">Properties</link> </variable></h1> <paragraph role="paragraph" id="par_id3153255"><variable id="dokumentinfotext"><ahelp hid=".uno:SetDocumentProperties">Displays the properties for the current file, including statistics such as word count and the date the file was created.</ahelp> commit ef038a595ab4bf26e785facbb5331b3cb1f351a4 Author: Andras Timar <[email protected]> AuthorDate: Sun Oct 8 21:07:15 2023 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:55:21 2024 +0100 add a bookmark to Accessibility Check page - COOL looks for this Change-Id: I7a7ccb275f7865d9e0efca9dd0199ba0b0b345fc diff --git a/source/text/swriter/01/accessibility_check.xhp b/source/text/swriter/01/accessibility_check.xhp index 4480023f0d..ba9d5789e0 100644 --- a/source/text/swriter/01/accessibility_check.xhp +++ b/source/text/swriter/01/accessibility_check.xhp @@ -24,6 +24,7 @@ <bookmark branch="hid/SIDEBAR_A11YCHECKDECK" id="bm_id411702978494392" localize="false"/> <bookmark id="bm_id541630940172937" branch="hid/svx/ui/accessibilitycheckdialog/dialogButtons" localize="false"/> <bookmark id="bm_id541630940172826" branch="hid/svx/ui/accessibilitycheckdialog/@@nowidget@@" localize="false"/> +<bookmark id="bm_id541630940172827" branch="hid/svx/ui/accessibilitycheckentry/accessibilityCheckEntryGotoButton" localize="false"/> <section id="accessibilitycheckheading"> <h1 id="hd_id771630940172827"><variable id="accessibilitycheckh1"><link href="text/swriter/01/accessibility_check.xhp">Accessibility Check</link></variable></h1> <paragraph id="par_id951630940172830" role="paragraph">Review common accessibility problems in the document, and support for PDF/UA specifications in the PDF export dialog.</paragraph> commit 5a148566334ff8e93c62305477c4547453875e76 Author: Andras Timar <[email protected]> AuthorDate: Tue Jul 28 16:09:48 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:46:21 2024 +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 884b0734a7..122823575b 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -225,7 +225,10 @@ <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"> + <form name="P" method="get" action="/cgi-bin/omega/omega" target="_top"> + <input type="hidden" name="DB" value="{$lang}2404"/> + <input type="hidden" name="FMT" value="cp-query"/> + <input type="hidden" name="DEFAULTOP" value="and"/> <input id="omega-autofocus" type="search" name="P" placeholder="{$ui_pholderfullsearch}" dir="auto"/> <input type="submit" class="xapian-omega-search-button" value="🔍"/> </form> commit 4222e24bbf67bb12715ddbe8b2ef04298eff4bad Author: Andras Timar <[email protected]> AuthorDate: Wed Aug 22 09:55:44 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:35:48 2024 +0100 [cp] help page footer Change-Id: I257d7dd85a896ff69e391a05206c1cb419997331 diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index e1381b10cc..884b0734a7 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -256,12 +256,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 88dae9c03a..2b43a52a74 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -247,7 +247,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 b1ab392c793a1f0e5cfcfdeba2ed72e066fcc419 Author: Andras Timar <[email protected]> AuthorDate: Fri May 15 11:59:20 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:35:25 2024 +0100 [cp] Hide 'Please support us!' button Change-Id: I003b30b6b47e1323f4ef2a504ed72585561a386f diff --git a/help3xsl/default.css b/help3xsl/default.css index 790e4411d8..3d66a12b1a 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -676,6 +676,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 5c798ae6ffce4a531f03fdc23d7977417a6ff316 Author: Jan Holesovsky <[email protected]> AuthorDate: Tue Aug 7 19:09:41 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:33:19 2024 +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 c5b7d27797..6999779693 100644 --- a/AllLangHelp_shared.mk +++ b/AllLangHelp_shared.mk @@ -596,7 +596,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 289dfb5ba5..129cf5c9de 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 7d2dd18324..3da429d8d3 100644 --- a/source/text/schart/main0000.xhp +++ b/source/text/schart/main0000.xhp @@ -33,7 +33,6 @@ <bookmark branch="hid/CHART2_HID_SCH_WIN_DOCUMENT" id="bm_id861689726559781" localize="false"/> <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> <h2 id="hd_id3153143">Chart Data</h2> 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 904cc808ae..f17f8b8c44 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"/><h1 id="hd_id3155960">Welcome to the $[officename] Draw Help</h1> - <embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <h3 id="hd_id3154022">How to Work With $[officename] Draw</h3> <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 d511f66160..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="exclude" status="PUBLISH"> - <title id="tit">YouTube Videos</title> - <filename>/text/shared/06/youtubevideos.xhp</filename> - </topic> -</meta> -<body> -<section id="whatisit"> - <paragraph role="paragraph" id="par_ytvideosample" localize="false"><object data="" id="rs9pMn4cffs" 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 c2d6b921ea..9d9228906d 100644 --- a/source/text/simpress/main0000.xhp +++ b/source/text/simpress/main0000.xhp @@ -32,7 +32,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"/> <h1 id="hd_id3150746">Welcome to the $[officename] Impress Help</h1> - <embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <h3 id="hd_id3153000">How to Work With $[officename] Impress</h3> <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 375e6579d8..87329408d4 100644 --- a/source/text/smath/main0000.xhp +++ b/source/text/smath/main0000.xhp @@ -27,7 +27,6 @@ <body> <bookmark branch="hid/STARMATH_HID_SMA_MAIN_HELP" id="bm_id141689871372411" localize="false"/> <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 9da7e900eb..5172f35350 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"/> <h1 id="hd_id3147233">%PRODUCTNAME Writer Help</h1> -<embed href="text/shared/06/youtubevideos.xhp#whatisit"/> <h3 id="hd_id3147258">Working With %PRODUCTNAME Writer</h3> <embed href="text/swriter/main0503.xhp#main0503"/> <embed href="text/swriter/guide/main.xhp#main"/> commit cd6215c5875b8577605ae6d8d2eb6320c2cebab3 Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Aug 9 20:56:03 2018 +0200 Commit: Andras Timar <[email protected]> CommitDate: Sat Feb 10 20:03:17 2024 +0100 [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 70575875e2..825f920e02 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -393,8 +393,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 5bcd2c28f1..790e4411d8 100644 --- a/help3xsl/default.css +++ b/help3xsl/default.css @@ -398,10 +398,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; } @@ -733,7 +733,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 674f0fe635..e1381b10cc 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -243,7 +243,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>
