This is an automated email from the ASF dual-hosted git repository. petko pushed a commit to branch preview/blog-migration in repository https://gitbox.apache.org/repos/asf/openoffice-project.git
The following commit(s) were added to refs/heads/preview/blog-migration by this push: new c1a3f35 moved dther orientation and docs content menu is now fixed on top nav menu blog is pointing now to internal blog added Pipfile to ignore list c1a3f35 is described below commit c1a3f35119b3c7f306fd443c1022c72306da0d90 Author: Peter Kovacs <pe...@apache.org> AuthorDate: Fri Jun 2 19:35:31 2023 +0200 moved dther orientation and docs content menu is now fixed on top nav menu blog is pointing now to internal blog added Pipfile to ignore list --- .gitignore | 1 + content/pages/blogpage.md | 5 ++++ content/{ => pages}/docs/download_process.png | Bin content/{ => pages}/docs/edit-cms.md | 0 .../docs/governance/consensusBuilding.md | 0 .../{ => pages}/docs/governance/lazyConsensus.md | 0 content/{ => pages}/docs/governance/voting.md | 0 content/{ => pages}/orientation/decision-making.md | 0 .../orientation/how-aoo-project-works.md | 0 content/{ => pages}/orientation/index.md | 0 content/{ => pages}/orientation/infrastructure.md | 0 .../{ => pages}/orientation/intro-contributing.md | 0 .../{ => pages}/orientation/intro-development.md | 0 content/{ => pages}/orientation/intro-doc.md | 0 content/{ => pages}/orientation/intro-l10n.md | 0 content/{ => pages}/orientation/intro-marketing.md | 0 content/{ => pages}/orientation/intro-qa.md | 0 theme/openoffice/static/css/openoffice.css | 8 ++++++ theme/openoffice/templates/blog.html | 32 +++++++++++++++++++++ theme/openoffice/templates/topnav.html | 2 +- 20 files changed, 47 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d9f7c7d..78061d1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ cache .DS_Store .history .idea +Pipfile *~ pelican.auto.py site-generated diff --git a/content/pages/blogpage.md b/content/pages/blogpage.md new file mode 100644 index 0000000..f95127f --- /dev/null +++ b/content/pages/blogpage.md @@ -0,0 +1,5 @@ +Title: Apache OpenOffice Blog +Template: blog +Date: '2023-06-02' + +Welcome to the Apache OpenOffice Blog. You can read news on the project development. \ No newline at end of file diff --git a/content/docs/download_process.png b/content/pages/docs/download_process.png similarity index 100% rename from content/docs/download_process.png rename to content/pages/docs/download_process.png diff --git a/content/docs/edit-cms.md b/content/pages/docs/edit-cms.md similarity index 100% rename from content/docs/edit-cms.md rename to content/pages/docs/edit-cms.md diff --git a/content/docs/governance/consensusBuilding.md b/content/pages/docs/governance/consensusBuilding.md similarity index 100% rename from content/docs/governance/consensusBuilding.md rename to content/pages/docs/governance/consensusBuilding.md diff --git a/content/docs/governance/lazyConsensus.md b/content/pages/docs/governance/lazyConsensus.md similarity index 100% rename from content/docs/governance/lazyConsensus.md rename to content/pages/docs/governance/lazyConsensus.md diff --git a/content/docs/governance/voting.md b/content/pages/docs/governance/voting.md similarity index 100% rename from content/docs/governance/voting.md rename to content/pages/docs/governance/voting.md diff --git a/content/orientation/decision-making.md b/content/pages/orientation/decision-making.md similarity index 100% rename from content/orientation/decision-making.md rename to content/pages/orientation/decision-making.md diff --git a/content/orientation/how-aoo-project-works.md b/content/pages/orientation/how-aoo-project-works.md similarity index 100% rename from content/orientation/how-aoo-project-works.md rename to content/pages/orientation/how-aoo-project-works.md diff --git a/content/orientation/index.md b/content/pages/orientation/index.md similarity index 100% rename from content/orientation/index.md rename to content/pages/orientation/index.md diff --git a/content/orientation/infrastructure.md b/content/pages/orientation/infrastructure.md similarity index 100% rename from content/orientation/infrastructure.md rename to content/pages/orientation/infrastructure.md diff --git a/content/orientation/intro-contributing.md b/content/pages/orientation/intro-contributing.md similarity index 100% rename from content/orientation/intro-contributing.md rename to content/pages/orientation/intro-contributing.md diff --git a/content/orientation/intro-development.md b/content/pages/orientation/intro-development.md similarity index 100% rename from content/orientation/intro-development.md rename to content/pages/orientation/intro-development.md diff --git a/content/orientation/intro-doc.md b/content/pages/orientation/intro-doc.md similarity index 100% rename from content/orientation/intro-doc.md rename to content/pages/orientation/intro-doc.md diff --git a/content/orientation/intro-l10n.md b/content/pages/orientation/intro-l10n.md similarity index 100% rename from content/orientation/intro-l10n.md rename to content/pages/orientation/intro-l10n.md diff --git a/content/orientation/intro-marketing.md b/content/pages/orientation/intro-marketing.md similarity index 100% rename from content/orientation/intro-marketing.md rename to content/pages/orientation/intro-marketing.md diff --git a/content/orientation/intro-qa.md b/content/pages/orientation/intro-qa.md similarity index 100% rename from content/orientation/intro-qa.md rename to content/pages/orientation/intro-qa.md diff --git a/theme/openoffice/static/css/openoffice.css b/theme/openoffice/static/css/openoffice.css index a3478f1..79f4b26 100644 --- a/theme/openoffice/static/css/openoffice.css +++ b/theme/openoffice/static/css/openoffice.css @@ -155,6 +155,7 @@ h1,h2,h3,h4,h5,h6 { } #contenta { + margin-top: 20px; margin: 0 20px 20px 20px; padding: 0 8px 20px; color: #333; @@ -299,6 +300,12 @@ td { text-decoration:underline; } +.navbar { + position: fixed; /* Set the navbar to fixed position */ + top: 0; /* Position the navbar at the top of the page */ + width: 100%; /* Full width */ +} + #navigation { border: 1px solid #e6ebed; border-left: none; @@ -351,6 +358,7 @@ td { background-color: #e6ebed; } + #footera { margin: 20px 0px 0px 0px; padding: 8px 0px 12px 0px; diff --git a/theme/openoffice/templates/blog.html b/theme/openoffice/templates/blog.html new file mode 100644 index 0000000..01709f0 --- /dev/null +++ b/theme/openoffice/templates/blog.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% block content %} +<div> + <title>Blog</title> + <div> + {% for article in articles %} + <!-- Post --> + <div class="row"> + <div class="callout"> + <article class="post"> + <header> + <div class="title"> + <h2><a href="/blog/{{ article.slug }}.html">{{ article.title }}</a></h2> + <p>Posted on: {{ article.date }}</p> + <p>{{ article.summary }}</p> + <footer> + <ul class="actions"> + <div style="text-align: right"><a href="/blog/{{ article.slug }}.html" class="button medium">Continue Reading</a></div> + </ul> + <ul class="stats"> + {% for tag in article.tags %} + <li><a href="#">{{ tag.name }}</a></li> + {% endfor %} + </ul> + </footer> + </article> + </div> + </div> + {% endfor %} + </div> + </div> +{% endblock %} \ No newline at end of file diff --git a/theme/openoffice/templates/topnav.html b/theme/openoffice/templates/topnav.html index f15fd98..dd00e9a 100644 --- a/theme/openoffice/templates/topnav.html +++ b/theme/openoffice/templates/topnav.html @@ -52,7 +52,7 @@ <a class="nav-link dropdown-toggle" href="#" id="projectDropdown" role="button" data-toggle="dropdown" aria-expanded="false">Project</a> <ul class="dropdown-menu" aria-labelledby="projectDropdown"> - <li><a class="dropdown-item" href="https://blogs.apache.org/OOo/">Project Blog</a></li> + <li><a class="dropdown-item" href="/blogpage.html">Project Blog</a></li> <li><a class="dropdown-item" href="/pmc-faqs.html">PMC FAQs</a></li> </ul> </li>