This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/netbeans-antora-ui.git
The following commit(s) were added to refs/heads/main by this push:
new ea15f86 lunr ui addition to template
new b01d10b Merge pull request #6 from ebarboni/addlunr
ea15f86 is described below
commit ea15f86dc2824a743412456a91a0aa8984366e6c
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Oct 13 00:19:36 2023 +0200
lunr ui addition to template
---
build/netbeans-ui-bundle.zip | Bin 1684719 -> 22 bytes
src/layouts/404.hbs | 20 +++++++++++++++++++-
src/layouts/blogentry.hbs | 2 ++
src/layouts/blogindex.hbs | 2 ++
src/layouts/page.hbs | 2 ++
src/layouts/page_noaside.hbs | 2 ++
src/layouts/tutorial.hbs | 2 ++
src/layouts/wiki.hbs | 3 +++
src/layouts/wikidev.hbs | 2 ++
src/partials/head.hbs | 10 +++++-----
src/partials/menu.hbs | 3 +++
src/partials/scripts.hbs | 4 ++++
12 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/build/netbeans-ui-bundle.zip b/build/netbeans-ui-bundle.zip
index dbd5c16..15cb0ec 100644
Binary files a/build/netbeans-ui-bundle.zip and b/build/netbeans-ui-bundle.zip
differ
diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
index 359ce5c..9c1f573 100644
--- a/src/layouts/404.hbs
+++ b/src/layouts/404.hbs
@@ -17,5 +17,23 @@
specific language governing permissions and limitations
under the License.
+ page.gsp: A main area with a right aside for TOCs.
+
}}
-{{{page.contents}}}
+<!doctype html>
+<html class="no-js" lang="en" dir="ltr">
+ {{>head}}
+ <body>
+ {{>menu}}
+ {{>news}}
+ <div class='grid-container main-content'>
+ <article class="doc">
+ <h1 class="sect0">{{{page.title}}}</h1>
+ {{{page.contents}}}
+ </article>
+ {{>tools}}
+ </div>
+ {{>footer}}
+ {{>scripts}}
+ </body>
+</html>
diff --git a/src/layouts/blogentry.hbs b/src/layouts/blogentry.hbs
index 3925e6d..76427d3 100644
--- a/src/layouts/blogentry.hbs
+++ b/src/layouts/blogentry.hbs
@@ -30,10 +30,12 @@
{{>menu}}
{{>news}}
<div class='grid-container main-content'>
+ <article class="doc">
<h1 class="sect1">{{{page.title}}}</h1>
<div class="blogdate">{{{ nicedate page.attributes.revdate }}}</div>
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/blogindex.hbs b/src/layouts/blogindex.hbs
index f6150e7..a5de692 100644
--- a/src/layouts/blogindex.hbs
+++ b/src/layouts/blogindex.hbs
@@ -30,6 +30,7 @@ page_noaside.gsp: A main area with no aside.
{{>menu}}
{{>news}}
<div class='grid-container main-content'>
+ <article class="doc">
<h1 class="sect1">{{{page.title}}}</h1>
{{#each (pages-blog 'blogentry')}}
<div class="blogdate">{{{ nicedate ./attributes.revdate }}}</div>
@@ -40,6 +41,7 @@ page_noaside.gsp: A main area with no aside.
{{/each}}
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/page.hbs b/src/layouts/page.hbs
index 0cfbc20..1a94eac 100644
--- a/src/layouts/page.hbs
+++ b/src/layouts/page.hbs
@@ -27,9 +27,11 @@
{{>menu}}
{{>news}}
<div class='grid-container main-content'>
+ <article class="doc">
<h1 class="sect0">{{{page.title}}}</h1>
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/page_noaside.hbs b/src/layouts/page_noaside.hbs
index b96676e..27713aa 100644
--- a/src/layouts/page_noaside.hbs
+++ b/src/layouts/page_noaside.hbs
@@ -29,9 +29,11 @@
<body>
{{>menu}}
<div class='grid-container main-content'>
+ <article class="doc">
<h1 class="sect0">{{{page.title}}}</h1>
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/tutorial.hbs b/src/layouts/tutorial.hbs
index 1cc6e7f..b96aad9 100644
--- a/src/layouts/tutorial.hbs
+++ b/src/layouts/tutorial.hbs
@@ -27,6 +27,7 @@
{{>menu}}
{{>news}}
<div class='grid-container main-content tutorial'>
+ <article class="doc">
<h1 class="sect0">{{{page.title}}}</h1>
{{#unless page.attributes.reviewed }}
<div class="sectionbody">
@@ -50,6 +51,7 @@
{{/unless}}
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/wiki.hbs b/src/layouts/wiki.hbs
index 50761cf..93397aa 100644
--- a/src/layouts/wiki.hbs
+++ b/src/layouts/wiki.hbs
@@ -30,9 +30,12 @@
{{>menu}}
{{>news}}
<div class='grid-container main-content'>
+ <article class="doc">
+ <h1 style="visibily: hidden">{{{page.title}}}</h1>
{{>wiki-index}}
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/layouts/wikidev.hbs b/src/layouts/wikidev.hbs
index d185a08..66994fb 100644
--- a/src/layouts/wikidev.hbs
+++ b/src/layouts/wikidev.hbs
@@ -30,6 +30,7 @@
{{>menu}}
{{>news}}
<div class='grid-container main-content'>
+ <article class="doc">
<h1 class="sect1">{{{page.title}}}</h1>
{{#if (iftaginpage page 'needsreview') }}
{{>wiki-index}}
@@ -38,6 +39,7 @@
{{/if}}
{{{page.contents}}}
{{>tools}}
+ </article>
</div>
{{>footer}}
{{>scripts}}
diff --git a/src/partials/head.hbs b/src/partials/head.hbs
index e09a421..c3c6806 100644
--- a/src/partials/head.hbs
+++ b/src/partials/head.hbs
@@ -31,11 +31,11 @@
<link rel="alternate" type="application/atom+xml" title="Apache NetBeans
Blog" href="https://netbeans.apache.org/blogs/atom"; />
{{#if page.attributes.syntax }}<link rel="stylesheet"
href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/styles/default.min.css">{{/if}}
<link rel="stylesheet" href="{{{uiRootPath}}}/css/netbeans.css">
- <link rel="apple-touch-icon" sizes="180x180"
href="{{{uiRootPath}}}/images/fav/apple-touch-icon.png">
- <link rel="icon" type="image/png" sizes="32x32"
href="{{{uiRootPath}}}/images/fav/favicon-32x32.png">
- <link rel="icon" type="image/png" sizes="16x16"
href="{{{uiRootPath}}}/images/fav/favicon-16x16.png">
- <link rel="manifest" href="{{{uiRootPath}}}/images/fav/site.webmanifest">
- <link rel="mask-icon"
href="{{{uiRootPath}}}/images/fav/safari-pinned-tab.svg" color="#5bbad5">
+ <link rel="apple-touch-icon" sizes="180x180"
href="{{{uiRootPath}}}/apple-touch-icon.png">
+ <link rel="icon" type="image/png" sizes="32x32"
href="{{{uiRootPath}}}/favicon-32x32.png">
+ <link rel="icon" type="image/png" sizes="16x16"
href="{{{uiRootPath}}}/favicon-16x16.png">
+ <link rel="manifest" href="{{{uiRootPath}}}/site.webmanifest">
+ <link rel="mask-icon" href="{{{uiRootPath}}}/safari-pinned-tab.svg"
color="#5bbad5">
<meta name="msapplication-TileColor" content="#ffc40d">
<meta name="theme-color" content="#ffffff">
<link href="{{{uiRootPath}}}/css/font-open-sans.css" rel="stylesheet">
diff --git a/src/partials/menu.hbs b/src/partials/menu.hbs
index 000318c..e6010d5 100644
--- a/src/partials/menu.hbs
+++ b/src/partials/menu.hbs
@@ -29,6 +29,9 @@
</div>
<div class="top-bar-right">
<ul class="vertical medium-horizontal menu"
data-responsive-menu="drilldown medium-dropdown">
+ {{#if env.SITE_SEARCH_PROVIDER}}
+ <li> <input id="search-input" type="text" placeholder="Search the
docs"> </li>
+ {{/if}}
<li> <a
href="{{siteRootPath}}/front/main/community/index.html">Community</a> </li>
<li> <a
href="{{siteRootPath}}/front/main/participate/index.html">Participate</a> </li>
<li> <a
href="{{siteRootPath}}/front/main/blogs/index.html">Blog</a></li>
diff --git a/src/partials/scripts.hbs b/src/partials/scripts.hbs
index fb4ba24..bde4aae 100644
--- a/src/partials/scripts.hbs
+++ b/src/partials/scripts.hbs
@@ -23,6 +23,10 @@
Scripts elements needed for pages in body element
}}
+
+{{#if env.SITE_SEARCH_PROVIDER}}
+{{> search-scripts}}
+{{/if}}
<script src="{{{uiRootPath}}}/js/vendor/jquery-3.7.1.min.js"></script>
<script src="{{{uiRootPath}}}/js/vendor/what-input.js"></script>
<script src="{{{uiRootPath}}}/js/vendor/foundation.min.js"></script>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
