Merge pull request #1 from apache/dave2wave-patch-1
Single Simple Template HTML File
diff --git a/theme/apache/templates/README.md b/theme/apache/templates/README.md
index 16527ff..f222085 100644
--- a/theme/apache/templates/README.md
+++ b/theme/apache/templates/README.md
@@ -1,31 +1,30 @@
# Apache Theme
-The Apache Theme included here consists two types of html files.
+The Apache Theme included here consists two types of files.
1. Page templates.
There should be one template for each page type.
-3. HTML fragments.
- There are fragments for different common parts of an html file.
-
+2. CSS stylesheets.
+ There are css overrides for the site and/or template.
+
## Page Templates
1. base.html - there is only one page type.
Change the base page as necessary and add new page types as required.
-## HTML Fragments
+## CSS Stylesheets
-These common parts of the html file are discussed in the order they are included in pages.
+These are site or template specific overrides to the stylesheet frameworks.
+You can choose to include these in your template, or you can move the file into your assets.
-2. styles.html - consists of Apache feather Favicon tags, and Bootstrap and GitHub Markdown Stylesheets. See [Web Developer](../../../DEVELOPER.md).
-3. styles.css - consists of custom site CSS overrides. Edit as needed.
-4. menu.html - consists of site branding and the top menubar. Edit as needed.
-5. footer.html - consists of the page footer including trademarks, licensing, and copyright. Filled from [pelicanconf.py](../../../pelicanconf.py).
-6. scripts.html - consists of Apachecon, JQuery, Bootstrap, and Popper javascript to be included on every page, loaded last. See [Web Developer](../../../DEVELOPER.md).
+1. styles.css - consists of custom site CSS overrides. Edit as needed.
+
+See [Web Developer](../../../DEVELOPER.md) for framework and other information.
Each of the above files should be edited as needed for the deployed website.
-## Pelican Variables set in pelicanconf.py
+## Pelican Variables set in [pelicanconf.py](../../../pelicanconf.py)
~~~
SITENAME = u'Apache <pmc>'
diff --git a/theme/apache/templates/base.html b/theme/apache/templates/base.html
index 999dcb8..491f817 100644
--- a/theme/apache/templates/base.html
+++ b/theme/apache/templates/base.html
@@ -6,9 +6,7 @@
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
-
https://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.
@@ -20,23 +18,149 @@
{% block head %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <title>{{ page.tabtitle }}</title>
+ <title>{{ page.title }}</title>
{% endblock %}
- {% include "styles.html" %}
+ <!-- Start favicon styles - use apache feather -->
+ <link rel="shortcut icon" href="https://www.apache.org/favicons/favicon.ico">
+ <link rel="apple-touch-icon" sizes="57x57" href="https://www.apache.org/favicons/apple-touch-icon-57x57.png">
+ <link rel="apple-touch-icon" sizes="60x60" href="https://www.apache.org/favicons/apple-touch-icon-60x60.png">
+ <link rel="apple-touch-icon" sizes="72x72" href="https://www.apache.org/favicons/apple-touch-icon-72x72.png">
+ <link rel="apple-touch-icon" sizes="76x76" href="https://www.apache.org/favicons/apple-touch-icon-76x76.png">
+ <link rel="apple-touch-icon" sizes="114x114" href="https://www.apache.org/favicons/apple-touch-icon-114x114.png">
+ <link rel="apple-touch-icon" sizes="120x120" href="https://www.apache.org/favicons/apple-touch-icon-120x120.png">
+ <link rel="apple-touch-icon" sizes="144x144" href="https://www.apache.org/favicons/apple-touch-icon-144x144.png">
+ <link rel="apple-touch-icon" sizes="152x152" href="https://www.apache.org/favicons/apple-touch-icon-152x152.png">
+ <link rel="apple-touch-icon" sizes="180x180" href="https://www.apache.org/favicons/apple-touch-icon-180x180.png">
+ <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-32x32.png" sizes="32x32">
+ <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-194x194.png" sizes="194x194">
+ <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-96x96.png" sizes="96x96">
+ <link rel="icon" type="image/png" href="https://www.apache.org/favicons/android-chrome-192x192.png" sizes="192x192">
+ <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-16x16.png" sizes="16x16">
+ <!--<link rel="manifest" href="https://www.apache.org/favicons/manifest.json" crossorigin="anonymous">-->
+ <meta name="msapplication-TileColor" content="#603cba">
+ <meta name="msapplication-TileImage" content="https://www.apache.org/favicons/mstile-144x144.png">
+ <meta name="msapplication-config" content="https://www.apache.org/favicons/browserconfig.xml">
+ <meta name="theme-color" content="#282661">
+ <!-- End favicon styles - use apache feather -->
+
+ <!-- Start load of stylesheets (will need to upgrade periodically) -->
+ <link rel="stylesheet"
+ href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+ integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
+ crossorigin="anonymous">
+ <link rel="stylesheet"
+ href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/3.0.1/github-markdown.min.css"
+ crossorigin="anonymous">
+ <!-- Override css for this site. You can do this inline as shown here or with a site asset. See comment.-->
+ <style>
+ {% include "styles.css" %}
+
+ </style>
+ <!--<link rel="stylesheet" href="/styles/styles.css">-->
+ <!-- End stylesheets -->
</head>
<body id="index" class="home">
- {% include "menu.html" %}
+ <!-- Start branding and top navigation -->
+ <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+ <img src="https://www.apache.org/foundation/press/kit/feather.svg"
+ width="30" height="30" class="d-inline-block align-top"
+ alt="Apache Feather">
+ <button class="navbar-toggler" type="button"
+ data-toggle="collapse" data-target="#navbarSupportedContent"
+ aria-controls="navbarSupportedContent" aria-expanded="false"
+ aria-label="Toggle navigation">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <ul class="navbar-nav mr-auto">
+ <li class="nav-item active">
+ <a class="nav-link" href="/">ASF Corporate Treasurer Information</a>
+ </li>
+ <li class="nav-item active">
+ <a class="nav-link" href="/cc_policy">Credit Cards</a>
+ </li>
+ </ul>
+ <div class="navbar-nav">
+ <div class="nav-item dropdown dropdown-menu-right active">
+ <a class="nav-link dropdown-toggle" href="#"
+ role="button" data-toggle="dropdown" aria-haspopup="true"
+ aria-expanded="false">About</a>
+ <div class="dropdown-menu dropdown-menu-right">
+ <a class="dropdown-item" href="https://www.apache.org/">Foundation</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item"
+ href="https://www.apache.org/licenses/">License</a>
+ <a class="dropdown-item"
+ href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
+ <a class="dropdown-item"
+ href="https://www.apache.org/foundation/thanks.html">Thanks</a>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item"
+ href="https://www.apache.org/security/">Security</a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </nav>
+ <!-- End branding and top navigation -->
+ <!-- Start main content area -->
<div class="container">
{% block content %}
{% endblock %}
- <h2><span class="badge badge-secondary"><a href="{{ SITEREPOSITORY }}{{ page.slug }}.md" style="color:white">Edit Page</a></span></h2>
+ <!-- button to view source in github -->
+ <h2><span class="badge badge-secondary"><a href="{{ SITEREPOSITORY }}{{ page.slug }}.md" style="color:white">Page Source</a></span></h2>
</div>
- {% include "footer.html" %}
+ <!-- End main content area -->
- {% include "scripts.html" %}
+ <!-- Start footer -->
+ <footer class="navbar-expand-lg navbar-light bg-light">
+ <div class="footer" id="footer">
+ <div class="row container-fluid">
+ <div class="col-sm">
+ <a href="https://www.apache.org/">
+ <img src="https://www.apache.org/img/asf_logo.png" alt="The Apache Software Foundation" style="border: 0; margin-top: 2px" width="200">
+ </a>
+ </div>
+ <div class="col-sm center-align">
+ <a href="https://www.apache.org/foundation/contributing.html">
+ <img src="https://www.apache.org/images/SupportApache-small.png" alt="Support The ASF" height="80" width="80">
+ </a>
+ </div>
+ <div class="col-sm right-align">
+ <a class="acevent" data-format="wide" data-mode="light" data-event="random"></a>
+ </div>
+ </div>
+
+ <div class="container-fluid">
+ Copyright © {{ CURRENTYEAR }} The Apache Software Foundation,
+ Licensed under the
+ <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+ <br/>
+ {{ TRADEMARKS }} of <a href="https://www.apache.org/">The Apache Software Foundation.</a>
+ </div><!-- #container-fluid -->
+
+ </div>
+ </footer>
+ <!-- End footer -->
+
+ <!-- Start the loading of javascript frameworks (will need to upgrade periodically) -->
+ <script src="https://www.apachecon.com/event-images/snippet.js"></script>
+ <script
+ src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.slim.min.js"
+ integrity="sha512-6ORWJX/LrnSjBzwefdNUyLCMTIsGoNP6NftMy2UAm1JBm6PRZCO1d7OHBStWpVFZLO+RerTvqX/Z9mBFfCJZ4A=="
+ crossorigin="anonymous"></script>
+ <script
+ src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
+ integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
+ crossorigin="anonymous"></script>
+ <script
+ src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
+ integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
+ crossorigin="anonymous"></script>
+ <!-- End the loading of javascript frameworks -->
</body>
</html>
diff --git a/theme/apache/templates/footer.html b/theme/apache/templates/footer.html
deleted file mode 100644
index c41b874..0000000
--- a/theme/apache/templates/footer.html
+++ /dev/null
@@ -1,28 +0,0 @@
- <footer class="navbar-expand-lg navbar-light bg-light">
- <div class="footer" id="footer">
- <div class="row container-fluid">
- <div class="col-sm">
- <a href="https://www.apache.org/">
- <img src="https://www.apache.org/img/asf_logo.png" alt="The Apache Software Foundation" style="border: 0; margin-top: 2px" width="200">
- </a>
- </div>
- <div class="col-sm center-align">
- <a href="https://www.apache.org/foundation/contributing.html">
- <img src="https://www.apache.org/images/SupportApache-small.png" alt="Support The ASF" height="80" width="80">
- </a>
- </div>
- <div class="col-sm right-align">
- <a class="acevent" data-format="wide" data-mode="light" data-event="random"></a>
- </div>
- </div>
-
- <div class="container-fluid">
- Copyright © {{ CURRENTYEAR }} The Apache Software Foundation,
- Licensed under the
- <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
- <br/>
- {{ TRADEMARKS }} of <a href="https://www.apache.org/">The Apache Software Foundation.</a>
- </div><!-- #container-fluid -->
-
- </div>
- </footer>
diff --git a/theme/apache/templates/menu.html b/theme/apache/templates/menu.html
deleted file mode 100644
index cb1717d..0000000
--- a/theme/apache/templates/menu.html
+++ /dev/null
@@ -1,41 +0,0 @@
- <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
- <img src="https://www.apache.org/foundation/press/kit/feather.svg"
- width="30" height="30" class="d-inline-block align-top"
- alt="Apache Feather">
- <button class="navbar-toggler" type="button"
- data-toggle="collapse" data-target="#navbarSupportedContent"
- aria-controls="navbarSupportedContent" aria-expanded="false"
- aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse" id="navbarSupportedContent">
- <ul class="navbar-nav mr-auto">
- <li class="nav-item active">
- <a class="nav-link" href="/">ASF Corporate Treasurer Information</a>
- </li>
- <li class="nav-item active">
- <a class="nav-link" href="/cc_policy">Credit Cards</a>
- </li>
- </ul>
- <div class="navbar-nav">
- <div class="nav-item dropdown dropdown-menu-right active">
- <a class="nav-link dropdown-toggle" href="#"
- role="button" data-toggle="dropdown" aria-haspopup="true"
- aria-expanded="false">About</a>
- <div class="dropdown-menu dropdown-menu-right">
- <a class="dropdown-item" href="https://www.apache.org/">Foundation</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="https://www.apache.org/licenses/">License</a>
- <a class="dropdown-item"
- href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
- <a class="dropdown-item"
- href="https://www.apache.org/foundation/thanks.html">Thanks</a>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item"
- href="https://www.apache.org/security/">Security</a>
- </div>
- </div>
- </div>
- </div>
- </nav>
diff --git a/theme/apache/templates/scripts.html b/theme/apache/templates/scripts.html
deleted file mode 100644
index 5ffc8dc..0000000
--- a/theme/apache/templates/scripts.html
+++ /dev/null
@@ -1,13 +0,0 @@
- <script src="https://www.apachecon.com/event-images/snippet.js"></script>
- <script
- src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.slim.min.js"
- integrity="sha512-6ORWJX/LrnSjBzwefdNUyLCMTIsGoNP6NftMy2UAm1JBm6PRZCO1d7OHBStWpVFZLO+RerTvqX/Z9mBFfCJZ4A=="
- crossorigin="anonymous"></script>
- <script
- src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
- integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
- crossorigin="anonymous"></script>
- <script
- src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
- integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
- crossorigin="anonymous"></script>
diff --git a/theme/apache/templates/styles.html b/theme/apache/templates/styles.html
deleted file mode 100644
index 4ee6276..0000000
--- a/theme/apache/templates/styles.html
+++ /dev/null
@@ -1,32 +0,0 @@
- <link rel="shortcut icon" href="https://www.apache.org/favicons/favicon.ico">
- <link rel="apple-touch-icon" sizes="57x57" href="https://www.apache.org/favicons/apple-touch-icon-57x57.png">
- <link rel="apple-touch-icon" sizes="60x60" href="https://www.apache.org/favicons/apple-touch-icon-60x60.png">
- <link rel="apple-touch-icon" sizes="72x72" href="https://www.apache.org/favicons/apple-touch-icon-72x72.png">
- <link rel="apple-touch-icon" sizes="76x76" href="https://www.apache.org/favicons/apple-touch-icon-76x76.png">
- <link rel="apple-touch-icon" sizes="114x114" href="https://www.apache.org/favicons/apple-touch-icon-114x114.png">
- <link rel="apple-touch-icon" sizes="120x120" href="https://www.apache.org/favicons/apple-touch-icon-120x120.png">
- <link rel="apple-touch-icon" sizes="144x144" href="https://www.apache.org/favicons/apple-touch-icon-144x144.png">
- <link rel="apple-touch-icon" sizes="152x152" href="https://www.apache.org/favicons/apple-touch-icon-152x152.png">
- <link rel="apple-touch-icon" sizes="180x180" href="https://www.apache.org/favicons/apple-touch-icon-180x180.png">
- <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-32x32.png" sizes="32x32">
- <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-194x194.png" sizes="194x194">
- <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-96x96.png" sizes="96x96">
- <link rel="icon" type="image/png" href="https://www.apache.org/favicons/android-chrome-192x192.png" sizes="192x192">
- <link rel="icon" type="image/png" href="https://www.apache.org/favicons/favicon-16x16.png" sizes="16x16">
- <!--<link rel="manifest" href="https://www.apache.org/favicons/manifest.json" crossorigin="anonymous">-->
- <meta name="msapplication-TileColor" content="#603cba">
- <meta name="msapplication-TileImage" content="https://www.apache.org/favicons/mstile-144x144.png">
- <meta name="msapplication-config" content="https://www.apache.org/favicons/browserconfig.xml">
- <meta name="theme-color" content="#282661">
-
- <link rel="stylesheet"
- href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
- integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
- crossorigin="anonymous">
- <link rel="stylesheet"
- href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/3.0.1/github-markdown.min.css"
- crossorigin="anonymous">
- <style>
- {% include "styles.css" %}
-
- </style>
