You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2020/10/27 23:08:33 UTC
[openoffice-org] branch main updated: breadcrumbs.gsp and
ssi_pages.gsp are included in the skeleton. All main level html and md
files have their proper metadata.
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git
The following commit(s) were added to refs/heads/main by this push:
new 53a46fb breadcrumbs.gsp and ssi_pages.gsp are included in the skeleton. All main level html and md files have their proper metadata.
53a46fb is described below
commit 53a46fb35e24661aacb215aa08d232abd8f3d2e6
Author: Dave Fisher <da...@davefisher.tech>
AuthorDate: Tue Oct 27 16:08:21 2020 -0700
breadcrumbs.gsp and ssi_pages.gsp are included in the skeleton. All main level html and md files have their proper metadata.
---
content/about.html | 1 -
content/brand.md | 1 -
content/contact_us.html | 2 ++
content/contributing.html | 2 ++
content/donate-thanks.html | 2 ++
content/donations.html | 2 ++
content/extensions.html | 2 ++
content/faq.html | 2 ++
content/index-image-passthru.html | 2 ++
content/index.html | 2 ++
content/lang.md | 1 -
content/license.html | 2 ++
content/lspintro.html | 2 ++
content/mail_list.html | 2 ++
content/ml_guidelines.html | 2 ++
content/news.html | 2 ++
content/privacy.md | 1 -
content/privacy_old.md | 1 -
content/project_issues.html | 2 ++
content/quickbugzilla.html | 2 ++
content/sitemap.html | 2 ++
content/style-test.md | 1 -
content/terms_of_use.html | 2 ++
content/topnav.md | 1 -
jbake.properties | 3 +++
templates/breadcrumbs.gsp | 3 +++
templates/skeleton.gsp | 10 +++-------
templates/ssi_paths.gsp | 7 +++++++
28 files changed, 50 insertions(+), 14 deletions(-)
diff --git a/content/about.html b/content/about.html
index ae5306c..2409180 100644
--- a/content/about.html
+++ b/content/about.html
@@ -1,5 +1,4 @@
type=html_page
-status=published
~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/content/brand.md b/content/brand.md
index 459c568..c5f17ee 100644
--- a/content/brand.md
+++ b/content/brand.md
@@ -1,5 +1,4 @@
type=brand
-status=published
search=search
selectedlang=en
language=Language
diff --git a/content/contact_us.html b/content/contact_us.html
index 24f87bd..4d765d1 100644
--- a/content/contact_us.html
+++ b/content/contact_us.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" />
<head>
diff --git a/content/contributing.html b/content/contributing.html
index 61a7e83..6cbc699 100644
--- a/content/contributing.html
+++ b/content/contributing.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html>
<head>
<title>Contributing to OpenOffice.org</title>
diff --git a/content/donate-thanks.html b/content/donate-thanks.html
index ba8cfaf..447fc7b 100644
--- a/content/donate-thanks.html
+++ b/content/donate-thanks.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html>
<html><head>
<title>Thanks for Your Donation</title>
diff --git a/content/donations.html b/content/donations.html
index 7f2764a..5085d96 100644
--- a/content/donations.html
+++ b/content/donations.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
diff --git a/content/extensions.html b/content/extensions.html
index 4f0fdc5..cce8bd7 100644
--- a/content/extensions.html
+++ b/content/extensions.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/2000/REC-xhtml1-20000126/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/content/faq.html b/content/faq.html
index d502189..a8d802d 100644
--- a/content/faq.html
+++ b/content/faq.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/content/index-image-passthru.html b/content/index-image-passthru.html
index 0cf59b2..4df90e6 100644
--- a/content/index-image-passthru.html
+++ b/content/index-image-passthru.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html>
<html>
diff --git a/content/index.html b/content/index.html
index 6a6c72b..df92555 100644
--- a/content/index.html
+++ b/content/index.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
diff --git a/content/lang.md b/content/lang.md
index 0d87c32..19721a3 100644
--- a/content/lang.md
+++ b/content/lang.md
@@ -1,5 +1,4 @@
type=md_page
-status=published
title=Native Language Sites
~~~~~~
diff --git a/content/license.html b/content/license.html
index 596b486..7d41d65 100644
--- a/content/license.html
+++ b/content/license.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
diff --git a/content/lspintro.html b/content/lspintro.html
index 9755505..3ce7ec3 100644
--- a/content/lspintro.html
+++ b/content/lspintro.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html>
<head>
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8" />
diff --git a/content/mail_list.html b/content/mail_list.html
index 970211f..fec176f 100644
--- a/content/mail_list.html
+++ b/content/mail_list.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
diff --git a/content/ml_guidelines.html b/content/ml_guidelines.html
index 9056997..49b9b7a 100644
--- a/content/ml_guidelines.html
+++ b/content/ml_guidelines.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html>
<head>
<meta http-equiv="Content-Type" CONTENT="text/html; charset=utf-8">
diff --git a/content/news.html b/content/news.html
index 7c7821c..fc6ba47 100644
--- a/content/news.html
+++ b/content/news.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html><head>
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
</head>
diff --git a/content/privacy.md b/content/privacy.md
index e80abbd..e3651fb 100644
--- a/content/privacy.md
+++ b/content/privacy.md
@@ -1,5 +1,4 @@
type=md_page
-status=published
title=Apache OpenOffice - Privacy
notice=http://www.apache.org/licenses/LICENSE-2.0
~~~~~~
diff --git a/content/privacy_old.md b/content/privacy_old.md
index 15c8dc3..fee14f1 100644
--- a/content/privacy_old.md
+++ b/content/privacy_old.md
@@ -1,5 +1,4 @@
type=md_page
-status=published
title=Apache OpenOffice - Privacy (Old)
notice=http://www.apache.org/licenses/LICENSE-2.0
~~~~~~
diff --git a/content/project_issues.html b/content/project_issues.html
index 4a03dc2..d86fdb2 100644
--- a/content/project_issues.html
+++ b/content/project_issues.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<html>
<head>
<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
diff --git a/content/quickbugzilla.html b/content/quickbugzilla.html
index 2740974..89676f0 100644
--- a/content/quickbugzilla.html
+++ b/content/quickbugzilla.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
diff --git a/content/sitemap.html b/content/sitemap.html
index f17bd99..6ae583b 100644
--- a/content/sitemap.html
+++ b/content/sitemap.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
diff --git a/content/style-test.md b/content/style-test.md
index cefc49c..d07909d 100644
--- a/content/style-test.md
+++ b/content/style-test.md
@@ -1,5 +1,4 @@
style=md_page
-status=published
title=This is the title
notice=http://www.apache.org/licenses/LICENSE-2.0
~~~~~~
diff --git a/content/terms_of_use.html b/content/terms_of_use.html
index 908fc8b..ed4468e 100644
--- a/content/terms_of_use.html
+++ b/content/terms_of_use.html
@@ -1,3 +1,5 @@
+type=html_page
+~~~~~~
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
diff --git a/content/topnav.md b/content/topnav.md
index 8c35fbd..592f14a 100644
--- a/content/topnav.md
+++ b/content/topnav.md
@@ -1,5 +1,4 @@
type=navigator
-status=published
divid=topnava
~~~~~~
diff --git a/jbake.properties b/jbake.properties
index 19819e3..0f1686f 100644
--- a/jbake.properties
+++ b/jbake.properties
@@ -11,6 +11,9 @@ template.tag.file=tags.gsp
template.sitemap.file=sitemap.gsp
template.feed.file=feed.gsp
render.index=false
+render.archive=false
index.file=index.html
content.folder=content
destination.folder=output
+default.status=published
+markdown.extensions=ALL,-HARDWRAPS
\ No newline at end of file
diff --git a/templates/breadcrumbs.gsp b/templates/breadcrumbs.gsp
new file mode 100644
index 0000000..3ef9190
--- /dev/null
+++ b/templates/breadcrumbs.gsp
@@ -0,0 +1,3 @@
+<%
+content.breadcrumbs='home';
+%>
\ No newline at end of file
diff --git a/templates/skeleton.gsp b/templates/skeleton.gsp
index 21ac145..8904399 100644
--- a/templates/skeleton.gsp
+++ b/templates/skeleton.gsp
@@ -1,10 +1,7 @@
<%
- content.brand='/brand.html';
- content.topnav='/topnav.html';
- content.leftnav=null;
- content.rightnav=null;
- content.breadcrumbs=null;
// insert breadcrumbs and ssi logic
+ include "breadcrumbs.gsp"
+ include "ssi_paths.gsp"
%><!--#include virtual="/doctype.html" -->
<html>
<head>
@@ -28,8 +25,7 @@
<div id="clear"></div>
<% if (content.leftnav) { %><!--#include virtual="${content.leftnav}" --><% } %>
<% if (content.rightnav) { %><!--#include virtual="${content.rightnav}" --><% } %>
- <div id="content">
- <% if (content.title) {%><h1 class="title">${content.title}</h1><% } %>
+ <div id="content"><% if (content.title) {%><h1 class="title">${content.title}</h1><% } %>
<% if (content.extracted_body) { %>
${content.extracted_body}
<% } else { %>
diff --git a/templates/ssi_paths.gsp b/templates/ssi_paths.gsp
new file mode 100644
index 0000000..b7aacab
--- /dev/null
+++ b/templates/ssi_paths.gsp
@@ -0,0 +1,7 @@
+<%
+ // default values
+ content.brand='/brand.html';
+ content.topnav='/topnav.html';
+ content.leftnav=null;
+ content.rightnav=null;
+%>
\ No newline at end of file