help3xsl/online_transform.xsl | 2 - help3xsl/xap_templ_query.xsl | 50 ++++++++++++------------------------------ 2 files changed, 16 insertions(+), 36 deletions(-)
New commits: commit 8e4ec490ed98c1520fcc7e2bc9c4e18fd185c62b Author: Andras Timar <[email protected]> AuthorDate: Sat Mar 15 14:00:47 2025 +0100 Commit: Andras Timar <[email protected]> CommitDate: Sat Mar 15 15:56:05 2025 +0100 [cp] Localized Xapian search Change-Id: Ie71b67d2ba3aaf9c2684fa667a2d87f33f65a37c diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 122823575b..93fd4ea30b 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -227,7 +227,7 @@ <div class="xapian-omega-search"> <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="FMT" value="24.04/{$lang}/xap_tpl"/> <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="🔍"/> diff --git a/help3xsl/xap_templ_query.xsl b/help3xsl/xap_templ_query.xsl index 2b43a52a74..b4cb5b675b 100644 --- a/help3xsl/xap_templ_query.xsl +++ b/help3xsl/xap_templ_query.xsl @@ -21,16 +21,11 @@ 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="brand3" select="'%PRODUCTNAME'"/> @@ -79,16 +74,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 +96,29 @@ document.write("<span title=\""+D+" "+T+"\">]]><xsl:apply-templates select="//va </script> </head> <body> -<div id="TopLeftHeader"> - <header> - <div class="logo-container"> + <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"> - <div class="symbol"></div> - <p>]]><xsl:value-of select="$ui_logo"/><![CDATA[</p> + <p dir="auto">]]><xsl:value-of select="$ui_logo"/><![CDATA[</p> </a> - </div> - </header> -</div> + <div class="dropdowns"> <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 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() on demand --> </div> -<aside class="rightside"> + </div> + </header> + <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> -<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> + <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"> @@ -147,7 +126,9 @@ document.write("<span title=\""+D+" "+T+"\">]]><xsl:apply-templates select="//va </div> </div> <div id="DisplayArea"> - <form name="P" method="get" action="]]><xsl:value-of select="$lang"/><![CDATA[/search" target="_top"> + <form name="P" method="get" action="/cgi-bin/omega/omega" target="_top"> + <input type="hidden" name="DB" value="]]><xsl:value-of select="$lang"/><![CDATA[2404"/> + <input type="hidden" name="FMT" value="24.04/]]><xsl:value-of select="$lang"/><![CDATA[/xap_tpl"/> <center> <input id="omega-autofocus" type=search name=P placeholder="]]><xsl:value-of select="$ui_pholderfullsearch"/>"<