You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2019/10/07 15:52:37 UTC

[allura-site] 01/02: [#8319] make dedicated download page, with proper links in it

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/allura-site.git

commit 0d2be0a03a4b8a6cd7810fd9cb1c3fe2491ae90f
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Mon Oct 7 11:42:06 2019 -0400

    [#8319] make dedicated download page, with proper links in it
---
 _src/allura-theme/static/css/style.css    |   7 +-
 _src/allura-theme/templates/download.html |  95 +++++++++++++++++
 _src/allura-theme/templates/index.html    |   6 +-
 _src/pelicanconf.py                       |   2 +-
 download.html                             | 164 ++++++++++++++++++++++++++++++
 index.html                                |   6 +-
 theme/css/style.css                       |   7 +-
 7 files changed, 274 insertions(+), 13 deletions(-)

diff --git a/_src/allura-theme/static/css/style.css b/_src/allura-theme/static/css/style.css
index 27cfa90..5b518be 100644
--- a/_src/allura-theme/static/css/style.css
+++ b/_src/allura-theme/static/css/style.css
@@ -527,11 +527,16 @@ button:hover, button:focus, button:active {
     height: 320px;
 }
 
-#about p {
+#about p,
+#about ul {
     margin-left: auto;
     margin-right: auto;
     max-width: 800px;
 }
+#about ul li {
+    margin-left: 2em;
+    padding: 0.2em;
+}
 
 #latest {
     background-image: url('../img/bg-download-fire.jpg');
diff --git a/_src/allura-theme/templates/download.html b/_src/allura-theme/templates/download.html
new file mode 100644
index 0000000..4977d08
--- /dev/null
+++ b/_src/allura-theme/templates/download.html
@@ -0,0 +1,95 @@
+{% extends 'base.html' %}
+
+{% set xxl_header = False %}
+
+{% block content %}
+<div id="about" class="row bg-white pad-vert-xl">
+  <div class="row">
+    <h3 class="text-black text-center">Download Allura</h3>
+  </div>
+
+  <div class="row">
+    <div class="col-20 no-float auto-margin">
+      <div class="row">
+        <p class="pad-md">
+            <a href="https://www.apache.org/dyn/closer.cgi/allura/allura-{{ RELEASE_VERSION }}.tar.gz">Download Allura v{{ RELEASE_VERSION }}</a>.  This is the latest release of Apache Allura, released {{ RELEASE_DATE }}.
+            {% if RELEASE_NEWS %}
+              <a href="{{ RELEASE_NEWS }}">Read what's new.</a>
+            {% endif %}
+        </p>
+        <p>
+            Verify the download:
+        </p>
+        <ul>
+            <li><a href="{{ DIST_URL }}allura-{{ RELEASE_VERSION }}.tar.gz.sha512">SHA-512</a> checksum</li>
+            <li>PGP <a href="{{ DIST_URL }}allura-{{ RELEASE_VERSION }}.tar.gz.asc">signature</a> & <a href="{{ DIST_URL }}KEYS">keys</a></li>
+        </ul>
+        <p>
+            <a href="https://www.apache.org/info/verification.html">Instructions for how to verify a download using these files.</a>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div id="latest" class="row pad-vert-xl parallax" style="background-position: 0px 0px;">
+  <div class="col-16 no-float auto-margin">
+    <div class="row">
+      <h3 class="text-center">More about Allura</h3>
+      <div class="text-center row text-white">
+          <p class="pad-md">
+            See the <a href="{{ SITEURL }}/">Allura homepage</a> for latest news, instructions, and project information.
+          </p>
+          <p>
+              <a href="http://archive.apache.org/dist/allura/">Archive of older releases</a>
+          </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-8">
+    <div class="row">
+      <div class="col-12 no-float auto-margin">
+      </div>
+      <div class="col-12 no-float auto-margin">
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div id="apache" class="row bg-orange pad-vert-xl">
+  <div class="col-20 no-float auto-margin">
+    <div class="row">
+      <h3 class="text-center">Apache Software Foundation</h3>
+    </div>
+
+    <div class="row">
+      <img class="auto-margin pad-vert-md" src="theme/img/logo-asf-apache.png" alt="apache software foundation logo">
+    </div>
+
+    <div class="row auto-margin button-container">
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/licenses/"><button class="auto-margin">License</button></a>
+      </div>
+
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/foundation/sponsorship.html"><button class="auto-margin">Sponsorship</button></a>
+      </div>
+
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/foundation/thanks.html"><button class="auto-margin">Thanks</button></a>
+      </div>
+    </div>
+    <div class="row auto-margin button-container">
+      <div class="col-12 pad-vert-sm">
+        <a href="http://www.apache.org/security/"><button class="auto-margin">Security</button></a>
+      </div>
+
+      <div class="col-12 pad-vert-sm">
+        <a href="http://www.apache.org/"><button class="auto-margin">Apache™</button></a>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock content %}
diff --git a/_src/allura-theme/templates/index.html b/_src/allura-theme/templates/index.html
index 3c35c99..0cb890a 100644
--- a/_src/allura-theme/templates/index.html
+++ b/_src/allura-theme/templates/index.html
@@ -45,15 +45,11 @@
       <h3 class="text-center">Get the Latest Version of Allura</h3>
       <div class="row pad-vert-md">
         <div id="release" class="col-12 auto-margin pad-vert-xs text-center">
-          <a href="https://www.apache.org/dyn/closer.cgi/allura/allura-{{ RELEASE_VERSION }}.tar.gz"><button class="auto-margin">Download v{{ RELEASE_VERSION }}</button></a>
+          <a href="{{ SITEURL }}/download.html"><button class="auto-margin">Download v{{ RELEASE_VERSION }}</button></a>
           <span class="text-white">{{ RELEASE_DATE }} &mdash;</span>
           {% if RELEASE_NEWS %}
           <a href="{{ RELEASE_NEWS }}">What's New</a>
           {% endif %}
-          <ul>
-            <li class="text-white"><a href="{{ DIST_URL }}allura-{{ RELEASE_VERSION }}.tar.gz.sha512" class="text-white" download="">sha512 sum</a></li>
-            <li class="text-white">PGP <a href="{{ DIST_URL }}allura-{{ RELEASE_VERSION }}.tar.gz.asc" class="text-white" download="">signature</a> &amp; <a href="{{ DIST_URL }}KEYS" class="text-white" download="">keys</a></li>
-          </ul>
         </div>
         <div id="news" class="col-12 auto-margin pad-vert-xs text-center">
             <h5>News</h5>
diff --git a/_src/pelicanconf.py b/_src/pelicanconf.py
index 5833833..bdb1639 100644
--- a/_src/pelicanconf.py
+++ b/_src/pelicanconf.py
@@ -29,7 +29,7 @@ EXTRA_PATH_METADATA = {
     'extra/favicon.ico': {'path': 'favicon.ico'},
     'extra/.htaccess': {'path': '.htaccess'},
 }
-DIRECT_TEMPLATES = ['index', '404', 'news']
+DIRECT_TEMPLATES = ['index', '404', 'news', 'download']
 
 ARTICLE_SAVE_AS = 'posts/{date:%Y}-{slug}.html'
 ARTICLE_URL = 'posts/{date:%Y}-{slug}.html'
diff --git a/download.html b/download.html
new file mode 100644
index 0000000..8e66e08
--- /dev/null
+++ b/download.html
@@ -0,0 +1,164 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <title>Apache Allura</title>
+  <meta charset="utf-8">
+  <meta name="description" content="Allura is an open source implementation of a software forge, a site that manages source code repositories, bug reports, discussions, and more for projects.">
+  <meta name="keywords" content="">
+  <meta name="author" content="">
+  <link rel="canonical" href="//allura.apache.org">
+
+  <!--    Facebook Meta Info-->
+  <meta property="og:url" content="//allura.apache.org">
+  <meta property="og:image" content="//allura.apache.org/theme/img/logo-asf-apache.png">
+  <meta property="og:description" content="Allura is an open source implementation of a software forge, a site that manages source code repositories, bug reports, discussions, and more for projects.">
+  <meta property="og:title" content="Apache Allura">
+  <meta property="og:site_name" content="Apache Allura">
+  <meta property="og:see_also" content="//allura.apache.org">
+
+  <!--    Twitter Meta Info-->
+  <meta name="twitter:card" content="Allura is an open source implementation of a software forge, a site that manages source code repositories, bug reports, discussions, and more for projects.">
+  <meta name="twitter:url" content="//allura.apache.org">
+  <meta name="twitter:title" content="Apache Allura">
+  <meta name="twitter:description" content="Allura is an open source implementation of a software forge, a site that manages source code repositories, bug reports, discussions, and more for projects.">
+  <meta name="twitter:image" content="//allura.apache.org/theme/img/logo-asf-apache.png">
+
+  <!--    Google+ Meta Info-->
+  <meta itemprop="name" content="Apache Allura">
+  <meta itemprop="description" content="Allura is an open source implementation of a software forge, a site that manages source code repositories, bug reports, discussions, and more for projects.">
+  <meta itemprop="image" content="//allura.apache.org/theme/img/logo-asf-apache.png">
+
+  <link rel="stylesheet" type="text/css" href="//allura.apache.org/theme/css/flex.min.css">
+  <link rel="stylesheet" type="text/css" href="//allura.apache.org/theme/css/style.css">
+</head>
+
+<body cz-shortcut-listen="true" class="pg-download">
+  <section id="content_wrapper" class="mobile-desktop row">
+    <div id="header" class="row ">
+      <header id="login_header" class="row">
+        <div class="bg-shadow pad-vert-md">
+          <span><h1 class="text-center"><a href="//allura.apache.org">Apache <img src="//allura.apache.org/theme/img/logo_white.png" width="94"> Allura<span class="tm">™</span></a></h1></span>
+          <span></span>
+          <h6 class="text-center">Open source project hosting platform</h6>
+        </div>
+      </header>
+    </div>
+
+<div id="about" class="row bg-white pad-vert-xl">
+  <div class="row">
+    <h3 class="text-black text-center">Download Allura</h3>
+  </div>
+
+  <div class="row">
+    <div class="col-20 no-float auto-margin">
+      <div class="row">
+        <p class="pad-md">
+            <a href="https://www.apache.org/dyn/closer.cgi/allura/allura-1.11.1.tar.gz">Download Allura v1.11.1</a>.  This is the latest release of Apache Allura, released Jul 2019.
+              <a href="posts/2019-allura-1.11.1.html">Read what's new.</a>
+        </p>
+        <p>
+            Verify the download:
+        </p>
+        <ul>
+            <li><a href="https://apache.org/dist/allura/allura-1.11.1.tar.gz.sha512">SHA-512</a> checksum</li>
+            <li>PGP <a href="https://apache.org/dist/allura/allura-1.11.1.tar.gz.asc">signature</a> & <a href="https://apache.org/dist/allura/KEYS">keys</a></li>
+        </ul>
+        <p>
+            <a href="https://www.apache.org/info/verification.html">Instructions for how to verify a download using these files.</a>
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div id="latest" class="row pad-vert-xl parallax" style="background-position: 0px 0px;">
+  <div class="col-16 no-float auto-margin">
+    <div class="row">
+      <h3 class="text-center">More about Allura</h3>
+      <div class="text-center row text-white">
+          <p class="pad-md">
+            See the <a href="//allura.apache.org/">Allura homepage</a> for latest news, instructions, and project information.
+          </p>
+          <p>
+              <a href="http://archive.apache.org/dist/allura/">Archive of older releases</a>
+          </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="col-8">
+    <div class="row">
+      <div class="col-12 no-float auto-margin">
+      </div>
+      <div class="col-12 no-float auto-margin">
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<div id="apache" class="row bg-orange pad-vert-xl">
+  <div class="col-20 no-float auto-margin">
+    <div class="row">
+      <h3 class="text-center">Apache Software Foundation</h3>
+    </div>
+
+    <div class="row">
+      <img class="auto-margin pad-vert-md" src="theme/img/logo-asf-apache.png" alt="apache software foundation logo">
+    </div>
+
+    <div class="row auto-margin button-container">
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/licenses/"><button class="auto-margin">License</button></a>
+      </div>
+
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/foundation/sponsorship.html"><button class="auto-margin">Sponsorship</button></a>
+      </div>
+
+      <div class="col-8 pad-vert-sm">
+        <a href="http://www.apache.org/foundation/thanks.html"><button class="auto-margin">Thanks</button></a>
+      </div>
+    </div>
+    <div class="row auto-margin button-container">
+      <div class="col-12 pad-vert-sm">
+        <a href="http://www.apache.org/security/"><button class="auto-margin">Security</button></a>
+      </div>
+
+      <div class="col-12 pad-vert-sm">
+        <a href="http://www.apache.org/"><button class="auto-margin">Apache™</button></a>
+      </div>
+    </div>
+  </div>
+</div>
+
+    <div class="row">
+      <footer id="footer" class="bg-black text-white col-24">
+        <p class="copy pad-top-sm text-center">Copyright © 2019 The Apache Software Foundation, Licensed under
+            <a href="http://www.apache.org/licenses/LICENSE-2.0.html">the Apache License, Version 2.0.</a></p>
+        <p class="copy pad-bot-sm text-center">Apache, Allura, Apache Allura, and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      </footer>
+    </div>
+  </section>
+
+  <script type="application/javascript" src="//allura.apache.org/theme/js/jquery-1.11.2.min.js"></script>
+  <script type="application/javascript" src="//allura.apache.org/theme/js/frontend.js"></script>
+  <!-- Credits
+
+          Logo Design: Will Leonard
+          http://willleonard.org
+
+          Site design: Perry Merrity
+          http://perrymerrity.com/
+
+          bg-header-forge.jpg
+          Photo by: Stefan Schmitz
+          https://creativecommons.org/licenses/by-nd/2.0
+
+          bg-developers-fire.jpg
+          Photo by: Frédéric Bisson
+          https://creativecommons.org/licenses/by-nd/2.0
+      -->
+</body>
+</html>
\ No newline at end of file
diff --git a/index.html b/index.html
index 0e7cdc8..7cfa588 100644
--- a/index.html
+++ b/index.html
@@ -84,13 +84,9 @@
       <h3 class="text-center">Get the Latest Version of Allura</h3>
       <div class="row pad-vert-md">
         <div id="release" class="col-12 auto-margin pad-vert-xs text-center">
-          <a href="https://www.apache.org/dyn/closer.cgi/allura/allura-1.11.1.tar.gz"><button class="auto-margin">Download v1.11.1</button></a>
+          <a href="//allura.apache.org/download.html"><button class="auto-margin">Download v1.11.1</button></a>
           <span class="text-white">Jul 2019 &mdash;</span>
           <a href="posts/2019-allura-1.11.1.html">What's New</a>
-          <ul>
-            <li class="text-white"><a href="https://apache.org/dist/allura/allura-1.11.1.tar.gz.sha512" class="text-white" download="">sha512 sum</a></li>
-            <li class="text-white">PGP <a href="https://apache.org/dist/allura/allura-1.11.1.tar.gz.asc" class="text-white" download="">signature</a> &amp; <a href="https://apache.org/dist/allura/KEYS" class="text-white" download="">keys</a></li>
-          </ul>
         </div>
         <div id="news" class="col-12 auto-margin pad-vert-xs text-center">
             <h5>News</h5>
diff --git a/theme/css/style.css b/theme/css/style.css
index 27cfa90..5b518be 100644
--- a/theme/css/style.css
+++ b/theme/css/style.css
@@ -527,11 +527,16 @@ button:hover, button:focus, button:active {
     height: 320px;
 }
 
-#about p {
+#about p,
+#about ul {
     margin-left: auto;
     margin-right: auto;
     max-width: 800px;
 }
+#about ul li {
+    margin-left: 2em;
+    padding: 0.2em;
+}
 
 #latest {
     background-image: url('../img/bg-download-fire.jpg');