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 2021/06/30 15:58:35 UTC
[openoffice-project] branch preview/refresh updated: various
cleanup and fixes
This is an automated email from the ASF dual-hosted git repository.
wave pushed a commit to branch preview/refresh
in repository https://gitbox.apache.org/repos/asf/openoffice-project.git
The following commit(s) were added to refs/heads/preview/refresh by this push:
new c5439b0 various cleanup and fixes
c5439b0 is described below
commit c5439b0bbe9140671e9d724541d5871886bfea7e
Author: Dave Fisher <da...@davefisher.tech>
AuthorDate: Wed Jun 30 08:57:01 2021 -0700
various cleanup and fixes
---
PAGES.md | 4 +--
content/trademarks.md | 8 +++---
theme/openoffice/templates/base.html | 2 +-
theme/openoffice/templates/page.html | 4 +++
theme/openoffice/templates/sidenav.html | 49 ---------------------------------
theme/openoffice/templates/sidenav.md | 47 -------------------------------
6 files changed, 11 insertions(+), 103 deletions(-)
diff --git a/PAGES.md b/PAGES.md
index 939729d..108127c 100644
--- a/PAGES.md
+++ b/PAGES.md
@@ -54,7 +54,7 @@
| ASF/Website | www.apache.org | |
| ASF/License | www.apache.org/licenses | |
| ASF/Security | www.apache.org/security | **There should only be one security link** |
-| ASF/Events | **www.apache.org/events/current-event** | **There is a new approach** |
-| ASF/Donations | **www.openoffice.org/donations** | **404** |
+| ASF/Events | **www.apache.org/events/current-event** | **There is a new in the footer** |
+| ASF/Donations | **www.openoffice.org/donations** | **Page in openoffice.org is modified** |
| ASF/Sponsorship | www.apache.org/foundation/sponsorship | |
| ASF/Thanks | www.apache.org/foundation/thanks | |
diff --git a/content/trademarks.md b/content/trademarks.md
index 60eb23c..5c4c353 100644
--- a/content/trademarks.md
+++ b/content/trademarks.md
@@ -6,7 +6,7 @@ Notice: http://www.apache.org/licenses/LICENSE-2.0
The Apache Software Foundation holds trademarks on behalf of its
projects. For the Apache OpenOffice project these trademarks include
the names Apache OpenOffice™ and OpenOffice.org®, as well as the
-[graphical logos] [5]. Other graphic formats can be found [here] [6].
+[graphical logos][5]. Other graphic formats can be found [here][6].
Use of these marks is prohibited without explicit permission from the
ASF.
@@ -17,11 +17,11 @@ fully in conformance with Apache policies.
To request such permission, follow these steps:
-1. First familiarize yourself with the [Apache Trademark Policy] [1].
+1. First familiarize yourself with the [Apache Trademark Policy][1].
Many of the common cases are already addressed there. And some uses
of ASF marks ("nominative use") are automatically allowed.
-1. Email a proposal to [private@openoffice.apache.org] [2]. In the
+1. Email a proposal to [private@openoffice.apache.org][2]. In the
proposal, please include:
1. Name and contact information of the company, organization or
@@ -58,7 +58,7 @@ please:
1. If this confirms your belief that a website or product is
infringing one of the above-mentioned trademarks, report it to
- [private@openoffice.apache.org] [4]. Make sure you include all
+ [private@openoffice.apache.org][4]. Make sure you include all
relevant details, especially, a URL for the offending page.
## The "Get it here!" download logo
diff --git a/theme/openoffice/templates/base.html b/theme/openoffice/templates/base.html
index d748f1a..25c1b6b 100644
--- a/theme/openoffice/templates/base.html
+++ b/theme/openoffice/templates/base.html
@@ -42,7 +42,7 @@
<body id="index" class="home">
<div id="banner">
<div id="bannerleft"><a alt="Apache OpenOffice" href="/">
- <img id="logo" alt="Apache OpenOffice" src="/images/AOO4_website_logo.png"/></a></div>
+ <img id="logo" alt="Apache OpenOffice" src="/images/AOO4_website_logo.png" height="50"/></a></div>
<div id="bannercenter">The Free and Open Productivity Suite</div>
</div>
<nav class="navbar navbar-expand-md navbar-dark bg-primary">
diff --git a/theme/openoffice/templates/page.html b/theme/openoffice/templates/page.html
new file mode 100644
index 0000000..426bff1
--- /dev/null
+++ b/theme/openoffice/templates/page.html
@@ -0,0 +1,4 @@
+{% extends "base.html" %}
+{% block content %}
+ {{ page.content }}
+{% endblock %}
diff --git a/theme/openoffice/templates/sidenav.html b/theme/openoffice/templates/sidenav.html
deleted file mode 100644
index 89e0bc6..0000000
--- a/theme/openoffice/templates/sidenav.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<h1>General</h1>
-<ul>
-<li><a href="/index.html">About</a></li>
-<li><a href="/downloads.html">Downloads</a></li>
-<li><a href="/license.html">License</a></li>
-<li><a href="/trademarks.html">Trademarks</a></li>
-<li><a href="/press.html">Press</a></li>
-<li><a href="https://www.openoffice.org/">OpenOffice.org website</a></li>
-</ul>
-<h1>Community</h1>
-<ul>
-<li><a href="/get-involved.html">Get Involved</a></li>
-<li><a href="/orientation/index.html">Orientation</a></li>
-<li><a href="/mailing-lists.html">Mailing Lists</a></li>
-<li><a href="/social.html">Social Networking</a></li>
-<li><a href="/events.html">Events</a></li>
-<li><a href="https://www.openoffice.org/support/">Support</a></li>
-<li><a href="/native-lang.html">Native Language</a></li>
-<li><a href="https://cwiki.apache.org/confluence/display/OOOUSERS/">Planning Wiki</a></li>
-<li><a href="/people.html">People</a></li>
-<li><a href="/community-faqs.html">Community FAQs</a></li>
-</ul>
-<h1>Development</h1>
-<ul>
-<li><a href="/source.html">Source Code</a></li>
-<li><a href="/bug-tracking.html">Bug Tracking</a></li>
-<li><a href="/qa.html">Quality Assurance</a></li>
-<li><a href="/translate.html">Translation</a></li>
-<li><a href="/website-local.html">Website</a></li>
-<li><a href="/security.html">Security Reports</a></li>
-<li><a href="/contributing-code.html">Contributing Code</a></li>
-<li><a href="/developer-faqs.html">Developer FAQs</a></li>
-</ul>
-<h1>Project Management PMC</h1>
-<ul>
-<li><a href="https://blogs.apache.org/OOo/">Project Blog</a></li>
-<li><a href="/pmc-faqs.html">PMC FAQs</a></li>
-</ul>
-<h1>The Apache Software Foundation</h1>
-<ul>
-<li><a href="https://www.apache.org/">Website</a></li>
-<li><a href="https://www.apache.org/licenses/">License</a></li>
-<li><a href="https://www.apache.org/security/">Security</a></li>
-<li><a href="https://www.apache.org/events/current-event">Events</a></li>
-<li><a href="https://www.openoffice.org/donations.html">Donations</a></li>
-<li><a href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
-<li><a href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
-</ul>
-
diff --git a/theme/openoffice/templates/sidenav.md b/theme/openoffice/templates/sidenav.md
deleted file mode 100644
index 9951271..0000000
--- a/theme/openoffice/templates/sidenav.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# General
-
- - [About](/index.html)
- - [Downloads](/downloads.html)
- - [License](/license.html)
- - [Trademarks](/trademarks.html)
- - [Press](/press.html)
- - [OpenOffice.org website](https://www.openoffice.org/)
-
-# Community
-
- - [Get Involved](/get-involved.html)
- - [Orientation](/orientation/index.html)
- - [Mailing Lists](/mailing-lists.html)
- - [Social Networking](/social.html)
- - [Events](/events.html)
- - [Support](https://www.openoffice.org/support/)
- - [Native Language](/native-lang.html)
- - [Planning Wiki](https://cwiki.apache.org/confluence/display/OOOUSERS/)
- - [People](/people.html)
- - [Community FAQs](/community-faqs.html)
-
-# Development
-
- - [Source Code](/source.html)
- - [Bug Tracking](/bug-tracking.html)
- - [Quality Assurance](/qa.html)
- - [Translation](/translate.html)
- - [Website](/website-local.html)
- - [Security Reports](/security.html)
- - [Contributing Code](/contributing-code.html)
- - [Developer FAQs](/developer-faqs.html)
-
-# Project Management PMC
-
- - [Project Blog](https://blogs.apache.org/OOo/)
- - [PMC FAQs](/pmc-faqs.html)
-
-# The Apache Software Foundation
-
- - [Website](https://www.apache.org/)
- - [License](https://www.apache.org/licenses/)
- - [Security](https://www.apache.org/security/)
- - [Events](https://www.apache.org/events/current-event)
- - [Donations](https://www.openoffice.org/donations.html)
- - [Sponsorship](https://www.apache.org/foundation/sponsorship.html)
- - [Thanks](https://www.apache.org/foundation/thanks.html)