diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2025-01-22 12:14:16 -0300 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2025-02-05 23:23:08 +0100 |
| commit | af1454f2c86286ddee5721c2e18e7085323d268c (patch) | |
| tree | a43a9ad7d630f2c3bd2d9644cfd65e31ce76fe2a /help3xsl | |
| parent | 9b807f92a620c372440cb50a9f8a6627bf6cbfa6 (diff) | |
Update and fix xapian search in online help pages
+ Adjust div's in grid after changes in default.css
+ Removed language dropdown
+ Add link to bookshelf on bottom
+ Removed index based on bookmarks-value
+ Removed scripts and css not used (prism, index-related)
Change-Id: Ic1ebcfb35650ecb8a5beec81eec7ce31fa5a9d1d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180599
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 52a90697abc6127f1c9210002cd42280025fa9f4)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/180601
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'help3xsl')
| -rw-r--r-- | help3xsl/xap_templ_query.xsl | 74 |
1 files changed, 31 insertions, 43 deletions
diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index 88dae9c03a..aac3daf284 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -21,22 +21,16 @@ xsltproc xap_template_query.xsl <file.xhp> <xsl:variable name="target" select="concat('/',$productversion,'/')"/> <!-- Strings for the help UI page --> <xsl:variable name ="ui_contents"><xsl:apply-templates select="//variable[@id='contents']"/></xsl:variable> - <xsl:variable name ="ui_index"><xsl:apply-templates select="//variable[@id='index']"/></xsl:variable> - <xsl:variable name ="ui_pholderbmarksall"><xsl:apply-templates select="//variable[@id='pholderbmarksall']"/></xsl:variable> - <xsl:variable name ="ui_pholderbmarkschosen"><xsl:apply-templates select="//variable[@id='pholderbmarkschosen']"/></xsl:variable> <xsl:variable name ="ui_pholderfullsearch"><xsl:apply-templates select="//variable[@id='pholderfullsearch']"/></xsl:variable> <xsl:variable name ="ui_module"><xsl:apply-templates select="//variable[@id='module']"/></xsl:variable> - <xsl:variable name ="ui_language"><xsl:apply-templates select="//variable[@id='language']"/></xsl:variable> <xsl:variable name ="ui_donate"><xsl:apply-templates select="//variable[@id='donate']"/></xsl:variable> <xsl:variable name ="ui_logo"><xsl:apply-templates select="//variable[@id='LibreOfficeHelp']"/></xsl:variable> <xsl:variable name ="ui_selectmodule"><xsl:apply-templates select="//variable[@id='selectmodule']"/></xsl:variable> - <xsl:variable name ="ui_selectlang"><xsl:apply-templates select="//variable[@id='selectlanguage']"/></xsl:variable> <xsl:variable name ="ui_search"><xsl:apply-templates select="//variable[@id='searchhelpcontents']"/></xsl:variable> - + <xsl:variable name="ui_books"><xsl:apply-templates select="//variable[@id='books']"/></xsl:variable> <xsl:variable name="brand3" select="'%PRODUCTNAME'"/> <xsl:variable name="brand4" select="'%PRODUCTVERSION'"/> - <xsl:template match="/"> <![CDATA[$httpheader{Content-Type,text/html; charset=utf-8}<!DOCTYPE html><html lang="]]><xsl:value-of select="$lang"/><![CDATA["> <base href="]]><xsl:value-of select="$target"/><![CDATA["/> @@ -79,16 +73,9 @@ $def{SPAGE,<input type=submit name="[" value="$1" disabled=disabled>} <link rel="shortcut icon" href="media/navigation/favicon.ico"/> <link type="text/css" href="normalize.css" rel="Stylesheet"/> <link type="text/css" href="default.css" rel="Stylesheet"/> -<link type="text/css" href="prism.css" rel="Stylesheet"/> <script type="text/javascript" src="polyfills.js"></script> -<script type="text/javascript" src="languages.js"></script> -<script type="text/javascript" src="]]><xsl:value-of select="$lang"/><![CDATA[/langnames.js"></script> -<script type="text/javascript" src="flexsearch.debug.js"></script> -<script type="text/javascript" src="prism.js"></script> <script type="text/javascript" src="help2.js" defer=""></script> <script type="text/javascript" src="a11y-toggle.js" defer=""></script> -<script type="text/javascript" src="paginathing.js" defer=""></script> -<script type="text/javascript" src="]]><xsl:value-of select="$lang"/><![CDATA[/bookmarks.js" defer=""></script> <script type="text/javascript" src="]]><xsl:value-of select="$lang"/><![CDATA[/contents.js" defer=""></script> <script type="text/javascript" src="help.js" defer=""></script> <meta name="viewport" content="width=device-width,initial-scale=1"/> @@ -108,38 +95,29 @@ document.write("<span title=\""+D+" "+T+"\">]]><xsl:apply-templates select="//va </script> </head> <body> -<div id="TopLeftHeader"> - <header> - <div class="logo-container"> - <a class="logo" href="]]><xsl:value-of select="$lang"/><![CDATA[/text/shared/05/new_help.html"> - <div class="symbol"></div> - <p>]]><xsl:value-of select="$ui_logo"/><![CDATA[</p> - </a> + <header id="TopLeftHeader"> + <a class="symbol" href="]]><xsl:value-of select="$lang"/><![CDATA[/text/shared/05/new_help.html"><div></div></a> + <a class="logo" href="]]><xsl:value-of select="$lang"/><![CDATA[/text/shared/05/new_help.html"> + <p dir="auto">]]><xsl:value-of select="$ui_logo"/><![CDATA[</p> + </a> + <div class="dropdowns"> + <div class="modules"> + <button type="button" data-a11y-toggle="modules-nav" id="modules" aria-haspopup="true" aria-expanded="false" aria-controls="modules-nav">]]> + <xsl:value-of select="$ui_module"/><![CDATA[ + </button> + <nav id="modules-nav" hidden=""/><!-- is filled in via setupModules() --> + </div> </div> </header> -</div> -<div class="modules"> - <button type="button" data-a11y-toggle="modules-nav" id="modules" onclick="setupModules(']]><xsl:value-of select="$lang"/><![CDATA[');" aria-haspopup="true" aria-expanded="false" aria-controls="modules-nav">]]><xsl:value-of select="$ui_module"/><![CDATA[ - </button> - <nav id="modules-nav" hidden=""/><!-- is filled in via setupModules() on demand --> -</div> -<aside class="rightside"> - <input id="accordion-1" name="accordion-menu" type="checkbox"/> - <label for="accordion-1">]]><xsl:value-of select="$ui_contents"/><![CDATA[</label> - <div id="Contents" class="contents-treeview"></div> -</aside> -<aside class="leftside"> - <div id="Index"> - <div class="index-label">]]><xsl:value-of select="$ui_index"/><![CDATA[  🔎︎ </div> - <div id="Bookmarks"> - <input id="search-bar" type="search" class="search" placeholder="]]><xsl:value-of select="$ui_pholderbmarkschosen"/><![CDATA["/> - <nav class="index"></nav> - </div> - </div> -</aside> + <aside class="leftside"> + <input id="accordion-1" name="accordion-menu" type="checkbox"/> + <label for="accordion-1">]]><xsl:value-of select="$ui_contents"/><![CDATA[</label> + <div id="Contents" class="contents-treeview"></div> + </aside> + <div id="DonationFrame"> <div class="donation"> - <p><a href="https://www.libreoffice.org/donate/?pk_campaign=help" target ="_blank">]]><xsl:value-of select="$ui_donate"/><![CDATA[</a></p> + <p dir="auto"><a href="https://www.libreoffice.org/donate/?pk_campaign=help" target ="_blank">]]><xsl:value-of select="$ui_donate"/><![CDATA[</a></p> </div> </div> <div id="SearchFrame"> @@ -247,7 +225,17 @@ $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" target="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p> + <h2 style="text-align: center;" dir="auto"><a href="https://books.libreoffice.org" target="_blank">]]><xsl:value-of select="$ui_books"/><![CDATA[</a></h2> + <div class="noteicon" dir="auto" style="display:flex;justify-content:center;flex-wrap:wrap;row-gap:15px;"> + <img src="media/navigation/libo-writer.svg" alt="Writer Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-calc.svg" alt="Calc Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-impress.svg" alt="Impress Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-draw.svg" alt="Draw Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-base.svg" alt="Base Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-math.svg" alt="Math Icon" style="width:60px;height:60px;"></img> + <img src="media/navigation/libo-symbol-black.svg" alt="Getting Started Icon" style="width:60px;height:60px;"></img> + </div> + <p dir="auto"><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" target="_blank">trademark policy</a>. LibreOffice was based on OpenOffice.org.</p> </footer> </body> </html> |