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 0dbdd68 image location for hero, prefix url
new be4d6a8 Merge pull request #3 from ebarboni/hbsurlfix
0dbdd68 is described below
commit 0dbdd6864ad3ab77604b5a8d65f4b37802097a45
Author: Eric Barboni <[email protected]>
AuthorDate: Wed Oct 11 21:08:31 2023 +0200
image location for hero, prefix url
---
build/netbeans-ui-bundle.zip | Bin 1520001 -> 1519797 bytes
src/layouts/404.hbs | 6 +++---
src/layouts/platform_tutorial.hbs | 17 ++---------------
src/layouts/raw.hbs | 6 +++---
src/layouts/tutorial.hbs | 2 +-
src/partials/footer.hbs | 28 ++++++++++++++--------------
src/partials/slider.hbs | 6 +++---
src/scss/_vendor/colorbox/colorbox.scss | 22 +++++++++++-----------
src/scss/common/_netbeans.scss | 6 +++---
9 files changed, 40 insertions(+), 53 deletions(-)
diff --git a/build/netbeans-ui-bundle.zip b/build/netbeans-ui-bundle.zip
index cb388e1..883e5d3 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 617f35f..359ce5c 100644
--- a/src/layouts/404.hbs
+++ b/src/layouts/404.hbs
@@ -1,4 +1,4 @@
-<%/*
+{{!
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,5 +17,5 @@
specific language governing permissions and limitations
under the License.
-*/%>
-${content.body}
+}}
+{{{page.contents}}}
diff --git a/src/layouts/platform_tutorial.hbs
b/src/layouts/platform_tutorial.hbs
index b6fc6c4..5e87bb2 100644
--- a/src/layouts/platform_tutorial.hbs
+++ b/src/layouts/platform_tutorial.hbs
@@ -28,20 +28,7 @@
{{>news}}
<div class='grid-container main-content tutorial'>
<h1 class="sect0">{{{page.title}}}</h1>
- {{#unless page.attributes.reviewed }}
- {{!
- /*
- jbake's 'content.file' has this structure:
"/home/user/directory/of/the/clone/netbeans-website/netbeans.apache.org/build/generated-bake/content/plugins/index.asciidoc"
- we're interested in the part after "generated-bake"
- */
- String tutorial_file="/";
- String tutorial_content_file = content.get("file");
- int idx =
tutorial_content_file.lastIndexOf("build/generated-bake");
- // Adds support for Windows builds
- idx = idx == -1 ?
tutorial_content_file.lastIndexOf("build\\generated-bake") : idx;
- tutorial_file = idx == -1 ? "???" + tutorial_content_file :
tutorial_content_file.substring(idx + "build/generated-bake".length());
- }}
-
+ {{#unless page.attributes.reviewed }}
<div class="sectionbody">
<div class="admonitionblock note">
<table>
@@ -49,7 +36,7 @@
<td class="icon"><i class="fa icon-note"
title="Note"></i></td>
<td class="content">This tutorial needs a review.
You can <a href="{{{page.editUrl}}}" title="Edit this
tutorial in github">edit it in GitHub </a>
- following these <a
href="/kb/docs/contributing.html">contribution guidelines.</a></td>
+ following these <a
href="{{siteRootPath}}/tutorial/main/kb/docs/contributing.html">contribution
guidelines.</a></td>
</tr></tbody>
</table>
</div>
diff --git a/src/layouts/raw.hbs b/src/layouts/raw.hbs
index 617f35f..4526ae3 100644
--- a/src/layouts/raw.hbs
+++ b/src/layouts/raw.hbs
@@ -1,4 +1,4 @@
-<%/*
+{{!
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,5 +17,5 @@
specific language governing permissions and limitations
under the License.
-*/%>
-${content.body}
+}}
+{{{page.content}}}
diff --git a/src/layouts/tutorial.hbs b/src/layouts/tutorial.hbs
index d66fe0e..1cc6e7f 100644
--- a/src/layouts/tutorial.hbs
+++ b/src/layouts/tutorial.hbs
@@ -36,7 +36,7 @@
<td class="icon"><i class="fa icon-note"
title="Note"></i></td>
<td class="content">This tutorial needs a review.
You can <a href="{{{page.editUrl}}}" title="Edit this
tutorial in github">edit it in GitHub </a>
- following these <a
href="/kb/docs/contributing.html">contribution guidelines.</a></td>
+ following these <a
href="{{siteRootPath}}/tutorial/main/kb/docs/contributing.html">contribution
guidelines.</a></td>
</tr></tbody>
</table>
</div>
diff --git a/src/partials/footer.hbs b/src/partials/footer.hbs
index 5ac4f7f..b3d6add 100644
--- a/src/partials/footer.hbs
+++ b/src/partials/footer.hbs
@@ -45,7 +45,7 @@
<div class="grid-x grid-padding-x">
<div class="large-auto cell">
{{! See
https://www.apache.org/foundation/marks/pmcs#navigation }}
- <h1><a href="/about/index.html">About</a></h1>
+ <h1><a
href="{{siteRootPath}}/front/main/about/index.html">About</a></h1>
<ul>
<li><a
href="{{{siteRootPath}}}/front/main/community/who.html">Who's Who</a></li>
<li><a
href="https://www.apache.org/foundation/thanks.html";>Thanks</a></li>
@@ -63,29 +63,29 @@
</ul>
</div>
<div class="large-auto cell">
- <h1><a href="/participate/index.html">Participate</a></h1>
+ <h1><a
href="{{{siteRootPath}}}/front/main/participate/index.html">Participate</a></h1>
<ul>
- <li><a href="/participate/submit-pr.html">Submitting Pull
Requests</a></li>
- <li><a href="/participate/report-issue.html">Reporting
Issues</a></li>
- <li><a href="/participate/index.html#documentation">Improving
the documentation</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/participate/submit-pr.html">Submitting Pull
Requests</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/participate/report-issue.html">Reporting
Issues</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/participate/index.html#documentation">Improving
the documentation</a></li>
</ul>
</div>
<div class="large-auto cell">
- <h1><a href="/help/index.html">Get Help</a></h1>
+ <h1><a href="{{{siteRootPath}}}/front/main/help/index.html">Get
Help</a></h1>
<ul>
- <li><a
href="/help/index.html#documentation">Documentation</a></li>
- <li><a href="/wiki/index.html">Wiki</a></li>
- <li><a href="/help/index.html#support">Community Support</a></li>
- <li><a href="/help/commercial-support.html">Commercial
Support</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/help/index.html#documentation">Documentation</a></li>
+ <li><a
href="{{{siteRootPath}}}/wiki/main/wiki/index.html">Wiki</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/help/index.html#support">Community
Support</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/help/commercial-support.html">Commercial
Support</a></li>
</ul>
</div>
<div class="large-auto cell">
- <h1><a href="/download/index.html">Download</a></h1>
+ <h1><a
href="{{{siteRootPath}}}/front/main/download/index.html">Download</a></h1>
<ul>
- <li><a href="/download/index.html">Releases</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/download/index.html">Releases</a></li>
<li><a
href="https://plugins.netbeans.apache.org/";>Plugins</a></li>
- <li><a href="/download/index.html#source">Building from
source</a></li>
- <li><a href="/download/index.html#previous">Previous
releases</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/download/index.html#_daily_builds_and_building_from_source">Building
from source</a></li>
+ <li><a
href="{{{siteRootPath}}}/front/main/download/index.html#_older_releases">Previous
releases</a></li>
</ul>
</div>
</div>
diff --git a/src/partials/slider.hbs b/src/partials/slider.hbs
index 27c640e..76ec196 100644
--- a/src/partials/slider.hbs
+++ b/src/partials/slider.hbs
@@ -50,7 +50,7 @@
<p>
JDK 12, Java EE, Gradle and more!
</p>
- <p><a class='button success'
href="/download/index.html">Features</a></p>
+ <p><a class='button success'
href="{{{siteRootPath}}}/front/main/download/index.html">Features</a></p>
</div>
</div>
</section>
@@ -79,7 +79,7 @@
<p>
Download Apache NetBeans 11.1 from an Apache mirror
near you.
</p>
- <p><a class='button success'
href="/download/index.html">Download</a></p>
+ <p><a class='button success'
href="{{{siteRootPath}}}/front/main/download/index.html">Download</a></p>
</div>
</div>
</section>
@@ -91,7 +91,7 @@
<div class='annotation'>Apache NetBeans Transition
News</div>
<h1>Join the Apache NetBeans Community</h1>
<p>You can now be part of Apache NetBeans.</p>
- <p><a class="button success"
href="/participate/index.html">Join us!!</a></p>
+ <p><a class="button success"
href="{{{siteRootPath}}}/front/main/participate/index.html">Join us!!</a></p>
</div>
</div>
</section>
diff --git a/src/scss/_vendor/colorbox/colorbox.scss
b/src/scss/_vendor/colorbox/colorbox.scss
index 185023f..3a1acf7 100644
--- a/src/scss/_vendor/colorbox/colorbox.scss
+++ b/src/scss/_vendor/colorbox/colorbox.scss
@@ -22,25 +22,25 @@
*/
#cboxOverlay{background:#000; opacity: 0.9; filter: alpha(opacity = 90);}
#colorbox{outline:0;}
- #cboxTopLeft{width:14px; height:14px;
background:url(/images/colorbox/controls.png) no-repeat 0 0;}
- #cboxTopCenter{height:14px; background:url(/images/colorbox/border.png)
repeat-x top left;}
- #cboxTopRight{width:14px; height:14px;
background:url(/images/colorbox/controls.png) no-repeat -36px 0;}
- #cboxBottomLeft{width:14px; height:43px;
background:url(/images/colorbox/controls.png) no-repeat 0 -32px;}
- #cboxBottomCenter{height:43px; background:url(/images/colorbox/border.png)
repeat-x bottom left;}
- #cboxBottomRight{width:14px; height:43px;
background:url(/images/colorbox/controls.png) no-repeat -36px -32px;}
- #cboxMiddleLeft{width:14px; background:url(/images/colorbox/controls.png)
repeat-y -175px 0;}
- #cboxMiddleRight{width:14px; background:url(/images/colorbox/controls.png)
repeat-y -211px 0;}
+ #cboxTopLeft{width:14px; height:14px;
background:url(../images/colorbox/controls.png) no-repeat 0 0;}
+ #cboxTopCenter{height:14px; background:url(../images/colorbox/border.png)
repeat-x top left;}
+ #cboxTopRight{width:14px; height:14px;
background:url(../images/colorbox/controls.png) no-repeat -36px 0;}
+ #cboxBottomLeft{width:14px; height:43px;
background:url(../images/colorbox/controls.png) no-repeat 0 -32px;}
+ #cboxBottomCenter{height:43px;
background:url(../images/colorbox/border.png) repeat-x bottom left;}
+ #cboxBottomRight{width:14px; height:43px;
background:url(../images/colorbox/controls.png) no-repeat -36px -32px;}
+ #cboxMiddleLeft{width:14px;
background:url(../images/colorbox/controls.png) repeat-y -175px 0;}
+ #cboxMiddleRight{width:14px;
background:url(../images/colorbox/controls.png) repeat-y -211px 0;}
#cboxContent{background:#fff; overflow:visible;}
.cboxIframe{background:#fff;}
#cboxError{padding:50px; border:1px solid #ccc;}
#cboxLoadedContent{margin-bottom:5px;}
-
#cboxLoadingOverlay{background:url(/images/colorbox/loading_background.png)
no-repeat center center;}
- #cboxLoadingGraphic{background:url(/images/colorbox/loading.gif)
no-repeat center center;}
+
#cboxLoadingOverlay{background:url(../images/colorbox/loading_background.png)
no-repeat center center;}
+ #cboxLoadingGraphic{background:url(../images/colorbox/loading.gif)
no-repeat center center;}
#cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center;
width:100%; font-weight:bold; color:#7C7C7C;}
#cboxCurrent{position:absolute; bottom:-25px; left:58px;
font-weight:bold; color:#7C7C7C;}
/* these elements are buttons, and may need to have additional styles
reset to avoid unwanted base styles */
- #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0;
padding:0; margin:0; overflow:visible; position:absolute; bottom:-29px;
background:url(/images/colorbox/controls.png) no-repeat 0px 0px; width:23px;
height:23px; text-indent:-9999px;}
+ #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0;
padding:0; margin:0; overflow:visible; position:absolute; bottom:-29px;
background:url(../images/colorbox/controls.png) no-repeat 0px 0px; width:23px;
height:23px; text-indent:-9999px;}
/* avoid outlines on :active (mouseclick), but preserve outlines on
:focus (tabbed navigating) */
#cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active,
#cboxClose:active {outline:0;}
diff --git a/src/scss/common/_netbeans.scss b/src/scss/common/_netbeans.scss
index ceb8b8a..4082fb4 100644
--- a/src/scss/common/_netbeans.scss
+++ b/src/scss/common/_netbeans.scss
@@ -183,7 +183,7 @@ section.hero {
}
.hero.news, .orbit-wrapper {
- background: linear-gradient(rgba(27, 106, 198, 0.88), rgba(46, 144, 232,
0.84)), url("/images/hero-background.jpg") no-repeat;
+ background: linear-gradient(rgba(27, 106, 198, 0.88), rgba(46, 144, 232,
0.84)), url("../images/hero-background.jpg") no-repeat;
background-size: cover;
background-position: center bottom;
}
@@ -193,13 +193,13 @@ section.hero {
}
/*.netbeans-bg {
- background: url('/images/hero-background.jpg') no-repeat;
+ background: url('../images/hero-background.jpg') no-repeat;
background-size: cover;
background-position: center bottom;
}
.netbeans-bg-1 {
- background: url('/images/hero-background-2.jpg') no-repeat;
+ background: url('../images/hero-background-2.jpg') no-repeat;
background-size: cover;
background-position: center bottom;
}*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
