zregvart closed pull request #10: CAMEL-12997: Create menu and single pages
URL: https://github.com/apache/camel-website/pull/10
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/antora-ui-camel/src/css/header.css
b/antora-ui-camel/src/css/header.css
index 54eb698..401ba6b 100644
--- a/antora-ui-camel/src/css/header.css
+++ b/antora-ui-camel/src/css/header.css
@@ -64,12 +64,6 @@ body {
display: flex;
flex-shrink: 0;
height: var(--navbar-height);
- background-image: url('../img/logo-camel-medium.png');
- background-repeat: no-repeat;
- background-size: 160px;
- background-position-x: 10px;
- background-position-y: 10px;
- width: 180px;
}
.navbar-burger {
diff --git a/antora-ui-camel/src/css/responsive.css
b/antora-ui-camel/src/css/responsive.css
index 2162145..c8bfb3b 100644
--- a/antora-ui-camel/src/css/responsive.css
+++ b/antora-ui-camel/src/css/responsive.css
@@ -1,3 +1,12 @@
+.nav-logo {
+ background-image: url('../img/logo-camel-medium.png');
+ background-repeat: no-repeat;
+ background-size: 160px;
+ background-position-x: 10px;
+ background-position-y: 10px;
+ width: 180px;
+}
+
.full-height {
min-height: 100vh;
}
diff --git a/config.toml b/config.toml
index 03e8c13..5dfce93 100644
--- a/config.toml
+++ b/config.toml
@@ -4,33 +4,151 @@ title = "Apache Camel"
relativeURLs = true
[[menu.main]]
- name = "News"
+ name = "Home"
weight = 1
+ identifier = "home"
+ url = "/"
+
+[[menu.main]]
+ name = "News"
+ weight = 2
identifier = "news"
url = "/news/"
+[[menu.main]]
+ name = "Projects"
+ weight = 3
+ identifier = "projects"
+
+[[menu.main]]
+ name = "Camel K"
+ parent = "projects"
+ weight = 1
+ identifier = "project-camel-k"
+ url = "/projects/camel-k/"
+
[[menu.main]]
name = "Documentation"
identifier = "docs"
- weight = 2
+ weight = 4
[[menu.main]]
- name = "User manual"
+ name = "Getting started"
parent = "docs"
weight = 1
+ identifier = "getting-started"
+ url = "/docs/getting-started/"
+
+[[menu.main]]
+ name = "User manual"
+ parent = "docs"
+ weight = 2
identifier = "manual"
url = "/manual/latest/"
[[menu.main]]
name = "Component reference"
parent = "docs"
- weight = 2
+ weight = 3
identifier = "components"
url = "/components/latest/"
[[menu.main]]
name = "Camel K"
parent = "docs"
- weight = 3
+ weight = 4
identifier = "camel-k"
url = "/camel-k/latest/"
+
+[[menu.main]]
+ name = "Community"
+ identifier = "community"
+ weight = 5
+
+[[menu.main]]
+ name = "Support"
+ parent = "community"
+ weight = 1
+ identifier = "community-support"
+ url = "/community/support/"
+
+[[menu.main]]
+ name = "Contributing"
+ parent = "community"
+ weight = 2
+ identifier = "community-contributing"
+ url = "/community/contributing/"
+
+[[menu.main]]
+ name = "User stories"
+ parent = "community"
+ weight = 3
+ identifier = "community-user-stories"
+ url = "/community/user-stories/"
+
+[[menu.main]]
+ name = "Article"
+ parent = "community"
+ weight = 4
+ identifier = "community-article"
+ url = "/community/article/"
+
+[[menu.main]]
+ name = "Team"
+ parent = "community"
+ weight = 5
+ identifier = "community-team"
+ url = "/community/team/"
+
+[[menu.main]]
+ name = "Camel extra"
+ parent = "community"
+ weight = 6
+ identifier = "community-camel-extra"
+ url = "/community/camel-extra/"
+
+[[menu.main]]
+ name = "Download"
+ weight = 6
+ identifier = "download"
+ url = "/download/"
+
+[[menu.main]]
+ name = "About"
+ identifier = "about"
+ weight = 7
+
+[[menu.main]]
+ name = "Apache events"
+ parent = "about"
+ weight = 1
+ identifier = "about-apache-events"
+ url = "https://www.apache.org/events/current-event.html";
+
+[[menu.main]]
+ name = "License"
+ parent = "about"
+ weight = 2
+ identifier = "about-license"
+ url = "https://www.apache.org/licenses/";
+
+[[menu.main]]
+ name = "Security"
+ parent = "about"
+ weight = 3
+ identifier = "about-security"
+ url = "https://www.apache.org/security/";
+
+[[menu.main]]
+ name = "Sponsorship"
+ parent = "about"
+ weight = 4
+ identifier = "about-sponsorship"
+ url = "https://www.apache.org/foundation/sponsorship.html";
+
+[[menu.main]]
+ name = "Thanks"
+ parent = "about"
+ weight = 5
+ identifier = "about-thanks"
+ url = "https://www.apache.org/foundation/thanks.html";
diff --git a/content/community/article.md b/content/community/article.md
new file mode 100644
index 0000000..44d6bd0
--- /dev/null
+++ b/content/community/article.md
@@ -0,0 +1 @@
+article!
diff --git a/content/community/camel-extra.md b/content/community/camel-extra.md
new file mode 100644
index 0000000..cbcd658
--- /dev/null
+++ b/content/community/camel-extra.md
@@ -0,0 +1 @@
+camel-extra!
diff --git a/content/community/contributing.md
b/content/community/contributing.md
new file mode 100644
index 0000000..919bf34
--- /dev/null
+++ b/content/community/contributing.md
@@ -0,0 +1 @@
+contributing!
diff --git a/content/community/support.md b/content/community/support.md
new file mode 100644
index 0000000..0ee8a07
--- /dev/null
+++ b/content/community/support.md
@@ -0,0 +1 @@
+support!
diff --git a/content/community/team.md b/content/community/team.md
new file mode 100644
index 0000000..0779112
--- /dev/null
+++ b/content/community/team.md
@@ -0,0 +1 @@
+team!
diff --git a/content/community/user-stories.md
b/content/community/user-stories.md
new file mode 100644
index 0000000..666ad2d
--- /dev/null
+++ b/content/community/user-stories.md
@@ -0,0 +1 @@
+user stories!
diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md
new file mode 100644
index 0000000..a80cc81
--- /dev/null
+++ b/content/docs/getting-started.md
@@ -0,0 +1 @@
+getting started!
diff --git a/content/download/_index.md b/content/download/_index.md
new file mode 100644
index 0000000..fb998ef
--- /dev/null
+++ b/content/download/_index.md
@@ -0,0 +1,2 @@
+Download!
+
diff --git a/content/news/_index.md b/content/news/_index.md
new file mode 100644
index 0000000..9a3fcd9
--- /dev/null
+++ b/content/news/_index.md
@@ -0,0 +1 @@
+new Post!
diff --git a/content/projects/camel-k.md b/content/projects/camel-k.md
new file mode 100644
index 0000000..af1c0c3
--- /dev/null
+++ b/content/projects/camel-k.md
@@ -0,0 +1 @@
+Camel K is alive!
diff --git a/layouts/community/single.html b/layouts/community/single.html
new file mode 100644
index 0000000..ef3a636
--- /dev/null
+++ b/layouts/community/single.html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}
+
+<div class="container pb-5">
+ <div class="row">
+ {{ .Content }}
+ </div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/layouts/docs/single.html b/layouts/docs/single.html
new file mode 100644
index 0000000..ef3a636
--- /dev/null
+++ b/layouts/docs/single.html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}
+
+<div class="container pb-5">
+ <div class="row">
+ {{ .Content }}
+ </div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/layouts/download/download.html b/layouts/download/download.html
new file mode 100644
index 0000000..ef3a636
--- /dev/null
+++ b/layouts/download/download.html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}
+
+<div class="container pb-5">
+ <div class="row">
+ {{ .Content }}
+ </div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/layouts/news/news.html b/layouts/news/news.html
new file mode 100644
index 0000000..ef3a636
--- /dev/null
+++ b/layouts/news/news.html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}
+
+<div class="container pb-5">
+ <div class="row">
+ {{ .Content }}
+ </div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index b7631aa..0edaa10 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -2,27 +2,27 @@
<div class="container">
<div class="row">
<div class="col-md-3 pt-5">
- <img src="./_/img/logo-d.svg" class="logo-small mt-60"/>
+ <img src="/_/img/logo-d.svg" class="logo-small mt-60"/>
</div>
<div class="col-md-3">
<h5>Overview</h5>
<ul class="list-unstyled">
- <li><a href="news.html">News</a></li>
- <li><a href="news.html">Components</a></li>
- <li><a href="news.html">Download</a></li>
- <li><a href="news.html">Getting started</a></li>
- <li><a href="news.html">FAQ</a></li>
+ <li><a href="/news">News</a></li>
+ <li><a href="/components/latest/">Components</a></li>
+ <li><a href="/download/">Download</a></li>
+ <li><a href="/docs/getting-started/">Getting
started</a></li>
+ <li><a href="/docs/faq/">FAQ</a></li>
</ul>
</div>
<div class="col-md-3">
<h5>Community</h5>
<ul class="list-unstyled">
- <li><a href="news.html">Support</a></li>
- <li><a href="news.html">Contributing</a></li>
- <li><a href="news.html">User stories</a></li>
- <li><a href="news.html">Article</a></li>
- <li><a href="news.html">Team</a></li>
- <li><a href="news.html">Camel extra</a></li>
+ <li><a href="/community/support/">Support</a></li>
+ <li><a
href="/community/contributing/">Contributing</a></li>
+ <li><a href="/community/user-stories/">User
stories</a></li>
+ <li><a href="/community/article/">Article</a></li>
+ <li><a href="/community/team/">Team</a></li>
+ <li><a href="/community/camel-extra/">Camel
extra</a></li>
</ul>
</div>
<div class="col-md-3">
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index a01f825..fe6e822 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -18,7 +18,7 @@
<body class="article">
<nav class="navbar shadow border-bottom">
<div class="navbar-brand">
- <a class="navbar-item" href="{{ .Site.BaseURL | relURL }}"></a>
+ <a class="navbar-item nav-logo" href="{{ .Site.BaseURL | relURL
}}"></a>
<button class="navbar-burger" data-target="topbar-nav">
<span></span>
<span></span>
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
new file mode 100644
index 0000000..ef3a636
--- /dev/null
+++ b/layouts/projects/single.html
@@ -0,0 +1,9 @@
+{{ partial "header.html" . }}
+
+<div class="container pb-5">
+ <div class="row">
+ {{ .Content }}
+ </div>
+</div>
+
+{{ partial "footer.html" . }}
diff --git a/site.yml b/site.yml
index 6ab7382..8872fe4 100644
--- a/site.yml
+++ b/site.yml
@@ -5,15 +5,15 @@ site:
content:
sources:
- - url: https://gitbox.apache.org/repos/asf/camel.git
- branches: master
- start_path: docs/user-manual
- - url: https://gitbox.apache.org/repos/asf/camel.git
- branches: master
- start_path: docs/components
- - url: g...@github.com:apache/camel-k.git
- branches: antora
- start_path: docs
+ - url: https://gitbox.apache.org/repos/asf/camel.git
+ branches: master
+ start_path: docs/user-manual
+ - url: https://gitbox.apache.org/repos/asf/camel.git
+ branches: master
+ start_path: docs/components
+ - url: g...@github.com:apache/camel-k.git
+ branches: antora
+ start_path: docs
ui:
bundle:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
