You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by do...@apache.org on 2023/09/15 12:51:02 UTC
[accumulo-website] branch main updated: Upgrade bootstrap version from 3 to 5 (#398)
This is an automated email from the ASF dual-hosted git repository.
domgarguilo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/main by this push:
new 6c8de391 Upgrade bootstrap version from 3 to 5 (#398)
6c8de391 is described below
commit 6c8de3914c05ba065cb924fd76d0cce83dc13a52
Author: Dom G <do...@apache.org>
AuthorDate: Fri Sep 15 08:50:56 2023 -0400
Upgrade bootstrap version from 3 to 5 (#398)
---
_docs-2/administration/monitoring-metrics.md | 8 +--
_docs-2/getting-started/features.md | 4 +-
_includes/nav.html | 94 ++++++++++++++--------------
_includes/scripts.html | 4 +-
_layouts/default.html | 8 +--
_layouts/docs-2.html | 49 +++++++--------
_layouts/release.html | 24 +++----
css/accumulo.scss | 27 ++++----
index.html | 10 +--
pages/contact-us.md | 8 +--
pages/downloads.md | 53 ++++++++--------
pages/release.md | 8 +--
pages/search.md | 4 +-
13 files changed, 149 insertions(+), 152 deletions(-)
diff --git a/_docs-2/administration/monitoring-metrics.md b/_docs-2/administration/monitoring-metrics.md
index 96a08452..c8f63dd6 100644
--- a/_docs-2/administration/monitoring-metrics.md
+++ b/_docs-2/administration/monitoring-metrics.md
@@ -17,8 +17,8 @@ The monitor can be viewed at:
The Overview page (shown below) contains some summary information about the Accumulo instance and graphs
displaying various metrics over time. These include ingest and scan performance and other useful measurements.
-<a class="thumbnail" href="{{ site.baseurl }}/images/accumulo-monitor-1.png">
-<img src="{{ site.baseurl }}/images/accumulo-monitor-1.png" alt="monitor overview"/>
+<a class="p-3 border rounded d-block" href="{{ site.baseurl }}/images/accumulo-monitor-1.png">
+<img src="{{ site.baseurl }}/images/accumulo-monitor-1.png" class="img-fluid rounded" alt="monitor overview"/>
</a>
The Manager Server, Tablet Servers, and Tables pages display metrics grouped in different ways (e.g. by tablet server or by table).
@@ -26,8 +26,8 @@ Metrics typically include number of entries (key/value pairs), ingest and query
The number of running scans, major and minor compactions are in the form _number_running_ (_number_queued_).
Another important metric is hold time, which is the amount of time a tablet has been waiting but unable to flush its memory in a minor compaction.
-<a class="thumbnail" href="{{ site.baseurl }}/images/accumulo-monitor-2.png">
-<img src="{{ site.baseurl }}/images/accumulo-monitor-2.png" alt="monitor manager"/>
+<a class="p-3 border rounded d-block" href="{{ site.baseurl }}/images/accumulo-monitor-2.png">
+<img src="{{ site.baseurl }}/images/accumulo-monitor-2.png" class="img-fluid rounded" alt="monitor manager"/>
</a>
The Server Activity page graphically displays tablet server status, with each server represented as a circle or square.
diff --git a/_docs-2/getting-started/features.md b/_docs-2/getting-started/features.md
index d3c099b8..2d810765 100644
--- a/_docs-2/getting-started/features.md
+++ b/_docs-2/getting-started/features.md
@@ -314,8 +314,8 @@ performance. It displays table sizes, ingest and query statistics, server
load, and last-update information. It also allows the user to view recent
diagnostic logs and traces.
-<a class="thumbnail" href="/images/accumulo-monitor-1.png">
-<img src="/images/accumulo-monitor-1.png" alt="monitor overview"/>
+<a class="p-3 border rounded d-block" href="/images/accumulo-monitor-1.png">
+<img src="/images/accumulo-monitor-1.png" class="img-fluid rounded" alt="monitor overview"/>
</a>
### Tracing
diff --git a/_includes/nav.html b/_includes/nav.html
index dd6d4d90..05bea5a2 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,64 +1,62 @@
-<nav class="navbar navbar-default navbar-fixed-top">
+<nav class="navbar navbar-expand-lg navbar-light fixed-top bg-light">
<div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-items">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a href="{{ site.baseurl }}/"><img id="nav-logo" alt="Apache Accumulo" class="img-responsive" src="{{ site.baseurl }}/images/accumulo-logo.png" width="200"
- /></a>
- </div>
+ <a class="navbar-brand" href="{{ site.baseurl }}/">
+ <img alt="Apache Accumulo" id="nav-logo" src="{{ site.baseurl }}/images/accumulo-logo.png" width="200">
+ </a>
+ <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-items">
+ <span class="navbar-toggler-icon"></span>
+ </button>
<div class="collapse navbar-collapse" id="navbar-items">
- <ul class="nav navbar-nav">
- <li class="nav-link"><a href="{{ site.baseurl }}/downloads">Download</a></li>
- <li class="nav-link"><a href="{{ site.baseurl }}/tour">Tour</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">Releases<span class="caret"></span></a>
+ <ul class="navbar-nav me-auto">
+ <li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/downloads">Download</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/tour">Tour</a></li>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Releases</a>
<ul class="dropdown-menu">
- <li><a href="{{ site.baseurl }}/release/accumulo-3.0.0/">3.0.0 (Latest non-LTM)</a></li>
- <li><a href="{{ site.baseurl }}/release/accumulo-2.1.2/">2.1.2 (Latest LTM)</a></li>
- <li><a href="{{ site.baseurl }}/release/accumulo-1.10.3/">1.10.3 (Legacy LTM)</a></li>
- <li><a href="{{ site.baseurl }}/release/">Archive</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-3.0.0/">3.0.0 (Latest non-LTM)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-2.1.2/">2.1.2 (Latest LTM)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/release/accumulo-1.10.3/">1.10.3 (Legacy LTM)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/release/">Archive</a></li>
</ul>
</li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation<span class="caret"></span></a>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Documentation</a>
<ul class="dropdown-menu">
- <li><a href="{{ site.docs_baseurl }}">User Manual (2.x)</a></li>
- <li><a href="{{ site.baseurl }}/docs/2.x/apidocs">Javadocs (2.x)</a></li>
- <li><a href="{{ site.baseurl }}/api">Public API</a></li>
- <li><a href="{{ site.baseurl }}/quickstart-1.x">Quickstart (1.x)</a></li>
- <li><a href="{{ site.baseurl }}/accumulo2-maven-plugin">Accumulo Maven Plugin</a></li>
- <li><a href="{{ site.baseurl }}/1.10/accumulo_user_manual.html">User Manual (1.10)</a></li>
- <li><a href="{{ site.baseurl }}/1.10/apidocs">Javadocs (1.10)</a></li>
- <li><a href="{{ site.baseurl }}/external-docs">External Docs</a></li>
- <li><a href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
+ <li><a class="dropdown-item" href="{{ site.docs_baseurl }}">User Manual (2.x)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/docs/2.x/apidocs">Javadocs (2.x)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/api">Public API</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/quickstart-1.x">Quickstart (1.x)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/accumulo2-maven-plugin">Accumulo Maven Plugin</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/1.10/accumulo_user_manual.html">User Manual (1.10)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/1.10/apidocs">Javadocs (1.10)</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/external-docs">External Docs</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/docs-archive/">Archive</a></li>
</ul>
</li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">Community<span class="caret"></span></a>
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">Community</a>
<ul class="dropdown-menu">
- <li><a href="{{ site.baseurl }}/contact-us">Contact Us</a></li>
- <li><a href="{{ site.baseurl }}/how-to-contribute">How To Contribute</a></li>
- <li><a href="{{ site.baseurl }}/people">People</a></li>
- <li><a href="{{ site.baseurl }}/related-projects">Related Projects</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/contact-us">Contact Us</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/how-to-contribute">How To Contribute</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/people">People</a></li>
+ <li><a class="dropdown-item" href="{{ site.baseurl }}/related-projects">Related Projects</a></li>
</ul>
</li>
- <li class="nav-link"><a href="{{ site.baseurl }}/search">Search</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{ site.baseurl }}/search">Search</a></li>
</ul>
- <ul class="nav navbar-nav navbar-right">
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#"><img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/><span class="caret"></span></a>
+ <ul class="navbar-nav ms-auto">
+ <li class="nav-item dropdown">
+ <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown">
+ <img alt="Apache Software Foundation" src="https://www.apache.org/foundation/press/kit/feather.svg" width="15"/>
+ </a>
<ul class="dropdown-menu">
- <li><a href="https://www.apache.org">Apache Homepage <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/licenses/">License <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/security">Security <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/foundation/thanks">Thanks <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <i class="fa-solid fa-up-right-from-square"></i></a></li>
- <li><a href="https://www.apache.org/events/current-event.html">Current Event <i class="fa-solid fa-up-right-from-square"></i></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org">Apache Homepage <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/licenses/">License <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/foundation/sponsorship">Sponsorship <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/security">Security <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/foundation/thanks">Thanks <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/foundation/policies/conduct">Code of Conduct <span class="fa-solid fa-up-right-from-square"></span></a></li>
+ <li><a class="dropdown-item" href="https://www.apache.org/events/current-event.html">Current Event <span class="fa-solid fa-up-right-from-square"></span></a></li>
</ul>
</li>
</ul>
diff --git a/_includes/scripts.html b/_includes/scripts.html
index 1f832645..8a3db891 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -9,11 +9,11 @@
$(function() {
// decorate section headers with anchors
- return $("h2, h3, h4, h5, h6").each(function(i, el) {
+ return $("h2, h3, h4, h5, h6").not(".accordion-header").each(function(i, el) {
var $el, icon, id;
$el = $(el);
id = $el.attr('id');
- icon = '<i class="fa-solid fa-link"></i>';
+ icon = '<span class="fa-solid fa-link"></span>';
if (id) {
return $el.append($("<a />").addClass("header-link").attr("href", "#" + id).html(icon));
}
diff --git a/_layouts/default.html b/_layouts/default.html
index d1c56388..b794fca1 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -20,16 +20,16 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.7/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-awusxf8AUojygHf2+joICySzB780jVvQaVCAt1clU3QsyAitLGul28Qxb2r1e5g+" crossorigin="anonymous">
+<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/dt-1.13.6/datatables.min.css">
+<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.css">
<link href="{{ site.baseurl }}/css/accumulo.css" rel="stylesheet" type="text/css">
<title>{% if page.title_prefix %}{{ page.title_prefix | escape }}{% endif %}{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
-<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/v/bs/dt-1.13.6/datatables.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/v/bs5/dt-1.13.6/datatables.min.js"></script>
<script type="text/javascript" src="https://www.apachecon.com/event-images/snippet.js"></script>
{% include scripts.html %}
</head>
diff --git a/_layouts/docs-2.html b/_layouts/docs-2.html
index 7bacee2c..5260a802 100644
--- a/_layouts/docs-2.html
+++ b/_layouts/docs-2.html
@@ -5,51 +5,50 @@ skiph1fortitle: true
<div class="row">
<div class="col-md-3">
- <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true" data-spy="affix">
- <div class="panel panel-default">
+ <div class="accordion sticky-top" id="myAccordion" style="top: 100px;">
{% assign mydocs = site.docs-2 | group_by: 'category' %}
{% assign categories = "getting-started,development,security,configuration,administration,troubleshooting" | split: "," %}
{% for pcat in categories %}
{% for dcat in mydocs %}
{% if pcat == dcat.name %}
- <div class="panel-heading" role="tab" id="headingOne">
- <h4 class="panel-title">
- <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse{{ pcat }}" aria-expanded="{% if pcat == page.category %}true{% else %}false{% endif %}" aria-controls="collapse{{ pcat }}">
+ <div class="accordion-item">
+ <div class="accordion-header fs-5 fw-bold" id="heading{{ pcat }}">
+ <button class="accordion-button {% if pcat != page.category %}collapsed{% endif %}" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ pcat }}" aria-expanded="{% if pcat == page.category %}true{% else %}false{% endif %}" aria-controls="collapse{{ pcat }}">
{{ pcat | capitalize | replace: "-", " " }}
- </a>
- </h4>
- </div>
- <div id="collapse{{pcat}}" class="panel-collapse collapse{% if pcat == page.category %} in{% endif %}" role="tabpanel" aria-labelledby="headingOne">
- <div class="panel-body">
- {% assign items = dcat.items | sort: 'order' %}
- {% for item in items %}
- <div class="row doc-sidebar-link{% if page.title == item.title %} doc-sidebar-selected{% endif %}"><a href="{{ item.url }}">{{ item.title }} </a></div>
- {% endfor %}
+ </button>
+ </div>
+ <div id="collapse{{pcat}}" class="accordion-collapse collapse{% if pcat == page.category %} show{% endif %}" aria-labelledby="heading{{ pcat }}" data-bs-parent="#myAccordion">
+ <div class="accordion-body">
+ {% assign items = dcat.items | sort: 'order' %}
+ {% for item in items %}
+ <div class="row{% if page.title == item.title %} selected{% endif %}"><a href="{{ item.url }}">{{ item.title }}</a></div>
+ {% endfor %}
+ </div>
</div>
</div>
{% endif %}
{% endfor %}
{% endfor %}
- </div>
</div>
</div>
<div class="col-md-9">
{% if page.category %}
- <p>Accumulo {{ page.version }} Documentation >> {{ page.category | capitalize | replace: "-", " " }} >> {{ page.title }}</p>
+ <p>Accumulo {{ page.version }} Documentation >> {{ page.category | capitalize | replace: "-", " " }} >> {{ page.title }}</p>
{% endif %}
-
{% unless page.skip_doc_h1 %}
- <div class="row">
- <div class="col-md-10"><h1>{{ page.title }}</h1></div>
- <div class="col-md-2"><a class="pull-right" style="margin-top: 25px;" href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+ <div class="row mt-4">
+ <div class="col-md-12 d-flex justify-content-between">
+ <h1>{{ page.title }}</h1>
+ <a href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><span class="fa-solid fa-pen-to-square"></span> <small>Edit this page</small></a>
+ </div>
</div>
{% endunless %}
-
{{ content }}
-
- <div class="row" style="margin-top: 20px;">
- <div class="col-md-10"><strong>Find documentation for all releases in the <a href="{{ site.baseurl }}/docs-archive">archive</strong></div>
- <div class="col-md-2"><a class="pull-right" href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><i class="glyphicon glyphicon-pencil"></i> <small>Edit this page</small></a></div>
+ <div class="row mt-4">
+ <div class="col-md-12 d-flex justify-content-between">
+ <strong>Find documentation for all releases in the <a href="{{ site.baseurl }}/docs-archive">archive</strong>
+ <a href="https://github.com/apache/accumulo-website/edit/main/{{ page.path }}" role="button"><span class="fa-solid fa-pen-to-square"></span> <small>Edit this page</small></a>
+ </div>
</div>
</div>
</div>
diff --git a/_layouts/release.html b/_layouts/release.html
index d177d4c4..60ae05fb 100644
--- a/_layouts/release.html
+++ b/_layouts/release.html
@@ -8,43 +8,43 @@ layout: default
{% assign nextIndex = forloop.index0 | plus: 1 %}{% assign releaseNext = all_releases[nextIndex] %}
{% capture prevPage %}
{% if forloop.last or forloop.first != true %}
- <li class="previous"><a href="{{ site.baseurl }}{{ releasePrev.url }}">« {{ releasePrev.title }}</a></li>
+ <li class="page-item"><a class="page-link" href="{{ site.baseurl }}{{ releasePrev.url }}">« {{ releasePrev.title }}</a></li>
{% endif %}
{% endcapture %}
{% capture nextPage %}
{% if forloop.first or forloop.last != true %}
- <li class="next"><a href="{{ site.baseurl }}{{ releaseNext.url }}">{{ releaseNext.title }} »</a></li>
+ <li class="page-item"><a class="page-link" href="{{ site.baseurl }}{{ releaseNext.url }}">{{ releaseNext.title }} »</a></li>
{% endif %}
{% endcapture %}
{% endif %}
{% endfor %}
<p>{{ page.date | date_to_string }}</p>
-<nav aria-label="Navigate Release Notes"><ul class="pager">{{ prevPage }}{{ nextPage }}</ul></nav>
+<nav aria-label="Navigate Release Notes"><ul class="pagination d-flex justify-content-between">{{ prevPage }}{{ nextPage }}</ul></nav>
{% if page.draft %}
<div class="alert alert-danger" style="margin-bottom: 0px;" role="alert">
- <p>These are <strong>draft</strong> release notes for a future release of Accumulo!</p>
- <p>Please view <a class="alert-link" href="{{ site.baseurl }}/release/accumulo-{{ site.latest_release }}/">the latest release notes</a>.</p>
+ These are <strong>draft</strong> release notes for a future release of Accumulo!<br>
+ Please view <a class="alert-link" href="{{ site.baseurl }}/release/accumulo-{{ site.latest_release }}/">the latest release notes</a>.
</div>
{% endif %}
{% if page.archived_critical %}
<div class="alert alert-danger" role="alert">
- <p><strong>WARNING:</strong> This version of Accumulo has critical bugs fixed in newer versions.</p>
- <p>Please check <a class="alert-link" href="{{ site.baseurl }}/release/">our release archive</a> for a newer version.</p>
+ <strong>WARNING:</strong> This version of Accumulo has critical bugs fixed in newer versions.<br>
+ Please check <a class="alert-link" href="{{ site.baseurl }}/release/">our release archive</a> for a newer version.
</div>
{% elsif page.archived %}
<div class="alert alert-warning" role="alert">
- <p>This version of Accumulo has been superceded by a newer version.</p>
- <p>Please check <a class="alert-link" href="{{ site.baseurl }}/release/">our release archive</a> for a newer version.</p>
+ This version of Accumulo has been superceded by a newer version.<br>
+ Please check <a class="alert-link" href="{{ site.baseurl }}/release/">our release archive</a> for a newer version.
</div>
{% elsif page.LTM %}
<div class="alert alert-success" role="alert">
- <p>This version is a current <strong><a class="alert-link" href="{{ site.baseurl }}/contributor/versioning#LTM">Long Term Maintenance (LTM)</a></strong> release.</p>
+ This version is a current <strong><a class="alert-link" href="{{ site.baseurl }}/contributor/versioning#LTM">Long Term Maintenance (LTM)</a></strong> release.
</div>
{% else %}
<div class="alert alert-warning" role="alert">
- <p>This version is not a <a class="alert-link" href="{{ site.baseurl }}/contributor/versioning#LTM">Long Term Maintenance (non-LTM)</a></strong> release.</p>
+ This version is not a <a class="alert-link" href="{{ site.baseurl }}/contributor/versioning#LTM">Long Term Maintenance (non-LTM)</a></strong> release.
</div>
{% endif %}
@@ -53,4 +53,4 @@ layout: default
<hr>
<p><strong>View all releases in the <a href="{{ site.baseurl }}/release/">archive</a></strong></p>
-<nav aria-label="Navigate Release Notes"><ul class="pager">{{ prevPage }}{{ nextPage }}</ul></nav>
+<nav aria-label="Navigate Release Notes"><ul class="pagination d-flex justify-content-between">{{ prevPage }}{{ nextPage }}</ul></nav>
diff --git a/css/accumulo.scss b/css/accumulo.scss
index 2ab3d187..850ef678 100644
--- a/css/accumulo.scss
+++ b/css/accumulo.scss
@@ -41,6 +41,14 @@ body {
font-size: 14px;
}
+pre {
+ padding: 11px;
+ margin: 0 0 11.5px;
+ line-height: 1.846;
+ border: 1px solid #cccccc;
+ border-radius: 3px;
+}
+
pre code {
font-size: 14px;
/* override nowrap in bootstrap */
@@ -58,10 +66,6 @@ code {
padding-left: 10px;
}
-.nav-link, li.dropdown {
- padding-top: 5px;
-}
-
#home-description {
font-size: 17px;
}
@@ -83,6 +87,7 @@ code {
#sociallinks td {
/* no lines in the link table */
border-top: none;
+ border-bottom: none;
}
#bannertext {
@@ -149,13 +154,7 @@ footer > p {
height: 70px
}
-.doc-sidebar-link {
- font-size: 13px;
- margin-bottom: 5px;
- margin-left: 0px;
-}
-
-.doc-sidebar-selected {
+.selected {
font-weight: bold;
}
@@ -182,7 +181,7 @@ h1[id]::before, h2[id]::before, h3[id]::before, h4[id]::before, h5[id]::before,
display: block;
content: " ";
margin-top: -80px;
- height: 80px;
+ height: 100px;
visibility: hidden;
}
@@ -220,7 +219,7 @@ a.prop {
}
.navbar-nav {
float: none!important;
- margin: 7.5px -15px;
+ margin: 7.5px;
}
.navbar-nav>li {
float: none;
@@ -233,7 +232,7 @@ a.prop {
float: none;
margin: 15px 0;
}
- .navbar-collapse.collapse.in {
+ .navbar-collapse.collapse.show {
display: block!important;
}
.collapsing {
diff --git a/index.html b/index.html
index b88929e2..d5d58817 100644
--- a/index.html
+++ b/index.html
@@ -4,10 +4,10 @@ skiph1fortitle: true
---
<div class="row">
<div class="col-md-8">
- <div class="jumbotron" style="text-align: center">
+ <div class="bg-light p-5 rounded mb-4" style="text-align: center">
<h3>Apache Accumulo® is a sorted, distributed key/value store that provides robust, scalable data storage and retrieval.</h3>
- <a style="margin-right: 20px" class="btn btn-success" href="downloads/" role="button"><i class="fa-solid fa-download fa-lg"></i> Download</a>
- <a class="btn btn-primary" href="https://github.com/apache/accumulo" role="button"><i class="fa-brands fa-github fa-lg"></i> GitHub</a>
+ <a style="margin-right: 20px" class="btn btn-success" href="downloads/" role="button"><span class="fa-solid fa-download fa-lg"></span> Download</a>
+ <a class="btn btn-primary" href="https://github.com/apache/accumulo" role="button"><span class="fa-brands fa-github fa-lg"></span> GitHub</a>
</div>
<p id="home-description">With Apache Accumulo, users can store and manage large data sets across a cluster. Accumulo uses <a href="https://hadoop.apache.org">Apache Hadoop</a>'s HDFS to store its data and <a href="https://zookeeper.apache.org">Apache ZooKeeper</a> for consensus. While many users interact directly with Accumulo, several <a href="/related-projects">open source projects</a> use Accumulo as their underlying store.</p>
<p id="home-description">To learn more about Accumulo, take the <a href="/tour">Accumulo tour</a>, read the <a href="{{ site.docs_baseurl }}">user manual</a> and run the Accumulo <a href="https://github.com/apache/accumulo-examples">example code</a>. Feel free to <a href="/contact-us">contact us</a> if you have any questions.
@@ -37,7 +37,7 @@ skiph1fortitle: true
</div>
<div class="col-md-4" id="sidebar">
<div class="row">
- <div class="col-sm-12 panel panel-default">
+ <div class="col-sm-12 card mb-4">
<p style="font-size: 24px; margin-bottom: 0px;">Latest News</p>
{% assign visible_posts = site.posts | where:"draft",false %}
{% for post in visible_posts limit:site.num_home_posts %}
@@ -54,7 +54,7 @@ skiph1fortitle: true
</div>
</div>
<div class="row">
- <div class="col-sm-12 panel panel-default">
+ <div class="col-sm-12 card mb-4">
{% capture social-include %}{% include social.md %}{% endcapture %}{{ social-include | markdownify }}
</div>
</div>
diff --git a/pages/contact-us.md b/pages/contact-us.md
index f455de71..afc469ba 100644
--- a/pages/contact-us.md
+++ b/pages/contact-us.md
@@ -45,10 +45,10 @@ follow discussions as they happen.
{: .table }
| Name | Description | Read | Follow | Post |
|-------------------|--------------------------------------------------|------|--------|------|
-| **user** | General user questions, help, and announcements | [<span class="glyphicon glyphicon-search"/> Archive][U_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][U_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][U_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][U_P] |
-| **dev** | Contributor discussions and development activity | [<span class="glyphicon glyphicon-search"/> Archive][D_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][D_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][D_UN] | [<span class="glyphicon glyphicon-envelope"/> Post][D_P] |
-| **commits** | Code changes | [<span class="glyphicon glyphicon-search"/> Archive][C_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][C_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][C_UN] | |
-| **notifications** | Automated notifications (GitHub, etc.) | [<span class="glyphicon glyphicon-search"/> Archive][N_A] | [<span class="glyphicon glyphicon-plus"/> Subscribe][N_SU] [<span class="glyphicon glyphicon-remove"/> Unsubscribe][N_UN] | |
+| **user** | General user questions, help, and announcements | [<span class="fa-solid fa-magnifying-glass"></span> Archive][U_A] | [<span class="fa-solid fa-plus"></span> Subscribe][U_SU] [<span class="fa-solid fa-xmark"></span> Unsubscribe][U_UN] | [<span class="fa-solid fa-envelope"></span> Post][U_P] |
+| **dev** | Contributor discussions and development activity | [<span class="fa-solid fa-magnifying-glass"></span> Archive][D_A] | [<span class="fa-solid fa-plus"></span> Subscribe][D_SU] [<span class="fa-solid fa-xmark"></span> Unsubscribe][D_UN] | [<span class="fa-solid fa-envelope"></span> Post][D_P] |
+| **commits** | Code changes | [<span class="fa-solid fa-magnifying-glass"></span> Archive][C_A] | [<span class="fa-solid fa-plus"></span> Subscribe][C_SU] [<span class="fa-solid fa-xmark"></span> Unsubscribe][C_UN] | |
+| **notifications** | Automated notifications (GitHub, etc.) | [<span class="fa-solid fa-magnifying-glass"></span> Archive][N_A] | [<span class="fa-solid fa-plus"></span> Subscribe][N_SU] [<span class="fa-solid fa-xmark"></span> Unsubscribe][N_UN] | |
## Slack
diff --git a/pages/downloads.md b/pages/downloads.md
index cf753fdf..2d1ffd93 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -12,8 +12,8 @@ var updateLinks = function(mirror) {
};
var mirrorsCallback = function(json) {
- var htmlContent = '<div class="row"><div class="col-md-3"><h5>Select an Apache download mirror:</h5></div>' +
- '<div class="col-md-5"><select class="form-control" id="apache-mirror-select">';
+ var htmlContent = '<div class="row align-items-center mb-3"><div class="col-3"><h5>Select an Apache download mirror:</h5></div>' +
+ '<div class="col-5"><select class="form-select" id="apache-mirror-select">';
htmlContent += '<optgroup label="Preferred Mirror (based on location)">';
htmlContent += '<option selected="selected">' + json.preferred + '</option>';
htmlContent += '</optgroup>';
@@ -61,18 +61,18 @@ Be sure to [verify your downloads][VERIFY_PROCEDURES] using [these KEYS][GPG_KEY
{% assign closerLink = 'https://www.apache.org/dyn/closer.lua' %}
{% assign downloadsLink = 'https://downloads.apache.org' %}
-{% assign glyphSave = ' <span class="glyphicon glyphicon-cloud-download"></span>' %}
-{% assign glyphLock = ' <span class="glyphicon glyphicon-lock"></span>' %}
+{% assign glyphSave = ' <span class="fa-solid fa-cloud-arrow-down"></span>' %}
+{% assign glyphLock = ' <span class="fa-solid fa-lock"></span>' %}
{% assign srcbinArray = 'src bin' | split: ' ' %}
{% assign btnDownloadStyle = 'class="btn btn-primary" style="text-transform: none; font-family: monospace"' %}
-{% assign btnSigStyle = 'class="btn btn-default" style="font-family: monospace"' %}
-{% assign btnHashStyle = 'class="btn btn-default" style="font-family: monospace"' %}
-{% assign btnDocStyle = 'class="btn btn-default" style="text-transform: none; font-family: monospace; margin-bottom: 5px"' %}
+{% assign btnSigStyle = 'class="btn btn-outline-secondary" style="font-family: monospace"' %}
+{% assign btnHashStyle = 'class="btn btn-outline-secondary" style="font-family: monospace"' %}
+{% assign btnDocStyle = 'class="btn btn-secondary" style="text-transform: none; font-family: monospace; margin-bottom: 5px"' %}
## Current Releases
{% assign linkVers = '3.0.0' %}
-### {{linkVers}} **Latest**{: .label .label-primary} **non-LTM**{: .label .label-warning}
+### {{linkVers}} **Latest**{: .badge .bg-primary} **non-LTM**{: .badge .bg-warning}
{: #latest }
The {{linkVers}} release of Apache Accumulo® is the latest bleeding edge
@@ -85,16 +85,17 @@ available in a future update to this site.
{% for srcbin in srcbinArray %}
{% assign lnkFile = 'accumulo-' | append: linkVers | append: '-' | append: srcbin | append: '.tar.gz' %}
{% assign lnkSuffix = '/accumulo/' | append: linkVers | append: '/' | append: lnkFile %}
-<div class="row btn-group" style="margin-left: 20px; margin-bottom: 5px; display: block">
- <div class="col btn-group">
+<div class="d-flex flex-wrap justify-content-start align-items-start" style="margin-left: 20px; margin-bottom: 5px;">
+ <div class="btn-group me-2">
<a {{btnDownloadStyle}} href="{{closerLink}}{{lnkSuffix}}" link-suffix="{{lnkSuffix}}">{{lnkFile}}{{glyphSave}}</a>
- </div><div class="col btn-group">
+ </div>
+ <div class="btn-group">
<a {{btnSigStyle}} href="{{downloadsLink}}{{lnkSuffix}}.asc">ASC{{glyphLock}}</a>
<a {{btnHashStyle}} href="{{downloadsLink}}{{lnkSuffix}}.sha512">SHA{{glyphLock}}</a>
</div>
</div>
{% endfor %}
-<div class="row btn-group-sm" style="margin: 20px">
+<div class="btn-group-sm" style="margin: 20px;">
<a {{btnDocStyle}} href="{{site.baseurl}}/release/accumulo-{{linkVers}}">Release Notes</a>
<a {{btnDocStyle}} href="https://github.com/apache/accumulo/blob/rel/{{linkVers}}/README.md">README</a>
<a {{btnDocStyle}} href="{{site.baseurl}}/docs/2.x">Online Documentation</a>
@@ -104,7 +105,7 @@ available in a future update to this site.
{% assign linkVers = '2.1.2' %}
-### {{linkVers}} **Latest**{: .label .label-primary} **LTM**{: .label .label-success}
+### {{linkVers}} **Latest**{: .badge .bg-primary} **LTM**{: .badge .bg-success}
{: #latest }
The {{linkVers}} release of Apache Accumulo® is the latest release on the
@@ -114,16 +115,17 @@ enhancements, and more.
{% for srcbin in srcbinArray %}
{% assign lnkFile = 'accumulo-' | append: linkVers | append: '-' | append: srcbin | append: '.tar.gz' %}
{% assign lnkSuffix = '/accumulo/' | append: linkVers | append: '/' | append: lnkFile %}
-<div class="row btn-group" style="margin-left: 20px; margin-bottom: 5px; display: block">
- <div class="col btn-group">
+<div class="d-flex flex-wrap justify-content-start align-items-start" style="margin-left: 20px; margin-bottom: 5px;">
+ <div class="btn-group me-2">
<a {{btnDownloadStyle}} href="{{closerLink}}{{lnkSuffix}}" link-suffix="{{lnkSuffix}}">{{lnkFile}}{{glyphSave}}</a>
- </div><div class="col btn-group">
+ </div>
+ <div class="btn-group">
<a {{btnSigStyle}} href="{{downloadsLink}}{{lnkSuffix}}.asc">ASC{{glyphLock}}</a>
<a {{btnHashStyle}} href="{{downloadsLink}}{{lnkSuffix}}.sha512">SHA{{glyphLock}}</a>
</div>
</div>
{% endfor %}
-<div class="row btn-group-sm" style="margin: 20px">
+<div class="btn-group-sm" style="margin: 20px;">
<a {{btnDocStyle}} href="{{site.baseurl}}/release/accumulo-{{linkVers}}">Release Notes</a>
<a {{btnDocStyle}} href="https://github.com/apache/accumulo/blob/rel/{{linkVers}}/README.md">README</a>
<a {{btnDocStyle}} href="{{site.baseurl}}/docs/2.x">Online Documentation</a>
@@ -133,7 +135,7 @@ enhancements, and more.
{% assign linkVers = '1.10.3' %}
-### {{linkVers}} **Legacy**{: .label .label-default} **LTM**{: .label .label-success}
+### {{linkVers}} **Legacy**{: .badge .bg-secondary} **LTM**{: .badge .bg-success}
{: #legacy }
The most recent legacy (1.x) release of Apache Accumulo® is version
@@ -144,16 +146,17 @@ The 1.10 release series will reach end-of-life on **November 1, 2023**.
{% for srcbin in srcbinArray %}
{% assign lnkFile = 'accumulo-' | append: linkVers | append: '-' | append: srcbin | append: '.tar.gz' %}
{% assign lnkSuffix = '/accumulo/' | append: linkVers | append: '/' | append: lnkFile %}
-<div class="row btn-group" style="margin-left: 20px; margin-bottom: 5px; display: block">
- <div class="col btn-group">
+<div class="d-flex flex-wrap justify-content-start align-items-start" style="margin-left: 20px; margin-bottom: 5px;">
+ <div class="btn-group me-2">
<a {{btnDownloadStyle}} href="{{closerLink}}{{lnkSuffix}}" link-suffix="{{lnkSuffix}}">{{lnkFile}}{{glyphSave}}</a>
- </div><div class="col btn-group">
+ </div>
+ <div class="btn-group">
<a {{btnSigStyle}} href="{{downloadsLink}}{{lnkSuffix}}.asc">ASC{{glyphLock}}</a>
<a {{btnHashStyle}} href="{{downloadsLink}}{{lnkSuffix}}.sha512">SHA{{glyphLock}}</a>
</div>
</div>
{% endfor %}
-<div class="row btn-group-sm" style="margin: 20px">
+<div class="btn-group-sm" style="margin: 20px;">
<a {{btnDocStyle}} href="{{site.baseurl}}/release/accumulo-{{linkVers}}">Release Notes</a>
<a {{btnDocStyle}} href="https://github.com/apache/accumulo/blob/rel/{{linkVers}}/README.md">README</a>
<a {{btnDocStyle}} href="{{site.baseurl}}/1.10/accumulo_user_manual">User Manual</a>
@@ -162,12 +165,12 @@ The 1.10 release series will reach end-of-life on **November 1, 2023**.
</div>
-## <small><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></small> Legend
+## <small><span class="fa-solid fa-circle-info" aria-hidden="true"></span></small> Legend
{: #legend }
-**LTM**{: .label .label-success} / **non-LTM**{: .label .label-warning} indicates a [Long Term Maintenance][LTM] release or not
+**LTM**{: .badge .bg-success} / **non-LTM**{: .badge .bg-warning} indicates a [Long Term Maintenance][LTM] release or not
-**Latest**{: .label .label-primary} / **Legacy**{: .label .label-default} indicates the latest or previous generation
+**Latest**{: .badge .bg-primary} / **Legacy**{: .badge .bg-secondary} indicates the latest or previous generation
## Older releases
diff --git a/pages/release.md b/pages/release.md
index 3930ee1b..27995473 100644
--- a/pages/release.md
+++ b/pages/release.md
@@ -6,10 +6,10 @@ redirect_from:
- /release_notes.html
---
-{% assign archived_btn = '<span class="label label-default"><a style="color: #ffffff; text-decoration: none" href="https://archive.apache.org/dist/accumulo/">Archive</a></span>' %}
-{% assign draft_btn = '<span class="label label-danger"> DRAFT! </span>' %}
-{% assign ltm_btn = '<span class="label label-success"><a style="color: #ffffff; text-decoration: none" href="' | append: site.baseurl | append: '/contributor/versioning#LTM"> LTM </a></span>' %}
-{% assign nonltm_btn = '<span class="label label-warning"><a style="color: #ffffff; text-decoration: none" href="' | append: site.baseurl | append: '/contributor/versioning#LTM">non-LTM</a></span>' %}
+{% assign archived_btn = '<a href="https://archive.apache.org/dist/accumulo/"><span class="badge bg-secondary">Archive</span></a>' %}
+{% assign draft_btn = '<span class="badge bg-danger"> DRAFT! </span>' %}
+{% assign ltm_btn = '<a href="' | append: site.baseurl | append: '/contributor/versioning#LTM"><span class="badge bg-success"> LTM </span></a>' %}
+{% assign nonltm_btn = '<a href="' | append: site.baseurl | append: '/contributor/versioning#LTM"><span class="badge bg-warning">non-LTM</span></a>' %}
<div>
{% assign all_releases = site.categories.release | sort: 'date' | reverse %}
diff --git a/pages/search.md b/pages/search.md
index ed8608a9..41bd9515 100644
--- a/pages/search.md
+++ b/pages/search.md
@@ -10,9 +10,7 @@ Search results are limited to blog posts, release notes, and the 2.x documentati
<form action="get" id="site_search">
<div class="input-group">
<input class="form-control" type="text" id="search_box" placeholder="Search for...">
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit">Search</button>
- </span>
+ <button class="btn btn-secondary" type="submit">Search</button>
</div>
</form>
</div>