This is an automated email from the ASF dual-hosted git repository. houston pushed a commit to branch jira/solr-15556-antora in repository https://gitbox.apache.org/repos/asf/solr.git
commit 0af5a56e00e8a794055cdcea0a19e2406cf73be3 Author: Houston Putman <[email protected]> AuthorDate: Thu Feb 3 17:01:35 2022 -0500 Add in explicit callouts for partials changes. --- solr/solr-ref-guide/ui-src/partials/article.hbs | 7 ------- solr/solr-ref-guide/ui-src/partials/footer-content.hbs | 2 ++ solr/solr-ref-guide/ui-src/partials/head-icons.hbs | 2 ++ solr/solr-ref-guide/ui-src/partials/header-content.hbs | 4 ++++ solr/solr-ref-guide/ui-src/partials/nav-explore.hbs | 5 ++++- solr/solr-ref-guide/ui-src/partials/nav.hbs | 10 ++++++++++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/solr/solr-ref-guide/ui-src/partials/article.hbs b/solr/solr-ref-guide/ui-src/partials/article.hbs deleted file mode 100644 index 81dac29..0000000 --- a/solr/solr-ref-guide/ui-src/partials/article.hbs +++ /dev/null @@ -1,7 +0,0 @@ -<article class="doc"> -{{#with page.title}} -<h1 class="page">{{{this}}}</h1> -{{/with}} -{{{page.contents}}} -{{> pagination}} -</article> diff --git a/solr/solr-ref-guide/ui-src/partials/footer-content.hbs b/solr/solr-ref-guide/ui-src/partials/footer-content.hbs index fa2e613..1d00a84 100644 --- a/solr/solr-ref-guide/ui-src/partials/footer-content.hbs +++ b/solr/solr-ref-guide/ui-src/partials/footer-content.hbs @@ -1,3 +1,5 @@ <footer class="footer"> + <!-- Solr Changes - Start --> <p> © Apache Software Foundation. All rights reserved.</p> + <!-- Solr Changes - End --> </footer> diff --git a/solr/solr-ref-guide/ui-src/partials/head-icons.hbs b/solr/solr-ref-guide/ui-src/partials/head-icons.hbs index eb06a4b..863d2c5 100644 --- a/solr/solr-ref-guide/ui-src/partials/head-icons.hbs +++ b/solr/solr-ref-guide/ui-src/partials/head-icons.hbs @@ -1 +1,3 @@ +<!-- Solr Changes - Start --> <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon"> +<!-- Solr Changes - End --> diff --git a/solr/solr-ref-guide/ui-src/partials/header-content.hbs b/solr/solr-ref-guide/ui-src/partials/header-content.hbs index 3abffcf..c23cf0b 100644 --- a/solr/solr-ref-guide/ui-src/partials/header-content.hbs +++ b/solr/solr-ref-guide/ui-src/partials/header-content.hbs @@ -1,7 +1,9 @@ <header class="header"> <nav class="navbar"> <div class="navbar-brand"> + <!-- Solr Additions - Start --> <img class="navbar-item" src="{{{uiRootPath}}}/img/solr-sunOnly-small.png" width="30" height="30"> + <!-- Solr Additions - End --> <a class="navbar-item" href="{{{or site.url siteRootPath}}}">{{site.title}}</a> <button class="navbar-burger" data-target="topbar-nav"> <span></span> @@ -11,6 +13,7 @@ </div> <div id="topbar-nav" class="navbar-menu"> <div class="navbar-end"> + <!-- Solr Changes - Start --> <a class="navbar-item" href="https://solr.apache.org/"; target="_blank" rel="noreferrer nopener">Solr Website</a> <div class="navbar-item has-dropdown is-hoverable"> <a class="navbar-link" href="#">Resources</a> @@ -26,6 +29,7 @@ <a class="button is-primary" href="https://solr.apache.org/downloads.html"; target="_blank" rel="noreferrer nopener">Download</a> </span> </div> + <!-- Solr Changes - End --> </div> </div> </nav> diff --git a/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs b/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs index 6788320..3287011 100644 --- a/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs +++ b/solr/solr-ref-guide/ui-src/partials/nav-explore.hbs @@ -22,7 +22,9 @@ </li> {{/each}} </ul> -<!-- A hard-coded list of older Ref Guides, pre-Antora --> + + <!-- Solr Additions - Start --> + <!-- A hard-coded list of older Ref Guides, pre-Antora --> <ul class="components"> <li class="component"> <a class="title" href="https://solr.apache.org/guide";>Pre-9.0 Reference Guides</a> <ul class="versions"> @@ -90,5 +92,6 @@ <a href="https://solr.apache.org/guide/6_6";>6.6</a> </ul> </li> + <!-- Solr Additions - End --> </ul> </div> diff --git a/solr/solr-ref-guide/ui-src/partials/nav.hbs b/solr/solr-ref-guide/ui-src/partials/nav.hbs new file mode 100644 index 0000000..8d32344 --- /dev/null +++ b/solr/solr-ref-guide/ui-src/partials/nav.hbs @@ -0,0 +1,10 @@ +<div class="nav-container"{{#if page.component}} data-component="{{page.component.name}}" data-version="{{page.version}}"{{/if}}> + <!-- Solr Changes - Start (change 'aside' -> 'nav') --> + <nav class="nav"> + <div class="panels"> +{{> nav-menu}} +{{> nav-explore}} + </div> + </nav> + <!-- Solr Changes - End --> +</div>
