Restyle and update entire Guacamole website.

LICENSE

@@ -200,3 +200,39 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+==============================================================================
+
+APACHE GUACAMOLE WEBSITE SUBCOMPONENTS
+
+The Apache Guacamole website includes a number of subcomponents with separate
+copyright notices and license terms. Your use of these subcomponents is
+subject to the terms and conditions of the following licenses.
+
+
+Inconsolata (https://levien.com/type/myfonts/inconsolata.html)
+--------------------------------------------------------------
+
+    Version: N/A
+    From: 'The Inconsolata Project Authors'
+    License(s):
+        SIL Open Font (fonts/inconsolata/OFL.txt)
+
+
+Inter (https://rsms.me/inter/)
+------------------------------
+
+    Version: N/A
+    From: 'The Inter Project Authors' (https://github.com/rsms/inter)
+    License(s):
+        SIL Open Font (fonts/inter/OFL.txt)
+
+
+Rubik (https://github.com/googlefonts/Rubik)
+--------------------------------------------
+
+    Version: N/A
+    From: 'The Rubik Project Authors' (https://github.com/googlefonts/rubik)
+    License(s):
+        SIL Open Font (bundled/rubik/OFL.txt)
+

_config.yml

@@ -29,6 +29,10 @@ exclude:
     - content
     - doc
 
+# Minify output from SASS
+sass:
+  style: compressed
+
 # Custom collections
 collections:
 
@@ -37,7 +41,12 @@ collections:
         output: true
         permalink: /releases/:title/
 
-    # All Guacamole releases from prior to the Apache Incubator
+    # All Guacamole releases prior to graduation from the Apache Incubator
+    incubator-releases:
+        output: true
+        permalink: /releases/:title/
+
+    # All Guacamole releases from prior to entering the Apache Incubator
     legacy-releases:
         output: true
         permalink: /releases/:title/
@@ -50,6 +59,10 @@ collections:
     companies:
         output: false
 
+    # Pseudo-pages describing public mailing lists
+    mailing-lists:
+        output: false
+
     # Public security vulnerabilities
     security:
         output: false
@@ -62,6 +75,8 @@ defaults:
       values: { layout: legacy-release }
 
     # All other releases should use the "release" layout
+    - scope:  { type: incubator-releases }
+      values: { layout: release }
     - scope:  { type: releases }
       values: { layout: release }
 

_includes/cve-list.html

@@ -1,14 +1,18 @@
 {% if include.reports != empty %}
 {{ include.title }}
 -------------------
-<ul>
+<ul class="cve-list">
     {% for report in include.reports %}
         <li>
             <h3 id="{{ report.cve }}">
+                <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name={{ report.cve | url_encode }}">{{ report.cve }}</a>:
                 {{ report.title }}
-                (<a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name={{ report.cve | url_encode }}">{{ report.cve }}</a>)
             </h3>
+
             {{ report.content }}
+
+            <p>Acknowledgements: We would like to thank {{ report.reporters }} for reporting this issue.</p>
+
         </li>
     {% endfor %}
 </ul>

_includes/download-list.html

@@ -1,15 +1,21 @@
 {% if include.files != empty %}
     <table>
+        <tr>
+            <th>Filename</th>
+            <th>Signatures / Hashes</th>
+        </tr>
         {% assign filename_token = "{}" %}
         {% for file in include.files %}
             <tr>
                 {% assign filename = include.path | append: file %}
                 {% assign basename = file | split: "/" | last %}
-                <td><a href="{{ include.artifact-url | replace: filename_token, filename }}">{{ basename }}</a></td>
-                {% for checksum in include.checksum-suffixes %}
-                    {% assign checksum_filename = include.path | append:file | append: checksum[1] %}
-                    <td>[ <a href="{{ include.checksum-url | replace: filename_token, checksum_filename }}">{{ checksum[0] }}</a> ]</td>
-                {% endfor %}
+                <td class="filename"><a href="{{ include.artifact-url | replace: filename_token, filename }}">{{ basename }}</a></td>
+                <td class="signatures">
+                    {% for checksum in include.checksum-suffixes %}
+                        {% assign checksum_filename = include.path | append:file | append: checksum[1] %}
+                        <a href="{{ include.checksum-url | replace: filename_token, checksum_filename }}">{{ checksum[0] }}</a>
+                    {% endfor %}
+                </td>
             </tr>
         {% endfor %}
     </table>

_includes/footer.html

@@ -1,24 +1,21 @@
 <!-- Footer -->
 <div id="footer">
+    <div class="readable-content">
 
-    <!-- Copyrights -->
-    <p class="copyright">
-        Copyright &copy; 2020 <a href="http://www.apache.org/">The Apache
-            Software Foundation</a>, Licensed under the <a
-        href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
-        Version 2.0</a>. The HTML5 shield logo has been modified from the
-        original work of the <a
-            href="http://www.w3.org/">World Wide Web Constortium (W3C)</a>,
-        which is licensed under the <a
-            href="http://creativecommons.org/licenses/by/3.0/">Creative
-        Commons Attribution 3.0</a> license.
-    </p>
+        <!-- Copyrights -->
+        <p class="copyright">
+            Copyright &copy; 2020 <a href="http://www.apache.org/">The Apache
+                Software Foundation</a>, Licensed under the <a
+            href="http://www.apache.org/licenses/LICENSE-2.0">Apache License,
+            Version 2.0</a>.
+        </p>
 
-    <!-- Trademarks -->
-    <p class="trademarks">
-        Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
-        Apache Guacamole project logo are trademarks of The Apache Software
-        Foundation.
-    </p>
+        <!-- Trademarks -->
+        <p class="trademarks">
+            Apache Guacamole, Guacamole, Apache, the Apache feather logo, and the
+            Apache Guacamole project logo are trademarks of The Apache Software
+            Foundation.
+        </p>
 
+    </div>
 </div>

_includes/head.html

@@ -1,8 +1,7 @@
 <head>
-    <link rel="stylesheet" href="/styles/main.css?s={{
-        'styles/main.css' | checksum
-    }}">
-    <link rel="icon" type="image/png" href="/images/guacamole-logo-64.png"/>
+    <link rel="stylesheet" href="/styles/main.css?s={{ 'now' | date: '%s' }}">
+    <link rel="icon" type="image/svg+xml" href="/images/logos/guac-classic-logo.svg"/>
+    <link rel="icon" type="image/png" href="/images/logos/guac-classic-logo-64.png"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, target-densitydpi=device-dpi"/>
     <meta charset="UTF-8"/>
     <title>{{ site.title | escape }}{% if page.title %}: {{ page.title | escape }}{% endif %}</title>

_includes/header.html

@@ -1,7 +1,9 @@
 <!-- Header -->
 <div id="header">
-    <h1><a href="/">{{ site.title }}</a></h1>
-    <ul id="navigation" class="menu">
-        {% include nav-menu.html path="_links" %}
-    </ul>
+    <div class="readable-content">
+        <h1><a href="/">{{ site.title }}</a></h1>
+        <ul id="navigation" class="menu">
+            {% include nav-menu.html path="_links" %}
+        </ul>
+    </div>
 </div>

_includes/mailing-list-list.html

@@ -0,0 +1,32 @@
+{% for list in include.mailing-lists | sort: 'title' | sort: 'order', 'last' %}
+<h3 class="mailing-list-title">{{ list.title }}</h3>
+
+{{ list.content }}
+
+<table class="mailing-list-instructions">
+
+    <tr>
+        <th>Subscribing</th>
+        <td>Send a blank email to
+            <a class="email" href="mailto:{{ list.name }}[email protected]">{{ list.name }}[email protected]</a>.</td>
+    </tr>
+
+    {% unless list.read-only %}
+    <tr>
+        <th>Posting</th>
+        <td>Send an email to
+            <a class="email" href="mailto:{{ list.name }}@guacamole.apache.org">{{ list.name }}@guacamole.apache.org</a>.
+            <strong>Be sure to subscribe first.</strong></td>
+    </tr>
+    {% endunless %}
+
+    <tr>
+        <th>Unsubscribing</th>
+        <td>Send a blank email to
+            <a class="email" href="mailto:{{ list.name }}[email protected]">{{ list.name }}[email protected]</a>.</td>
+    </tr>
+
+</table>
+
+<p class="mailing-list-archive"><a href="https://lists.apache.org/list.html?{{ list.name }}@guacamole.apache.org">View Archives</a></p>
+{% endfor %}

_includes/release-list.html

@@ -0,0 +1,21 @@
+{% if include.releases != empty %}
+    <li class="{{ include.class }}">
+        <h3 class="release-section">{{ include.title }}</h3>
+        {% if include.description %}
+            <div class="release-section-description">{{ include.description }}</div>
+        {% endif %}
+    </li>
+    {% for release in include.releases %}
+        {% if release.title %}
+            <li class="{{ include.class }}">
+                <a class="release-version" href="{{ release.url | prepend: site.baseurl }}">
+                    <p class="release-tag">
+                        <span class="release-version">{{ release.title }}</span>
+                        <span class="release-date">{{ release.date | date: "%Y-%m-%d" }}</span>
+                    </p>
+                    <p class="release-summary">{{ release.summary }}</p>
+                </a>
+            </li>
+        {% endif %}
+    {% endfor %}
+{% endif %}

_layouts/default.html

@@ -3,15 +3,15 @@
 
     {% include head.html %}
 
-    <body>
+    <body class="{{ page.class }}">
 
         {% include header.html %}
 
+        <h1 class="title">{{ page.title }}</h1>
+
         <!-- Content -->
-        <div id="page">
-            <div id="content">
-                {{ content }}
-            </div>
+        <div class="readable-content">
+            {{ content }}
         </div>
 
         {% include footer.html %}

_layouts/fullwidth.html

@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+    {% include head.html %}
+
+    <body class="{{ page.class }}">
+
+        {% include header.html %}
+
+        <!-- Content -->
+        <div class="fullwidth-content">
+            {{ content }}
+        </div>
+
+        {% include footer.html %}
+
+        <!-- jQuery -->
+        <script src="/scripts/jquery.min.js" type="text/javascript"></script>
+
+        <!-- Dropdown toggle -->
+        <script src="/scripts/dropdown.js" type="text/javascript"></script>
+
+    </body>
+</html>

_layouts/legacy-release.html

@@ -1,43 +1,51 @@
 ---
-layout: default
+layout: fullwidth
 permalink: /release/release-notes-:title
 ---
 
-{% assign latest = site.releases | where: 'released', 'true' | sort: 'date'  | last %}
-<div class="legacy-release-note">
-    <p><strong>The release below is from prior to Guacamole's acceptance into
-        the Apache Incubator.</strong> It is not an Apache Software Foundation
-        release, and is licensed under the <a
-     href="https://opensource.org/licenses/MIT">MIT license</a>. The latest
-     release of Apache Guacamole is <a href="{{ latest.url }}">{{
-         latest.title }}</a>.</p>
-</div>
+<h1 class="title">
+    Guacamole {{ page.title }}
+    <span class="release-type">
+        (Legacy)
+    </span>
+</h1>
 
-<div id="links">
+<div class="readable-content">
 
-    <!-- Compatible extensions -->
-    {% include legacy-download-list.html
-        title="Compatible extensions"
-        entries=page.extensions %}
+    {% assign latest = site.releases | where: 'released', 'true' | sort: 'date'  | last %}
+    <div class="note">
+        <p><strong>The release below is from prior to Guacamole's acceptance into
+            the Apache Incubator.</strong> It is not an Apache Software Foundation
+            release, and is licensed under the <a
+         href="https://opensource.org/licenses/MIT">MIT license</a>. The latest
+         release of Apache Guacamole is <a href="{{ latest.url }}">{{
+             latest.title }}</a>.</p>
+    </div>
 
-    <!-- Binary .war -->
-    {% include legacy-download-list.html
-        title="Web application (.war)"
-        entries=page.binary-war %}
+    <div id="links">
 
-    <!-- Source archives -->
-    {% include legacy-download-list.html
-        title="Source"
-        entries=page.source-archives %}
+        <!-- Compatible extensions -->
+        {% include legacy-download-list.html
+            title="Compatible extensions"
+            entries=page.extensions %}
 
-    <!-- Documentation -->
-    {% include link-list.html
-        title="Release documentation"
-        entries=page.documentation %}
+        <!-- Binary .war -->
+        {% include legacy-download-list.html
+            title="Web application (.war)"
+            entries=page.binary-war %}
 
-</div>
+        <!-- Source archives -->
+        {% include legacy-download-list.html
+            title="Source"
+            entries=page.source-archives %}
 
-<h1>Guacamole {{ page.title }}</h1>
+        <!-- Documentation -->
+        {% include link-list.html
+            title="Release documentation"
+            entries=page.documentation %}
 
-{{ content }}
+    </div>
 
+    {{ content }}
+
+</div>

_layouts/page.html

@@ -2,7 +2,5 @@
 layout: default
 ---
 
-<h1>{{ page.title }}</h1>
-
 {{ content }}