You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/10/05 21:08:10 UTC
[netbeans-website] branch master updated: template sorting
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-website.git
The following commit(s) were added to refs/heads/master by this push:
new 53a133bde template sorting
new 5d86b8dc5 Merge pull request #616 from ebarboni/templatesreorg
53a133bde is described below
commit 53a133bde7c660586aa3b955f0dd2d24660e30b0
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Wed Oct 5 13:13:53 2022 +0200
template sorting
---
.../src/content/templates/README.asciidoc | 8 +-
.../src/content/templates/footer.gsp | 117 ---------------------
netbeans.apache.org/src/content/templates/page.gsp | 35 +++---
.../src/content/templates/page_front.gsp | 48 ++++-----
.../src/content/templates/page_noaside.gsp | 37 ++-----
.../src/content/templates/platform_tutorial.gsp | 41 +++-----
.../content/templates/templatesparts/footer.gsp | 117 +++++++++++++++++++++
.../templates/{ => templatesparts}/head.gsp | 7 +-
.../templates/{ => templatesparts}/menu.gsp | 0
.../templates/{ => templatesparts}/news.gsp | 0
.../content/templates/templatesparts/scripts.gsp | 40 +++++++
.../templates/{ => templatesparts}/slider.gsp | 0
.../templates/{ => templatesparts}/tools.gsp | 0
.../templates/{ => templatesparts}/wiki-index.gsp | 0
.../src/content/templates/tutorial.gsp | 41 +++-----
netbeans.apache.org/src/content/templates/wiki.gsp | 40 +++----
16 files changed, 247 insertions(+), 284 deletions(-)
diff --git a/netbeans.apache.org/src/content/templates/README.asciidoc b/netbeans.apache.org/src/content/templates/README.asciidoc
index 0a0552905..b8608a978 100644
--- a/netbeans.apache.org/src/content/templates/README.asciidoc
+++ b/netbeans.apache.org/src/content/templates/README.asciidoc
@@ -39,13 +39,15 @@ These are the main templates used in this project. Files ending in `.gsp` are "G
=== Web page parts
-These parts are included in the
+These parts are in templatesparts folder they should not be used as complete page template
-- *head.gsp* The `<head>` tag for all pages.
- *footer.gsp* The footer section for all pages.
+- *head.gsp* The `<head>` tag for all pages.
- *menu.gsp* The NetBeans web site menu.
- *news.gsp* A top area that gets printed in every page of the website, usually for news and announcements.
+- *scripts.gsp* The NetBeans end of page scripts (check header.gsp match css and associated script)
- *tools.gsp* A bottom area that contains social network links, and a pointer to github's home.
+- *wiki-index.gsp* Warning section for wiki page to be reviewed.
-
+- slider.gsp Not used
diff --git a/netbeans.apache.org/src/content/templates/footer.gsp b/netbeans.apache.org/src/content/templates/footer.gsp
deleted file mode 100644
index ed949db48..000000000
--- a/netbeans.apache.org/src/content/templates/footer.gsp
+++ /dev/null
@@ -1,117 +0,0 @@
-<%/*
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-*/%>
-<%/*
-
- The Apache NetBeans site must comply with the
- "Apache Website Navigation Links Policy" https://www.apache.org/foundation/marks/pmcs#navigation
-
- This seems to be a good place to comply with the policy.
-
-*/%>
-<div class='grid-container incubator-area' style='margin-top: 64px'>
- <div class='grid-x grid-padding-x'>
- <div class='large-auto cell text-center'>
- <a href="https://www.apache.org/">
- <img style="width: 320px" title="Apache Software Foundation" src="/images/asf_logo_wide.svg" />
- </a>
- </div>
- <div class='large-auto cell text-center'>
- <a href="https://www.apache.org/events/current-event.html">
- <img style="width:234px; height: 60px;" title="Apache Software Foundation current event" src="https://www.apache.org/events/current-event-234x60.png"/>
- </a>
- </div>
- </div>
-</div>
-<footer>
- <div class="grid-container">
- <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>
- <ul>
- <li><a href="https://netbeans.apache.org/community/who.html">Who's Who</a></li>
- <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
- <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
- <li><a href="https://www.apache.org/security/">Security</a></li>
- </ul>
- </div>
- <div class="large-auto cell">
- <h1><a href="/community/index.html">Community</a></h1>
- <ul>
- <li><a href="/community/mailing-lists.html">Mailing lists</a></li>
- <li><a href="/community/committer.html">Becoming a committer</a></li>
- <li><a href="/community/events.html">NetBeans Events</a></li>
- <li><a href="https://www.apache.org/events/current-event.html">Apache Events</a></li>
- </ul>
- </div>
- <div class="large-auto cell">
- <h1><a href="/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>
- </ul>
- </div>
- <div class="large-auto cell">
- <h1><a href="/help/index.html">Get Help</a></h1>
- <ul>
- <li><a href="/help/index.html#documentation">Documentation</a></li>
- <li><a href="/wiki/index.asciidoc">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>
- </ul>
- </div>
- <div class="large-auto cell">
- <h1><a href="/download/index.html">Download</a></h1>
- <ul>
- <li><a href="/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>
- </ul>
- </div>
- </div>
- </div>
-</footer>
-<div class='footer-disclaimer'>
- <div class="footer-disclaimer-content">
- <p>Copyright © 2017-2022 <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
- <p>Licensed under the Apache <a href="https://www.apache.org/licenses/">license</a>, version 2.0</p>
- <div style='max-width: 40em; margin: 0 auto'>
- <p>Apache, Apache NetBeans, NetBeans, the Apache feather logo and the Apache NetBeans logo are trademarks of <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
- <p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.</p>
- <p>The Apache NetBeans website conforms to the <a href="https://privacy.apache.org/policies/privacy-policy-public.html">Apache Software Foundation Privacy Policy</a></p>
- </div>
- <%
- /* This is used for debugging the website rendering, it displays the 'content' variable. Just set the "debug" metadata to a not null value (in asciidoc documents add ":debug: yes") to render this area. */
- if (content.debug != null) {
- out.println("<pre style='background: #777; color: #eee;'>");
- for (String key: content.keySet()) {
- if (! key.equals("body")) {
- out.println(key + ":" + content.get(key));
- }
- }
- out.println("</pre>");
- }
- %>
- </div>
-</div>
-
diff --git a/netbeans.apache.org/src/content/templates/page.gsp b/netbeans.apache.org/src/content/templates/page.gsp
index 2d3c9337d..b6281baa6 100644
--- a/netbeans.apache.org/src/content/templates/page.gsp
+++ b/netbeans.apache.org/src/content/templates/page.gsp
@@ -20,27 +20,18 @@
page.gsp: A main area with a right aside for TOCs.
*/%>
-<!DOCTYPE html>
+<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <%include "news.gsp"%>
- <div class='grid-container main-content'>
- <h1 class="sect0">${content.title}</h1>
- ${content.body}
- <%include "tools.gsp"%>
- </div>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages, so we quote with ${' ... '} %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- </body>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "templatesparts/menu.gsp"%>
+ <%include "templatesparts/news.gsp"%>
+ <div class='grid-container main-content'>
+ <h1 class="sect0">${content.title}</h1>
+ ${content.body}
+ <%include "templatesparts/tools.gsp"%>
+ </div>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
diff --git a/netbeans.apache.org/src/content/templates/page_front.gsp b/netbeans.apache.org/src/content/templates/page_front.gsp
index 6774a74f7..2d07e79fb 100644
--- a/netbeans.apache.org/src/content/templates/page_front.gsp
+++ b/netbeans.apache.org/src/content/templates/page_front.gsp
@@ -25,34 +25,26 @@
*/%>
<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <%include "news.gsp"%>
- <div class='grid-container'>
- <div style='margin: 2rem 0' class='grid-x grid-margin-x align-middle'>
- <div class='cell large-2 medium-3 small-5'><img src='/images/apache-netbeans.svg'></img></div>
- <div class='cell large-10 medium-9 small-7'>
- <h1>Apache NetBeans</h1>
- <h2 style='color: #a1c535'>Fits the Pieces Together</h2>
- <p>Development Environment, Tooling Platform and Application Framework.</p>
- </div>
- </div>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "templatesparts/menu.gsp"%>
+ <%include "templatesparts/news.gsp"%>
+ <div class='grid-container'>
+ <div style='margin: 2rem 0' class='grid-x grid-margin-x align-middle'>
+ <div class='cell large-2 medium-3 small-5'><img src='/images/apache-netbeans.svg'></img>
</div>
- <div class='grid-container'>
- ${content.body}
+ <div class='cell large-10 medium-9 small-7'>
+ <h1>Apache NetBeans</h1>
+ <h2 style='color: #a1c535'>Fits the Pieces Together</h2>
+ <p>Development Environment, Tooling Platform and Application Framework.</p>
</div>
- <%include "tools.gsp"%>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- </body>
+ </div>
+ </div>
+ <div class='grid-container'>
+ ${content.body}
+ </div>
+ <%include "templatesparts/tools.gsp"%>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
diff --git a/netbeans.apache.org/src/content/templates/page_noaside.gsp b/netbeans.apache.org/src/content/templates/page_noaside.gsp
index 2f74d64d9..e04f83898 100644
--- a/netbeans.apache.org/src/content/templates/page_noaside.gsp
+++ b/netbeans.apache.org/src/content/templates/page_noaside.gsp
@@ -25,30 +25,15 @@
*/%>
<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <div class='grid-container main-content'>
- <h1 class="sect0">${content.title}</h1>
- ${content.body}
- <%include "tools.gsp"%>
- </div>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- <% if (content.syntax) { %>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
- <script>
- ${' $(document).ready(function() { $("pre code").each(function(i, block) { hljs.highlightBlock(block); }); }); '}
- </script>
- <% } %>
- </body>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "menu.gsp"%>
+ <div class='grid-container main-content'>
+ <h1 class="sect0">${content.title}</h1>
+ ${content.body}
+ <%include "templatesparts/tools.gsp"%>
+ </div>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
diff --git a/netbeans.apache.org/src/content/templates/platform_tutorial.gsp b/netbeans.apache.org/src/content/templates/platform_tutorial.gsp
index c2b821d99..797bd303a 100644
--- a/netbeans.apache.org/src/content/templates/platform_tutorial.gsp
+++ b/netbeans.apache.org/src/content/templates/platform_tutorial.gsp
@@ -20,14 +20,14 @@
tutorial.gsp: A main area with a right aside for TOCs and tutorial sections.
*/%>
-<!DOCTYPE html>
+<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <%include "news.gsp"%>
- <div class='grid-container main-content tutorial'>
- <h1 class="sect0">${content.title}</h1>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "templatesparts/menu.gsp"%>
+ <%include "templatesparts/news.gsp"%>
+ <div class='grid-container main-content tutorial'>
+ <h1 class="sect0">${content.title}</h1>
<% if (content.reviewed == null) {
/*
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"
@@ -59,25 +59,10 @@
</div>
</div>
<% } %>
- ${content.body}
- <%include "tools.gsp"%>
- </div>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages, so we quote with ${' ... '} %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- <% if (content.syntax) { %>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
- <script>
- ${' $(document).ready(function() { $("pre code").each(function(i, block) { hljs.highlightBlock(block); }); }); '}
- </script>
- <% } %>
- </body>
+ ${content.body}
+ <%include "templatesparts/tools.gsp"%>
+ </div>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
diff --git a/netbeans.apache.org/src/content/templates/templatesparts/footer.gsp b/netbeans.apache.org/src/content/templates/templatesparts/footer.gsp
new file mode 100644
index 000000000..fe30ad1fb
--- /dev/null
+++ b/netbeans.apache.org/src/content/templates/templatesparts/footer.gsp
@@ -0,0 +1,117 @@
+<%/*
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+*/%>
+<%/*
+
+ The Apache NetBeans site must comply with the
+ "Apache Website Navigation Links Policy" https://www.apache.org/foundation/marks/pmcs#navigation
+
+ This seems to be a good place to comply with the policy.
+
+*/%>
+ <div class='grid-container incubator-area' style='margin-top: 64px'>
+ <div class='grid-x grid-padding-x'>
+ <div class='large-auto cell text-center'>
+ <a href="https://www.apache.org/">
+ <img style="width: 320px" title="Apache Software Foundation" src="/images/asf_logo_wide.svg" />
+ </a>
+ </div>
+ <div class='large-auto cell text-center'>
+ <a href="https://www.apache.org/events/current-event.html">
+ <img style="width:234px; height: 60px;" title="Apache Software Foundation current event" src="https://www.apache.org/events/current-event-234x60.png"/>
+ </a>
+ </div>
+ </div>
+ </div>
+ <footer>
+ <div class="grid-container">
+ <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>
+ <ul>
+ <li><a href="https://netbeans.apache.org/community/who.html">Who's Who</a></li>
+ <li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="https://www.apache.org/security/">Security</a></li>
+ </ul>
+ </div>
+ <div class="large-auto cell">
+ <h1><a href="/community/index.html">Community</a></h1>
+ <ul>
+ <li><a href="/community/mailing-lists.html">Mailing lists</a></li>
+ <li><a href="/community/committer.html">Becoming a committer</a></li>
+ <li><a href="/community/events.html">NetBeans Events</a></li>
+ <li><a href="https://www.apache.org/events/current-event.html">Apache Events</a></li>
+ </ul>
+ </div>
+ <div class="large-auto cell">
+ <h1><a href="/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>
+ </ul>
+ </div>
+ <div class="large-auto cell">
+ <h1><a href="/help/index.html">Get Help</a></h1>
+ <ul>
+ <li><a href="/help/index.html#documentation">Documentation</a></li>
+ <li><a href="/wiki/index.asciidoc">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>
+ </ul>
+ </div>
+ <div class="large-auto cell">
+ <h1><a href="/download/index.html">Download</a></h1>
+ <ul>
+ <li><a href="/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>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </footer>
+ <div class='footer-disclaimer'>
+ <div class="footer-disclaimer-content">
+ <p>Copyright © 2017-2022 <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
+ <p>Licensed under the Apache <a href="https://www.apache.org/licenses/">license</a>, version 2.0</p>
+ <div style='max-width: 40em; margin: 0 auto'>
+ <p>Apache, Apache NetBeans, NetBeans, the Apache feather logo and the Apache NetBeans logo are trademarks of <a href="https://www.apache.org">The Apache Software Foundation</a>.</p>
+ <p>Oracle and Java are registered trademarks of Oracle and/or its affiliates.</p>
+ <p>The Apache NetBeans website conforms to the <a href="https://privacy.apache.org/policies/privacy-policy-public.html">Apache Software Foundation Privacy Policy</a></p>
+ </div>
+ <%
+ /* This is used for debugging the website rendering, it displays the 'content' variable. Just set the "debug" metadata to a not null value (in asciidoc documents add ":debug: yes") to render this area. */
+ if (content.debug != null) {
+ out.println("<pre style='background: #777; color: #eee;'>");
+ for (String key: content.keySet()) {
+ if (! key.equals("body")) {
+ out.println(key + ":" + content.get(key));
+ }
+ }
+ out.println("</pre>");
+ }
+ %>
+ </div>
+ </div>
+
diff --git a/netbeans.apache.org/src/content/templates/head.gsp b/netbeans.apache.org/src/content/templates/templatesparts/head.gsp
similarity index 94%
rename from netbeans.apache.org/src/content/templates/head.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/head.gsp
index e0a7a9ee4..c0329d800 100644
--- a/netbeans.apache.org/src/content/templates/head.gsp
+++ b/netbeans.apache.org/src/content/templates/templatesparts/head.gsp
@@ -18,7 +18,7 @@
under the License.
*/%>
-<head>
+ <head>
<meta charset="utf-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title><%if (content.title) {%>${content.title}<% } else { %>Apache NetBeans<% }%></title>
@@ -28,7 +28,7 @@
<meta name="keywords" content="${content.keywords}">
<meta name="generator" content="Apache NetBeans">
<link rel="stylesheet" href="/css/font-awesome.min.css">
- <% if (content.syntax) { %> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/styles/default.min.css"> <% } %>
+ <% if (content.syntax) { %><link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/styles/default.min.css"> <% } %>
<link rel="stylesheet" href="/css/netbeans.css">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
@@ -54,5 +54,4 @@
specific language governing permissions and limitations
under the License.
-->
-</head>
-
+ </head>
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/templates/menu.gsp b/netbeans.apache.org/src/content/templates/templatesparts/menu.gsp
similarity index 100%
rename from netbeans.apache.org/src/content/templates/menu.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/menu.gsp
diff --git a/netbeans.apache.org/src/content/templates/news.gsp b/netbeans.apache.org/src/content/templates/templatesparts/news.gsp
similarity index 100%
rename from netbeans.apache.org/src/content/templates/news.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/news.gsp
diff --git a/netbeans.apache.org/src/content/templates/templatesparts/scripts.gsp b/netbeans.apache.org/src/content/templates/templatesparts/scripts.gsp
new file mode 100644
index 000000000..0bf5663f4
--- /dev/null
+++ b/netbeans.apache.org/src/content/templates/templatesparts/scripts.gsp
@@ -0,0 +1,40 @@
+<%/*
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+*/%>
+<%/*
+
+ Scripts elements needed for pages in body element
+
+*/%>
+ <script src="/js/vendor/jquery-3.2.1.min.js"></script>
+ <script src="/js/vendor/what-input.js"></script>
+ <script src="/js/vendor/foundation.min.js"></script>
+ <script src="/js/vendor/jquery.colorbox-min.js"></script>
+ <script src="/js/netbeans.js"></script>
+ <script>
+<% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
+ ${'$(function(){ $(document).foundation(); });'}
+ </script>
+<% if (content.syntax) { %>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.6.0/highlight.min.js"></script>
+ <script>
+ ${' $(document).ready(function() { $("pre code").each(function(i, block) { hljs.highlightBlock(block); }); }); '}
+ </script>
+<% } %>
\ No newline at end of file
diff --git a/netbeans.apache.org/src/content/templates/slider.gsp b/netbeans.apache.org/src/content/templates/templatesparts/slider.gsp
similarity index 100%
rename from netbeans.apache.org/src/content/templates/slider.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/slider.gsp
diff --git a/netbeans.apache.org/src/content/templates/tools.gsp b/netbeans.apache.org/src/content/templates/templatesparts/tools.gsp
similarity index 100%
rename from netbeans.apache.org/src/content/templates/tools.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/tools.gsp
diff --git a/netbeans.apache.org/src/content/templates/wiki-index.gsp b/netbeans.apache.org/src/content/templates/templatesparts/wiki-index.gsp
similarity index 100%
rename from netbeans.apache.org/src/content/templates/wiki-index.gsp
rename to netbeans.apache.org/src/content/templates/templatesparts/wiki-index.gsp
diff --git a/netbeans.apache.org/src/content/templates/tutorial.gsp b/netbeans.apache.org/src/content/templates/tutorial.gsp
index c2b821d99..4ab53ae9b 100644
--- a/netbeans.apache.org/src/content/templates/tutorial.gsp
+++ b/netbeans.apache.org/src/content/templates/tutorial.gsp
@@ -20,14 +20,14 @@
tutorial.gsp: A main area with a right aside for TOCs and tutorial sections.
*/%>
-<!DOCTYPE html>
+<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <%include "news.gsp"%>
- <div class='grid-container main-content tutorial'>
- <h1 class="sect0">${content.title}</h1>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "templatesparts/menu.gsp"%>
+ <%include "templatesparts/news.gsp"%>
+ <div class='grid-container main-content tutorial'>
+ <h1 class="sect0">${content.title}</h1>
<% if (content.reviewed == null) {
/*
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"
@@ -59,25 +59,10 @@
</div>
</div>
<% } %>
- ${content.body}
- <%include "tools.gsp"%>
- </div>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages, so we quote with ${' ... '} %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- <% if (content.syntax) { %>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
- <script>
- ${' $(document).ready(function() { $("pre code").each(function(i, block) { hljs.highlightBlock(block); }); }); '}
- </script>
- <% } %>
- </body>
+ ${content.body}
+ <%include "templatesparts/tools.gsp"%>
+ </div>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
diff --git a/netbeans.apache.org/src/content/templates/wiki.gsp b/netbeans.apache.org/src/content/templates/wiki.gsp
index 80c7bbad4..3ee2f5d98 100644
--- a/netbeans.apache.org/src/content/templates/wiki.gsp
+++ b/netbeans.apache.org/src/content/templates/wiki.gsp
@@ -25,32 +25,16 @@
*/%>
<!doctype html>
<html class="no-js" lang="en" dir="ltr">
- <%include "head.gsp"%>
- <body>
- <%include "menu.gsp"%>
- <%include "news.gsp"%>
- <div class='grid-container main-content'>
- <%include "wiki-index.gsp"%>
- ${content.body}
- <%include "tools.gsp"%>
- </div>
- <%include "footer.gsp"%>
-
- <script src="/js/vendor/jquery-3.2.1.min.js"></script>
- <script src="/js/vendor/what-input.js"></script>
- <script src="/js/vendor/jquery.colorbox-min.js"></script>
- <script src="/js/vendor/foundation.min.js"></script>
- <script src="/js/netbeans.js"></script>
- <script>
- <% // NOTE: Plain jquery stuff needs to be quoted in gsp pages %>
- ${'$(function(){ $(document).foundation(); });'}
- </script>
- <% if (content.syntax) { %>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/highlight.min.js"></script>
- <script>
- ${' $(document).ready(function() { $("pre code").each(function(i, block) { hljs.highlightBlock(block); }); }); '}
- </script>
- <% } %>
-
- </body>
+ <%include "templatesparts/head.gsp"%>
+ <body>
+ <%include "templatesparts/menu.gsp"%>
+ <%include "templatesparts/news.gsp"%>
+ <div class='grid-container main-content'>
+ <%include "templatesparts/wiki-index.gsp"%>
+ ${content.body}
+ <%include "templatesparts/tools.gsp"%>
+ </div>
+ <%include "templatesparts/footer.gsp"%>
+ <%include "templatesparts/scripts.gsp"%>
+ </body>
</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists