This is an automated email from the ASF dual-hosted git repository.
paulirwin pushed a commit to branch issue/911
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
The following commit(s) were added to refs/heads/issue/911 by this push:
new 8d4abcd83 Fix _rel path by introducing new _luceneNetRel global
variable; add ExtractSearchIndex post-processor
8d4abcd83 is described below
commit 8d4abcd8346fa09ae1c2b3063c6e9d76b638763e
Author: Paul Irwin <[email protected]>
AuthorDate: Sun Sep 22 11:08:02 2024 -0600
Fix _rel path by introducing new _luceneNetRel global variable; add
ExtractSearchIndex post-processor
---
.../Templates/DefaultTemplateNoAssets/partials/_head.liquid | 12 ++++++------
.../Templates/DefaultTemplateNoAssets/partials/_logo.liquid | 6 +++---
.../DefaultTemplateNoAssets/partials/_scripts.liquid | 6 +++---
.../DefaultTemplateNoAssets/partials/head.tmpl.partial | 10 +++++-----
.../DefaultTemplateNoAssets/partials/logo.tmpl.partial | 4 ++--
.../DefaultTemplateNoAssets/partials/scripts.tmpl.partial | 6 +++---
.../Templates/LuceneTemplate/partials/logo.tmpl.partial | 2 +-
websites/apidocs/docfx.global.json | 5 +++--
websites/apidocs/docfx.global.subsite.json | 5 +++--
websites/apidocs/docfx.site.json | 1 +
websites/apidocs/docs.ps1 | 1 +
websites/apidocs/toc.yml | 3 ++-
websites/apidocs/toc/toc.yml | 5 +++--
.../site/lucenetemplate/partials/head-content.tmpl.partial | 6 +++---
14 files changed, 39 insertions(+), 33 deletions(-)
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_head.liquid
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_head.liquid
index cc6b1e9e8..644653ba1 100644
--- a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_head.liquid
+++ b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_head.liquid
@@ -17,20 +17,20 @@
<meta name="description" content="{{_description}}">
{%- endif -%}
{%- if _appFaviconPath -%}
- <link rel="shortcut icon" href="{{_rel}}/{{_appFaviconPath}}">
+ <link rel="shortcut icon" href="{{_luceneNetRel}}{{_appFaviconPath}}">
{%- else -%}
- <link rel="shortcut icon" href="{{_rel}}/favicon.ico">
+ <link rel="shortcut icon" href="{{_luceneNetRel}}favicon.ico">
{%- endif -%}
- <link rel="stylesheet" href="{{_rel}}/styles/docfx.vendor.min.css">
- <link rel="stylesheet" href="{{_rel}}/styles/docfx.css">
- <link rel="stylesheet" href="{{_rel}}/styles/main.css">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/docfx.vendor.min.css">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/docfx.css">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/main.css">
<meta property="docfx:navrel" content="{{_navRel}}">
<meta property="docfx:tocrel" content="{{_tocRel}}">
{%- if _noindex -%}
<meta name="searchOption" content="noindex">
{%- endif -%}
{%- if _enableSearch -%}
- <meta property="docfx:rel" content="{{_rel}}/">
+ <meta property="docfx:rel" content="{{_luceneNetRel}}">
{%- endif -%}
{%- if _enableNewTab -%}
<meta property="docfx:newtab" content="true">
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_logo.liquid
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_logo.liquid
index 85922ab50..b9b4c51f0 100644
--- a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_logo.liquid
+++ b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_logo.liquid
@@ -1,8 +1,8 @@
{% comment -%}Copyright (c) Microsoft. All rights reserved. Licensed under the
MIT license. See LICENSE file in the project root for full license
information.{% endcomment -%}
-<a class="navbar-brand" href="{{_rel}}/index.html">
+<a class="navbar-brand" href="{{_luceneNetRel}}index.html">
{%- if _appLogoPath -%}
- <img id="logo" class="svg" src="{{_rel}}/{{_appLogoPath}}"
alt="{{_appName}}" >
+ <img id="logo" class="svg" src="{{_luceneNetRel}}{{_appLogoPath}}"
alt="{{_appName}}" >
{%- else -%}
- <img id="logo" class="svg" src="{{_rel}}/logo.svg" alt="{{_appName}}" >
+ <img id="logo" class="svg" src="{{_luceneNetRel}}logo.svg"
alt="{{_appName}}" >
{%- endif -%}
</a>
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_scripts.liquid
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_scripts.liquid
index fa95fcd7b..1b6c74ddc 100644
---
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_scripts.liquid
+++
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/_scripts.liquid
@@ -1,4 +1,4 @@
{% comment -%}Copyright (c) Microsoft. All rights reserved. Licensed under the
MIT license. See LICENSE file in the project root for full license
information.{% endcomment -%}
-<script type="text/javascript"
src="{{_rel}}/styles/docfx.vendor.min.js"></script>
-<script type="text/javascript" src="{{_rel}}/styles/docfx.js"></script>
-<script type="text/javascript" src="{{_rel}}/styles/main.js"></script>
+<script type="text/javascript"
src="{{_luceneNetRel}}styles/docfx.vendor.min.js"></script>
+<script type="text/javascript" src="{{_luceneNetRel}}styles/docfx.js"></script>
+<script type="text/javascript" src="{{_luceneNetRel}}styles/main.js"></script>
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/head.tmpl.partial
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/head.tmpl.partial
index dbe0d780c..74a29d04e 100644
---
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/head.tmpl.partial
+++
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/head.tmpl.partial
@@ -8,13 +8,13 @@
<meta name="title"
content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}}
{{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
<meta name="generator" content="docfx {{_docfxVersion}}">
{{#_description}}<meta name="description"
content="{{_description}}">{{/_description}}
- <link rel="shortcut icon"
href="{{_rel}}/{{{_appFaviconPath}}}{{^_appFaviconPath}}favicon.ico{{/_appFaviconPath}}">
- <link rel="stylesheet" href="{{_rel}}/styles/docfx.vendor.min.css">
- <link rel="stylesheet" href="{{_rel}}/styles/docfx.css">
- <link rel="stylesheet" href="{{_rel}}/styles/main.css">
+ <link rel="shortcut icon"
href="{{_luceneNetRel}}{{{_appFaviconPath}}}{{^_appFaviconPath}}favicon.ico{{/_appFaviconPath}}">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/docfx.vendor.min.css">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/docfx.css">
+ <link rel="stylesheet" href="{{_luceneNetRel}}styles/main.css">
<meta property="docfx:navrel" content="{{_navRel}}">
<meta property="docfx:tocrel" content="{{_tocRel}}">
{{#_noindex}}<meta name="searchOption" content="noindex">{{/_noindex}}
- {{#_enableSearch}}<meta property="docfx:rel"
content="{{_rel}}/">{{/_enableSearch}}
+ {{#_enableSearch}}<meta property="docfx:rel"
content="{{_luceneNetRel}}">{{/_enableSearch}}
{{#_enableNewTab}}<meta property="docfx:newtab"
content="true">{{/_enableNewTab}}
</head>
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/logo.tmpl.partial
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/logo.tmpl.partial
index 5cb694628..ff19fdc11 100644
---
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/logo.tmpl.partial
+++
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/logo.tmpl.partial
@@ -1,5 +1,5 @@
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT
license. See LICENSE file in the project root for full license information.}}
-<a class="navbar-brand" href="{{_rel}}/index.html">
- <img id="logo" class="svg"
src="{{_rel}}/{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}"
alt="{{_appName}}" >
+<a class="navbar-brand" href="{{_luceneNetRel}}index.html">
+ <img id="logo" class="svg"
src="{{_luceneNetRel}}{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}"
alt="{{_appName}}" >
</a>
diff --git
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/scripts.tmpl.partial
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/scripts.tmpl.partial
index 73dada514..99d3fe9af 100644
---
a/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/scripts.tmpl.partial
+++
b/websites/apidocs/Templates/DefaultTemplateNoAssets/partials/scripts.tmpl.partial
@@ -1,5 +1,5 @@
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT
license. See LICENSE file in the project root for full license information.}}
-<script type="text/javascript"
src="{{_rel}}/styles/docfx.vendor.min.js"></script>
-<script type="text/javascript" src="{{_rel}}/styles/docfx.js"></script>
-<script type="text/javascript" src="{{_rel}}/styles/main.js"></script>
+<script type="text/javascript"
src="{{_luceneNetRel}}styles/docfx.vendor.min.js"></script>
+<script type="text/javascript" src="{{_luceneNetRel}}styles/docfx.js"></script>
+<script type="text/javascript" src="{{_luceneNetRel}}styles/main.js"></script>
diff --git
a/websites/apidocs/Templates/LuceneTemplate/partials/logo.tmpl.partial
b/websites/apidocs/Templates/LuceneTemplate/partials/logo.tmpl.partial
index ee0b7d641..38c3a82ad 100644
--- a/websites/apidocs/Templates/LuceneTemplate/partials/logo.tmpl.partial
+++ b/websites/apidocs/Templates/LuceneTemplate/partials/logo.tmpl.partial
@@ -1,5 +1,5 @@
{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT
license. See LICENSE file in the project root for full license information.}}
<a class="navbar-brand" href="/">
- <img id="logo" class="svg"
src="{{_rel}}/{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}"
alt="{{_appName}}" >
+ <img id="logo" class="svg"
src="{{_luceneNetRel}}{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}"
alt="{{_appName}}" >
</a>
diff --git a/websites/apidocs/docfx.global.json
b/websites/apidocs/docfx.global.json
index 6bc0eda9e..d27732fda 100644
--- a/websites/apidocs/docfx.global.json
+++ b/websites/apidocs/docfx.global.json
@@ -1,9 +1,10 @@
{
- "_appTitle": "Apache Lucene.NET 4.8.0-beta00016 Documentation",
+ "_appTitle": "Apache Lucene.NET 4.8.0-ci Documentation",
"_disableContribution": false,
"_appFaviconPath": "logo/favicon.ico",
"_enableSearch": true,
"_appLogoPath": "logo/lucene-net-color.png",
"_appFooter": "Copyright © 2024 The Apache Software Foundation,
Licensed under the <a href='http://www.apache.org/licenses/LICENSE-2.0'
target='_blank'>Apache License, Version 2.0</a><br/> <small>Apache Lucene.Net,
Lucene.Net, Apache, the Apache feather logo, and the Apache Lucene.Net project
logo are trademarks of The Apache Software Foundation. <br/>All other marks
mentioned may be trademarks or registered trademarks of their respective
owners.</small>",
- "_gitSource": "https://github.com/apache/lucenenet.git";
+ "_gitSource": "https://github.com/apache/lucenenet.git";,
+ "_luceneNetRel": "http://localhost:8080/";
}
diff --git a/websites/apidocs/docfx.global.subsite.json
b/websites/apidocs/docfx.global.subsite.json
index f08744a58..d578ee023 100644
--- a/websites/apidocs/docfx.global.subsite.json
+++ b/websites/apidocs/docfx.global.subsite.json
@@ -1,4 +1,5 @@
{
- "_rel": "https://lucenenet.apache.org/docs/4.8.0-beta00009";,
- "_api": "https://lucenenet.apache.org/docs/4.8.0-beta00016/";
+ "_api": "https://lucenenet.apache.org/docs/4.8.0-ci/";
}
+
+
diff --git a/websites/apidocs/docfx.site.json b/websites/apidocs/docfx.site.json
index fd30bc01e..a4fc34e6f 100644
--- a/websites/apidocs/docfx.site.json
+++ b/websites/apidocs/docfx.site.json
@@ -66,6 +66,7 @@
"Templates/LuceneTemplateAssets"
],
"postProcessors": [
+ "ExtractSearchIndex",
"AggregatePostProcessor"
],
"noLangKeyword": false,
diff --git a/websites/apidocs/docs.ps1 b/websites/apidocs/docs.ps1
index f360b42d1..55cf9700f 100644
--- a/websites/apidocs/docs.ps1
+++ b/websites/apidocs/docs.ps1
@@ -127,6 +127,7 @@ $DocFxJsonContent._appFooter = "Copyright ©
$((Get-Date).Year) The Apache S
$DocFxJsonContent._appTitle = "Apache Lucene.NET $LuceneNetVersion
Documentation"
#$DocFxJsonContent._gitContribute.branch = "docs/$LuceneNetVersion"
#$DocFxJsonContent._gitContribute.tag = "$VCSLabel"
+$DocFxJsonContent._luceneNetRel = $BaseUrl + "/"
$DocFxJsonContent | ConvertTo-Json -depth 100 | Set-Content $DocFxGlobalJson
# update the docfx.json file
diff --git a/websites/apidocs/toc.yml b/websites/apidocs/toc.yml
index 69eedd7c4..adb25fea5 100644
--- a/websites/apidocs/toc.yml
+++ b/websites/apidocs/toc.yml
@@ -1,5 +1,6 @@
+items:
- name: Lucene.Net API
- topicHref: https://lucenenet.apache.org/docs/4.8.0-beta00016/
+ topicHref: https://lucenenet.apache.org/docs/4.8.0-ci/
- name: Lucene.Net CLI
href: ../../src/dotnet/tools/lucene-cli/docs/
topicHref: ../../src/dotnet/tools/lucene-cli/docs/index.md
diff --git a/websites/apidocs/toc/toc.yml b/websites/apidocs/toc/toc.yml
index 20c51e9da..15e75e80a 100644
--- a/websites/apidocs/toc/toc.yml
+++ b/websites/apidocs/toc/toc.yml
@@ -1,7 +1,8 @@
+items:
- name: Lucene.Net API
- topicHref: https://lucenenet.apache.org/docs/4.8.0-beta00016
+ topicHref: https://lucenenet.apache.org/docs/4.8.0-ci
- name: Lucene.Net CLI
- topicHref: https://lucenenet.apache.org/docs/4.8.0-beta00016/cli/index.html
+ topicHref: https://lucenenet.apache.org/docs/4.8.0-ci/cli/index.html
- name: Lucene.Net Website
topicHref: https://lucenenet.apache.org/
diff --git a/websites/site/lucenetemplate/partials/head-content.tmpl.partial
b/websites/site/lucenetemplate/partials/head-content.tmpl.partial
index e95c2d62b..b207f9ea9 100644
--- a/websites/site/lucenetemplate/partials/head-content.tmpl.partial
+++ b/websites/site/lucenetemplate/partials/head-content.tmpl.partial
@@ -17,11 +17,11 @@
{{#_noindex}}<meta name="searchOption" content="noindex">{{/_noindex}}
{{#_enableSearch}}<meta property="docfx:rel"
content="{{_rel}}">{{/_enableSearch}}
{{#_enableNewTab}}<meta property="docfx:newtab"
content="true">{{/_enableNewTab}}
-
+
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/academicons/1.8.0/css/academicons.min.css";
integrity="sha512-GGGNUPDhnG8LEAEDsjqYIQns+Gu8RBs4j5XGlxl7UfRaZBhCCm5jenJkeJL8uPuOXGqgl8/H1gjlWQDRjd3cUQ=="
crossorigin="anonymous">
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css";
integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw=="
crossorigin="anonymous">
-
+
<link rel="stylesheet"
href="//fonts.googleapis.com/css?family=Lato:400,700%7CMerriweather%7CRoboto+Mono">
<link rel="stylesheet" href="/styles/site.css">
-</head>
\ No newline at end of file
+</head>
