This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-site.git
The following commit(s) were added to refs/heads/main by this push:
new 87eacf2 Add Solr operator site (#11)
87eacf2 is described below
commit 87eacf2def1ca2d4af10ec1e3771d559567079c6
Author: Houston Putman <[email protected]>
AuthorDate: Thu Apr 29 17:53:35 2021 -0500
Add Solr operator site (#11)
---
README.md | 2 +-
content/doap/solr-operator.rdf | 12 +-
content/pages/operator/community.md | 66 +++++
content/pages/operator/downloads.md | 11 +
content/pages/operator/features.md | 4 +
content/pages/operator/index.md | 4 +
content/pages/operator/logos-and-assets.md | 4 +
content/pages/operator/news.md | 6 +
content/pages/operator/resources.md | 49 ++++
.../news/2021-01-14-solr-operator-donation.md | 25 ++
pelicanconf.py | 4 +
themes/solr/static/css/base.css | 5 +
themes/solr/static/css/{base.css => operator.css} | 37 +--
themes/solr/templates/_header.html | 3 +
themes/solr/templates/downloads.html | 2 +-
themes/solr/templates/operator/_css.html | 7 +
themes/solr/templates/operator/_footer.html | 58 ++++
themes/solr/templates/operator/_head.html | 25 ++
themes/solr/templates/{ => operator}/_header.html | 21 +-
themes/solr/templates/operator/base.html | 49 ++++
themes/solr/templates/operator/community.html | 13 +
themes/solr/templates/operator/downloads.html | 166 +++++++++++
themes/solr/templates/operator/features.html | 231 +++++++++++++++
themes/solr/templates/operator/fullwidth.html | 24 ++
themes/solr/templates/operator/index.html | 318 +++++++++++++++++++++
.../solr/templates/operator/logos-and-assets.html | 64 +++++
themes/solr/templates/operator/news.html | 32 +++
themes/solr/templates/operator/page.html | 11 +
themes/solr/templates/operator/resources.html | 10 +
themes/solr/templates/operator/subnav.html | 20 ++
30 files changed, 1247 insertions(+), 36 deletions(-)
diff --git a/README.md b/README.md
index 5813f99..7a05e04 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ For larger edits it is recommended to build and preview the
site locally. This l
# Usage: ./build.sh [-l] [<other pelican arguments>]
# -l Live build and reload source changes on localhost:8000
# --help Show full help for options that Pelican accepts
- ./build -l
+ ./build.sh -l
Now go to <http://localhost:8000> to view the beautiful Solr web page served
from your laptop with live-preview of updates :)
diff --git a/content/doap/solr-operator.rdf b/content/doap/solr-operator.rdf
index 009ff06..dcd7f1c 100644
--- a/content/doap/solr-operator.rdf
+++ b/content/doap/solr-operator.rdf
@@ -21,24 +21,24 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
- <Project rdf:about="https://github.com/apache/lucene-solr-operator">
+ <Project rdf:about="https://solr.apache.org/operator">
<created>2021-01-14</created>
<license rdf:resource="https://spdx.org/licenses/Apache-2.0" />
<name>Apache Solr Operator</name>
- <homepage rdf:resource="https://github.com/apache/lucene-solr-operator" />
+ <homepage rdf:resource="https://solr.apache.org/operator" />
<asfext:pmc rdf:resource="https://solr.apache.org" />
<shortdesc>Manages Solr resources in Kubernetes</shortdesc>
- <bug-database
rdf:resource="https://github.com/apache/lucene-solr-operator/issues" />
+ <bug-database
rdf:resource="https://github.com/apache/solr-operator/issues" />
<mailing-list
rdf:resource="https://solr.apache.org/community.html#mailing-lists-chat" />
- <download-page
rdf:resource="https://github.com/apache/lucene-solr-operator/releases" />
+ <download-page
rdf:resource="https://solr.apache.org/operator/downloads.html" />
<programming-language>Go</programming-language>
<category rdf:resource="https://projects.apache.org/category/cloud" />
<category rdf:resource="https://projects.apache.org/category/search"/>
<category rdf:resource="https://projects.apache.org/category/go"/>
<repository>
<GitRepository>
- <location
rdf:resource="https://gitbox.apache.org/repos/asf/lucene-solr-operator.git"/>
- <browse
rdf:resource="https://gitbox.apache.org/repos/asf?p=lucene-solr-operator.git"/>
+ <location
rdf:resource="https://gitbox.apache.org/repos/asf/solr-operator.git"/>
+ <browse
rdf:resource="https://gitbox.apache.org/repos/asf?p=solr-operator.git"/>
</GitRepository>
</repository>
<maintainer>
diff --git a/content/pages/operator/community.md
b/content/pages/operator/community.md
new file mode 100644
index 0000000..9370a06
--- /dev/null
+++ b/content/pages/operator/community.md
@@ -0,0 +1,66 @@
+Title: Community
+URL: operator/community.html
+save_as: operator/community.html
+template: operator/community
+
+## Support ##
+
+The Solr Operator community provides user support for free through the [users
mailing list](#mailing-lists-chat) and [slack channels](#slack).
+
+## Mailing Lists & Chat ##
+
+The Solr Operator shares mailing lists with its parent project, Apache Solr.
+Available lists can be [found
here]({filename}/pages/community.md#mailing-lists-chat).
+
+#### Slack ####
+
+* The project's main Slack channel is `#solr-operator` in the `Kubernetes`
organization.
+ Link: <https://kubernetes.slack.com/messages/solr-operator>
+
+* A developer focused Slack channel can be found at `#solr-operator` in the
`the-asf` organization.
+ Link: <https://the-asf.slack.com/messages/C01JR8WE1M5>
+
+## Issue tracker ##
+
+The Solr Operator uses [Github
issues](https://github.com/apache/solr-operator/issues) in it's repository for
issue tracking.
+
+## How To Contribute ##
+
+Looking to contribute to the Solr Operator? Read the
[instructions](https://github.com/apache/lucene-solr-operator/blob/main/docs/development.md)
on
+development and then submit a PR!
+
+## Code of Conduct ##
+
+For a large and diverse community like ours to be friendly, welcoming and
respectful, we recognize the need for some guidelines. The project follows
[Apache's Code of Conduct
statement](https://www.apache.org/foundation/policies/conduct). Please take
some time to read and understand it.
+
+If you feel there has been a violation of this code, please point out your
concerns publicly in a friendly and matter of fact manner. Nonverbal
communication is prone to misinterpretation and misunderstanding. Everyone has
bad days and sometimes says things they regret later. Someone else's
communication style may clash with yours, but the difference can be amicably
resolved. After pointing out your concerns please be generous upon receiving an
apology.
+
+Should there be repeated instances of code of conduct violations, or if there
is an obvious and severe violation, the Solr PMC may become involved.
+
+### The Apache Way
+
+As an Apache project we strive to follow [The Apache
Way](http://theapacheway.com/). If you are new to the community or to open
source in general, you may benefit from understanding our core values as a
community, and why we operate the way we do.
+
+## Version Control ##
+
+The Solr source code resides in the Apache [GIT](http://git.apache.org)
repository. Various GIT clients
+can be obtained from [git-scm.com](https://git-scm.com/). There are also GIT
integrations for various
+IDEs. For Eclipse, look at [EGit](http://www.eclipse.org/egit/). IntelliJ has
git support bundled, if you
+have installed the command line version.
+
+#### Web Access (read-only) ####
+
+The source code can be browsed at <https://github.com/apache/solr-operator>
and also <https://gitbox.apache.org/repos/asf?p=solr-operator.git>.
+No GIT client software is required.
+
+#### Cloning the repository ####
+
+To work on the code locally, you may clone the git repository:
+
+ git clone https://github.com/apache/solr-operator.git
+
+Then use GitHub's [fork
feature](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo)
+to obtain a personal fork from which you can later contribute your changes
through a
+[Pull Request](https://github.com/apache/solr-operator/pulls)
+
+You may alternatively choose to clone apache's git mirror at
`https://gitbox.apache.org/repos/asf?p=solr-operator.git`.
diff --git a/content/pages/operator/downloads.md
b/content/pages/operator/downloads.md
new file mode 100644
index 0000000..6f04f16
--- /dev/null
+++ b/content/pages/operator/downloads.md
@@ -0,0 +1,11 @@
+Title: Downloads
+URL: operator/downloads.html
+save_as: operator/downloads.html
+template: operator/downloads
+
+Official releases are usually created when the
[developers]({filename}/pages/whoweare.md)
+feel there are sufficient changes, improvements and bug fixes to warrant a
release.
+Due to the voluntary nature of Solr, no releases are scheduled in advance.
+
+The suggested method of installing the Solr Operator in your Kubernetes
cluster is via the [provided Helm
chart](https://artifacthub.io/packages/helm/apache-solr/solr-operator).
+Source releases are provided for the operator, however binaries are only
provided via the official [Docker
Image](https://hub.docker.com/r/apache/solr-operator).
diff --git a/content/pages/operator/features.md
b/content/pages/operator/features.md
new file mode 100644
index 0000000..2ae3e15
--- /dev/null
+++ b/content/pages/operator/features.md
@@ -0,0 +1,4 @@
+Title: Features
+URL: operator/features.html
+save_as: operator/features.html
+template: operator/features
diff --git a/content/pages/operator/index.md b/content/pages/operator/index.md
new file mode 100644
index 0000000..42f09ce
--- /dev/null
+++ b/content/pages/operator/index.md
@@ -0,0 +1,4 @@
+Title: Welcome
+URL: operator/index.html
+save_as: operator/index.html
+template: operator/index
diff --git a/content/pages/operator/logos-and-assets.md
b/content/pages/operator/logos-and-assets.md
new file mode 100644
index 0000000..b17ab2f
--- /dev/null
+++ b/content/pages/operator/logos-and-assets.md
@@ -0,0 +1,4 @@
+Title: Logos and Assets
+URL: operator/logos-and-assets.html
+save_as: operator/logos-and-assets.html
+template: operator/logos-and-assets
diff --git a/content/pages/operator/news.md b/content/pages/operator/news.md
new file mode 100644
index 0000000..bd62a25
--- /dev/null
+++ b/content/pages/operator/news.md
@@ -0,0 +1,6 @@
+Title: News
+URL: operator/news.html
+save_as: operator/news.html
+template: operator/news
+
+You may also read these news as an [ATOM
feed](/feeds/solr/operator/news.atom.xml).
diff --git a/content/pages/operator/resources.md
b/content/pages/operator/resources.md
new file mode 100644
index 0000000..00bc334
--- /dev/null
+++ b/content/pages/operator/resources.md
@@ -0,0 +1,49 @@
+Title: Resources
+URL: operator/resources.html
+save_as: operator/resources.html
+template: operator/resources
+
+All resources are currently found in the [Solr Operator
repository](https://github.com/apache/solr-operator), but will eventually be
moved to the website.
+
+## Tutorials ##
+
+* [Solr Operator Quick
Start](https://apache.github.io/solr-operator/docs/local_tutorial)
+
+Users who have completed the tutorial are encouraged to review the [other
documentation available](#documentation).
+
+***
+
+## Documentation ##
+
+<h3 class="offset" id="the-apache-solr-reference-guide">The Apache Solr
Reference Guide</h3>
+
+Current documentation can be found in the [repo's github
pages](https://apache.github.io/solr-operator/docs), soon it will be migrated
to this site.
+
+<h3 class="offset" id="additional-documentation">Additional Documentation</h3>
+
+Additional documentation, including upgrade notes, can be found in the [Solr
Operator's README](https://github.com/apache/solr-operator#solr-operator).
+
+***
+
+## Presentations ##
+
+If you have a Solr Operator presentation that you would like to see listed
here, please [edit this website and submit a Pull
Request](/editing-website.html).
+
+## Videos ##
+
+If you have a Solr Operator video that you would like to see listed here,
please [edit this website and submit a Pull Request](/editing-website.html).
+
+<!-- TODO: WOULD BE NICE TO HAVE A SLIDER OR RANDOMLY PICKED VIDEO HERE -->
+
+<h3 class="offset" id="youtube">Conferences with Solr talks</h3>
+
+[Videos from Past Activate / Lucene/Solr revolution
events](https://www.activate-conf.com/more-events)
+
+[Videos from past Berlin Buzzwords
events](https://www.youtube.com/c/PlainSchwarzUG/playlists?view=50&sort=dd&shelf_id=1)
+
+<h3 class="offset" id="youtube">YouTube</h3>
+
+[Introducing the Solr Operator - Activate
2019](https://www.youtube.com/watch?v=MD6NXTrA3xo&t=719s)
+
+[Search YouTube for
Solr](https://www.youtube.com/results?search_query=solr+operator)
+
diff --git a/content/solr/operator/news/2021-01-14-solr-operator-donation.md
b/content/solr/operator/news/2021-01-14-solr-operator-donation.md
new file mode 100644
index 0000000..e0bfc07
--- /dev/null
+++ b/content/solr/operator/news/2021-01-14-solr-operator-donation.md
@@ -0,0 +1,25 @@
+Title: Solr Operator donated to Apache Solr
+category: solr/operator/news
+save_as:
+
+The Apache Software Foundation's board today accepted Bloomberg's donation of
the Solr Operator as a sub-project of the Apache Solr project.
+
+### What's the background?
+
+The Solr Operator is software that manages an environment to run Solr and
related services on Kubernetes.
+It was created and open sourced by
[Bloomberg](https://www.techatbloomberg.com/) in early 2019.
+
+### How does this affect users?
+
+The Solr Operator repo is now maintained by the Apache Solr PMC, and lives at
a new location:
+
+1. The code base can now be found under the apache organization on Github,
[apache/solr-operator](https://github.com/apache/solr-operator).
+2. The Solr Operator has a section on the solr website gets a new website at
[https://solr.apache.org/operator](https://solr.apache.org/operator)
+3. The Solr Operator Docker image will now be available at
[apache/solr-operator](https://hub.docker.com/r/apache/solr-operator).
+ Old versions, released before the project was donated to Apache, can still
be found at
[bloomberg/solr-operator](https://hub.docker.com/r/bloomberg/solr-operator).
+4. The Helm charts for installing the Solr Operator now live in the [Apache
Solr helm repo](https://artifacthub.io/packages/helm/apache-solr/solr-operator).
+
+### How does this affect developers?
+
+Developers will not need to make many changes to their workflow.
+Make sure to run the new `make prepare` command before submitting a PR and you
should be good to go.
diff --git a/pelicanconf.py b/pelicanconf.py
index 8514d60..de480d0 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -14,6 +14,10 @@ SOLR_LATEST_RELEASE = '8.8.2'
SOLR_LATEST_RELEASE_DATE = datetime(2021, 4, 12)
SOLR_PREVIOUS_MAJOR_RELEASE = '7.7.3'
+SOLR_OPERATOR_LATEST_RELEASE = 'v0.3.0'
+SOLR_OPERATOR_LATEST_RELEASE_DATE = datetime(2021, 1, 11)
+SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE = 'v0.2.8'
+
# This string will be appended to all unversioned css and js resources to
prevent caching surprises on edits.
# The theme's htaccess file also sets a cache-control header with longer
lifetime, if the v=XXXX query string is added.
STATIC_RESOURCE_SUFFIX = "?v=%s" % dirhash('themes/solr/static', 'sha1')[-8:]
diff --git a/themes/solr/static/css/base.css b/themes/solr/static/css/base.css
index 3177c6b..0bf2d9b 100644
--- a/themes/solr/static/css/base.css
+++ b/themes/solr/static/css/base.css
@@ -7,6 +7,11 @@ html, body {
body {
overflow-x:hidden;
+ pointer-events: none;
+}
+
+body > * {
+ pointer-events: auto;
}
.alignleft {
diff --git a/themes/solr/static/css/base.css
b/themes/solr/static/css/operator.css
similarity index 97%
copy from themes/solr/static/css/base.css
copy to themes/solr/static/css/operator.css
index 3177c6b..bc5f318 100644
--- a/themes/solr/static/css/base.css
+++ b/themes/solr/static/css/operator.css
@@ -7,6 +7,11 @@ html, body {
body {
overflow-x:hidden;
+ pointer-events: none;
+}
+
+body > * {
+ pointer-events: auto;
}
.alignleft {
@@ -116,7 +121,7 @@ button.white:hover {
position: fixed;
z-index: 999;
min-width: 100%;
- background:#D9411E;
+ background:#865981;
}
.header-fill {
@@ -124,7 +129,7 @@ button.white:hover {
}
.top-bar, .top-bar .name {
- background:#D9411E;
+ background:#865981;
height: 90px;
}
@@ -136,7 +141,7 @@ button.white:hover {
}
.top-bar-section ul li, .top-bar-section li:not(.has-form) a:not(.button) {
- background: #D9411E;
+ background: #865981;
}
.top-bar-section li:not(.has-form) a:not(.btn):hover {
@@ -244,12 +249,12 @@ h1, h2, h3, h4, h5 {
h1 {
margin-bottom: 20px;
- color: #d9411e;
+ color: #865981;
}
h2 {
margin-bottom: 0.8em;
- color: #D9411E;
+ color: #865981;
}
h3 {
@@ -292,7 +297,7 @@ p {
*/
.homepage h1.red {
- color: #d9411e;;
+ color: #865981;;
}
.page h1, .page h2, .page h3 {
@@ -334,11 +339,11 @@ p {
}
.page a {
- color: #D9411E;
+ color: #865981;
}
.page .date {
- color: #D9411E;
+ color: #865981;
text-transform:uppercase;
font-weight:500;
}
@@ -356,7 +361,7 @@ pre {
* Alternate styles (blue sections)
*/
.alternate .annotation {
- color: #D9411E;
+ color: #865981;
}
.alternate h1 {
@@ -415,7 +420,7 @@ section.gray {
}
section.orange {
- background-color: #D9411E;
+ background-color: #865981;
color: #fff;
padding:60px 0 80px 0;
text-align:center;
@@ -498,7 +503,7 @@ section.orange.full-width {
}
.hero .down-arrow .red {
- color: #D9411E;
+ color: #865981;
}
.hero .down-arrow a {
@@ -741,7 +746,7 @@ footer .copyright p {
}
.gray h1 {
- color: #d9411e;
+ color: #865981;
line-height:0.8;
}
@@ -993,11 +998,11 @@ ul.side-nav > li {
}
.page .side-nav li a.active {
- color:#D9411E;
+ color:#865981;
}
.page .side-nav li a:hover {
- color:#D9411E;
+ color:#865981;
}
#search form, #search fieldset {
@@ -1099,7 +1104,7 @@ img.float-right {
}
.ref-guide-badge {
- background-color: #D9411E;
+ background-color: #865981;
color: #fff;
display: inline-block;
text-align: center;
@@ -1144,7 +1149,7 @@ ul li div.box div.img.logo-container.white-background {
background-color:#fff;
}
ul li div.box div.img.logo-container.orange-background {
- background-color:#D9411E;
+ background-color:#865981;
}
.full-width .gray .box.logo-box {
position: relative;
diff --git a/themes/solr/templates/_header.html
b/themes/solr/templates/_header.html
index d8f9be6..ce73360 100644
--- a/themes/solr/templates/_header.html
+++ b/themes/solr/templates/_header.html
@@ -28,6 +28,9 @@
<li>
<a href="{{ SITEURL }}/whoweare.html">Project</a>
</li>
+ <li>
+ <a href="{{ SITEURL }}/operator/">Solr Operator</a>
+ </li>
<!-- TODO Search not working as of feb 2021, disabling
<li class="toggle">
<a ng-hide="toggled" ng-click="toggle();" href="#">Search</a>
diff --git a/themes/solr/templates/downloads.html
b/themes/solr/templates/downloads.html
index e8370fb..1f88ca1 100644
--- a/themes/solr/templates/downloads.html
+++ b/themes/solr/templates/downloads.html
@@ -77,7 +77,7 @@
<a class="headerlink" href="#past-versions" title="Permanent
link">¶</a>
</h2>
- <p>Archives for all past versions of Solr are available at <a
href="https://archive.apache.org/dist/solr/">the Apache archives</a>. Se the <a
href="https://archive.apache.org/dist/lucene/solr/">Lucene archives for pre-9.0
releases</a></p>
+ <p>Archives for all past versions of Solr are available at <a
href="https://archive.apache.org/dist/solr/">the Apache archives</a>. See the
<a href="https://archive.apache.org/dist/lucene/solr/">Lucene archives for
pre-9.0 releases</a></p>
<h2 id="about-downloads">About downloads
<a class="headerlink" href="#about-downloads" title="Permanent
link">¶</a>
diff --git a/themes/solr/templates/operator/_css.html
b/themes/solr/templates/operator/_css.html
new file mode 100644
index 0000000..680ac90
--- /dev/null
+++ b/themes/solr/templates/operator/_css.html
@@ -0,0 +1,7 @@
+<link href='//fonts.googleapis.com/css?family=Raleway:400,300,600,500'
rel='stylesheet' type='text/css'>
+<link
href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css"
rel="stylesheet">
+<link rel="stylesheet" href="{{ SITEURL
}}/theme/css/lib/foundation/normalize.css{{ STATIC_RESOURCE_SUFFIX }}" />
+<link rel="stylesheet" href="{{ SITEURL
}}/theme/css/lib/foundation/foundation.min.css{{ STATIC_RESOURCE_SUFFIX }}"/>
+<link rel="stylesheet" href="{{ SITEURL
}}/theme/css/lib/foundation/foundation-icons.css{{ STATIC_RESOURCE_SUFFIX }}"/>
+<link rel="stylesheet" type="text/css"
href="//cdn.jsdelivr.net/jquery.slick/1.3.7/slick.css"/>
+<link rel="stylesheet" href="{{ SITEURL }}/theme/css/operator.css{{
STATIC_RESOURCE_SUFFIX }}" />
diff --git a/themes/solr/templates/operator/_footer.html
b/themes/solr/templates/operator/_footer.html
new file mode 100644
index 0000000..e81f6eb
--- /dev/null
+++ b/themes/solr/templates/operator/_footer.html
@@ -0,0 +1,58 @@
+<div class="row">
+ <div class="small-6 medium-3 columns">
+ <h4>Features</h4>
+ <ul>
+ <li><a href="/operator/features.html">Overview</a></li>
+ <li><a href="/operator/features.html#solr-cloud">Solr Cloud</a></li>
+ <li><a href="/operator/features.html#solr-metrics">Solr Metrics</a></li>
+ <li><a href="/operator/features.html#solr-backup">Solr Backups</a></li>
+ </ul>
+ </div>
+ <div class="small-6 medium-3 columns">
+ <h4>Resources</h4>
+ <ul>
+ <li><a href="/operator/resources.html#tutorials">Tutorial</a></li>
+ <li><a href="/operator/resources.html#documentation">Docs</a></li>
+ <li><a
href="/operator/resources.html#presentations">Presentations</a></li>
+ <li><a href="/operator/resources.html#videos">Videos</a></li>
+ <li><a href="/logos-and-assets.html">Solr Logos and Assets</a></li>
+ <li><a href="/editing-website.html">Editing this Website</a></li>
+ <br/>
+ <li><a href="https://www.apache.org/">Apache Software Foundation</a></li>
+ <li><a
href="https://www.apache.org/foundation/thanks.html">Thanks</a></li>
+ <li><a
href="https://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ <li><a href="https://www.apache.org/security/">Security</a></li>
+ <li><a href="https://www.apache.org/licenses/">License</a></li>
+ </ul>
+ </div>
+ <div class="small-6 medium-3 columns">
+ <h4>Get Started</h4>
+ <ul>
+ <li><a href="/operator/downloads.html">Download</a></li>
+ <li><a href="/operator/resources.html#tutorials">Run Through the
Tutorial</a></li>
+ <li><a href="/operator/resources.html">Level Up</a></li>
+ </ul>
+ <br/>
+ <h4>Community</h4>
+ <ul>
+ <li><a href="/operator/community.html#support">Support</a></li>
+ <li><a href="/operator/community.html#mailing-lists-irc">Mailing Lists &
Chat</a></li>
+ <li><a href="/operator/community.html#issue-tracker">Issues</a></li>
+ <li><a
href="/operator/community.html#how-to-contribute">Contribute</a></li>
+ <li><a href="/operator/community.html#version-control">Version control
(GIT)</a></li>
+ </ul>
+ </div>
+ <div class="small-6 medium-3 columns">
+ <h4>Related Projects</h4>
+ <ul>
+ <li><a href="https://lucene.apache.org/">Apache Lucene</a></li>
+ <li><a href="https://zookeeper.apache.org/">Apache Zookeeper</a></li>
+ <li><a href="https://kubernetes.io/">Kubernetes</a></li>
+ <li><a href="https://github.com/pravega/zookeeper-operator">The
Zookeeper Operator</a></li>
+ <li><a
href="https://github.com/kubernetes-sigs/kubebuilder">Kubebuilder</a></li>
+ </ul>
+ </div>
+</div>
+<div class="row copyright">
+ {% include "_copyright.html" %}
+</div>
diff --git a/themes/solr/templates/operator/_head.html
b/themes/solr/templates/operator/_head.html
new file mode 100644
index 0000000..26ee835
--- /dev/null
+++ b/themes/solr/templates/operator/_head.html
@@ -0,0 +1,25 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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
+
+ http://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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="minimal-ui, initial-scale=1, maximum-scale=1,
user-scalable=0">
+
+{% include "operator/_css.html" %}
+
+<meta name="Distribution" content="Global"/>
+<meta name="Robots" content="index,follow"/>
+
+{% include "_javascript.html" %}
diff --git a/themes/solr/templates/_header.html
b/themes/solr/templates/operator/_header.html
similarity index 61%
copy from themes/solr/templates/_header.html
copy to themes/solr/templates/operator/_header.html
index d8f9be6..4a54339 100644
--- a/themes/solr/templates/_header.html
+++ b/themes/solr/templates/operator/_header.html
@@ -3,7 +3,7 @@
<nav class="top-bar" data-topbar role="navigation">
<ul class="title-area">
<li class="name">
- <a href="/"><img class="logo" src="{{ SITEURL
}}/theme/images/logo.svg" /></a>
+ <a href="{{ SITEURL }}/operator/"><img class="logo" src="{{ SITEURL
}}/theme/images/logo.svg" /></a>
</li>
<li class="toggle-topbar menu-icon"><a
href="#"><span>Menu</span></a></li>
</ul>
@@ -11,22 +11,16 @@
<div class="top-bar-section">
<ul class="navigation right">
<li>
- <a href="{{ SITEURL }}/news.html">News</a>
+ <a href="{{ SITEURL }}/operator/news.html">News</a>
</li>
<li>
- <a href="{{ SITEURL }}/security.html">Security</a>
+ <a href="{{ SITEURL }}/operator/features.html">Features</a>
</li>
<li>
- <a href="{{ SITEURL }}/features.html">Features</a>
+ <a href="{{ SITEURL }}/operator/resources.html">Resources</a>
</li>
<li>
- <a href="{{ SITEURL }}/resources.html">Resources</a>
- </li>
- <li>
- <a href="{{ SITEURL }}/community.html">Community</a>
- </li>
- <li>
- <a href="{{ SITEURL }}/whoweare.html">Project</a>
+ <a href="{{ SITEURL }}/operator/community.html">Community</a>
</li>
<!-- TODO Search not working as of feb 2021, disabling
<li class="toggle">
@@ -37,7 +31,10 @@
</li>
-->
<li>
- <a class="btn" href="/downloads.html">Download</a>
+ <a href="{{ SITEURL }}/operator/downloads.html">Download</a>
+ </li>
+ <li>
+ <a class="btn" href="{{ SITEURL }}/">ᐱ Solr TLP</a>
</li>
</ul>
</div>
diff --git a/themes/solr/templates/operator/base.html
b/themes/solr/templates/operator/base.html
new file mode 100644
index 0000000..5437def
--- /dev/null
+++ b/themes/solr/templates/operator/base.html
@@ -0,0 +1,49 @@
+<!doctype html>
+<html>
+ <head>
+ {% include "operator/_head.html" %}
+ <title>{% block title %}{{ page.title }}{% endblock %} - Apache Solr
Operator</title>
+ {% block css %}{% endblock %}
+
+ {% block metakeys %}
+ <meta name="keywords"
+ content="apache, apache solr, solr, apache solr operator, solr
operator, kubernetes, operator,
+ kubernetes operator, kubebuilder,
+ search, information retrieval, spell checking, faceting,
inverted index, open source"/>
+ {% endblock %}
+ {% block ogmeta %}
+ <meta property="og:type" content="website" />
+ <meta property="og:url" content="https://solr.apache.org/{{ page.url }}"/>
+ <meta property="og:title" content="{{ page.title }}"/>
+ <meta property="og:description" content="{{ page.content | striptags |
replace("\"", """) | truncate(137, False, '...') }}"/>
+ <meta property="og:image"
content="https://solr.apache.org/theme/images/solr_og_image.png{{
STATIC_RESOURCE_SUFFIX }}"/>
+ <meta property="og:image:secure_url"
content="https://solr.apache.org/theme/solr/solr_og_image.png{{
STATIC_RESOURCE_SUFFIX }}"/>
+ {% endblock %}
+
+ {% block favicon %}
+ <link rel="icon" href="{{ SITEURL }}/theme/images/favicon.ico"
type="image/x-icon">
+ <link rel="shortcut icon" href="{{ SITEURL }}/theme/images/favicon.ico"
type="image/x-icon">
+ {% endblock %}
+ {% block rss %}{% endblock %}
+ {% block javascript %}{% endblock %}
+ </head>
+
+ <body class="page {% block bodyclass %}{% endblock %}" {% block
ng_directives %}{% endblock %} x-ng-app="page"
x-ng-controller="page.controllers.main">
+ {% include "operator/_header.html" %}
+
+ {% block solr_security_warning %}
+ {% endblock %}
+ {% block solr_operator_news %}
+ {% endblock %}
+ {% block hero_header %}
+ {% endblock %}
+ {% block content %}
+ {% endblock %}
+ <footer>
+ {% include "operator/_footer.html" %}
+ </footer>
+
+ {% include "_last_scripts.html" %}
+ {% include "_analytics.html" %}
+ </body>
+</html>
diff --git a/themes/solr/templates/operator/community.html
b/themes/solr/templates/operator/community.html
new file mode 100644
index 0000000..0a4dc5a
--- /dev/null
+++ b/themes/solr/templates/operator/community.html
@@ -0,0 +1,13 @@
+{% extends "operator/subnav.html" %}
+
+{% block subnav_title %}Community{% endblock %}
+{% block subnav_subtitle %}Join the active community of Solr
Operator<sup>™</sup> contributors.{% endblock %}
+{% block subnav_nav_items %}
+<dd><a data-scroll href="#support">Support</a></dd>
+<dd><a data-scroll href="#mailing-lists-chat">Lists/Chat</a></dd>
+<dd><a data-scroll href="#issue-tracker">Issues</a></dd>
+<dd><a data-scroll href="#how-to-contribute">Contributing</a></dd>
+<dd><a data-scroll href="#code-of-conduct">Code of Conduct</a></dd>
+<dd><a data-scroll href="#version-control">Version Control</a></dd>
+<dd><a data-scroll href="#powered-by">Powered By</a></dd>
+{% endblock %}
diff --git a/themes/solr/templates/operator/downloads.html
b/themes/solr/templates/operator/downloads.html
new file mode 100644
index 0000000..86d8874
--- /dev/null
+++ b/themes/solr/templates/operator/downloads.html
@@ -0,0 +1,166 @@
+{% extends "operator/page.html" %}
+
+{% block content_inner %}
+<div class="small-12 columns">
+ <style type="text/css">
+ .headerlink, .elementid-permalink {
+ visibility: hidden;
+ }
+ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink {
+ visibility: visible
+ }
+ </style>
+
+ <h1 id="solr-downloads">{{ page.title }}
+ <a class="headerlink" href="#solr-downloads" title="Permanent link">¶</a>
+ </h1>
+ {{ page.content }}
+ <h2 id="solr-{{ SOLR_OPERATOR_LATEST_RELEASE | replace(".", "") }}">Solr
Operator {{ SOLR_OPERATOR_LATEST_RELEASE }}
+ <a class="headerlink" href="#solr-{{ SOLR_OPERATOR_LATEST_RELEASE |
replace(".", "") }}" title="Permanent link">¶</a>
+ </h2>
+
+ <p>Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }} is the most recent
Apache Solr Operator release.</p>
+
+ <ul>
+ <li>Source release:
+ <a href="https://www.apache.org/dyn/closer.lua/solr/operator/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solr-operator-{{ SOLR_OPERATOR_LATEST_RELEASE
}}.tgz">solr-operator-{{ SOLR_OPERATOR_LATEST_RELEASE }}.tgz</a>
+ [<a href="https://downloads.apache.org/solr/operator/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solr-operator-{{ SOLR_OPERATOR_LATEST_RELEASE
}}.tgz.asc">PGP</a>]
+ [<a href="https://downloads.apache.org/solr/operator/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solr-operator-{{ SOLR_OPERATOR_LATEST_RELEASE
}}.tgz.sha512">SHA512</a>]
+ </li>
+
+ <li>Docker releases:
+ <a
href="https://hub.docker.com/r/apache/solr-operator">apache/solr-operator</a>
+ </li>
+
+ <li>Helm Chart release:
+ <a
href="https://artifacthub.io/packages/helm/apache-solr/solr-operator/{{
SOLR_OPERATOR_LATEST_RELEASE | replace("v", "") }}">Artifact Hub</a><br/>
+ <i>Use <code>{{ SOLR_OPERATOR_LATEST_RELEASE | replace("v", "")
}}</code> as the version of the Helm Chart.</i>
+ </li>
+
+ <li>CRDs:
+ <ul>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_LATEST_RELEASE }}/all.yaml">All</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_LATEST_RELEASE }}/all-with-dependencies.yaml">All with
Dependencies (Zookeeper)</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solrclouds.yaml">Solr Cloud</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solrprometheusexporters.yaml">Solr Prometheus
Exporter</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_LATEST_RELEASE }}/solrbackups.yaml">Solr Backup</a></li>
+ </ul>
+ </li>
+
+ <!-- TODO: Put change log in site -->
+ <li><a href="https://github.com/apache/solr-operator/releases/{{
SOLR_OPERATOR_LATEST_RELEASE }}">Change log</a></li>
+ </ul>
+
+ <h3 id="solr-{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE | replace(".", "")
}}">Solr Operator {{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}
+ <a class="headerlink" href="#solr-{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE
| replace(".", "") }}" title="Permanent link">¶</a>
+ </h3>
+
+ <p>Solr Operator {{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }} is the last
release in the v0.{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE.split(".")[1] }}.x
series.</p>
+
+ <ul>
+ <li>Source release:
+ <a
href="https://github.com/apache/solr-operator/archive/v0.2.8.tar.gz">solr-operator-{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}.tgz</a>
+ <!-- TODO: Replace bullet point with following when v0.2.x is no longer
relevant
+ <a href="https://www.apache.org/dyn/closer.lua/solr/operator/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solr-operator-{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}.tgz">solr-{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}.tgz</a>
+ [<a href="https://downloads.apache.org/solr/operator/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solr-operator-{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}.tgz.asc">PGP</a>]
+ [<a href="https://downloads.apache.org/solr/operator/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solr-operator-{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}.tgz.sha512">SHA512</a>]
+ -->
+ </li>
+
+ <!-- TODO: Change to Apache when v0.2.x is no longer relevant -->
+ <li>Docker releases:
+ <a
href="https://hub.docker.com/r/bloomberg/solr-operator">bloomberg/solr-operator</a>
+ </li>
+
+ <li>Helm Chart release:
+ <a
href="https://artifacthub.io/packages/helm/apache-solr/solr-operator/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE | replace("v", "") }}">Artifact
Hub</a><br/>
+ <i>Use <code>{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE | replace("v", "")
}}</code> as the version of the Helm Chart.</i>
+ </li>
+
+ <li>CRDs:
+ <ul>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/all.yaml">All</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/all-with-dependencies.yaml">All with
Dependencies (Zookeeper)</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solrclouds.yaml">Solr Cloud</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solrprometheusexporters.yaml">Solr
Prometheus Exporter</a></li>
+ <li><a href="{{ SITEURL }}/operator/downloads/crds/{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}/solrbackups.yaml">Solr Backup</a></li>
+ </ul>
+ </li>
+ </ul>
+
+ <h2 id="past-versions">Past versions
+ <a class="headerlink" href="#past-versions" title="Permanent
link">¶</a>
+ </h2>
+
+ <p>Archives for all past versions of the Solr Operator are available at <a
href="https://archive.apache.org/dist/solr/operator">the Apache archives</a>.
See the <a href="https://github.com/apache/solr-operator/releases">Github
releases</a> for pre-v0.3.0 releases</p>
+
+ <h2 id="about-downloads">About downloads
+ <a class="headerlink" href="#about-downloads" title="Permanent
link">¶</a>
+ </h2>
+
+ <h3 id="verify-downloads">Verify downloads
+ <a class="headerlink" href="#verify-downloads" title="Permanent
link">¶</a>
+ </h3>
+
+ <p>The above source release files should be verified using the PGP
signatures and the <a href="https://downloads.apache.org/solr/KEYS">project
release KEYS</a>.
+ See <a href="https://www.apache.org/dyn/closer.cgi#verify">verification
instructions</a> for a description of using the PGP and KEYS files for
verification.
+ SHA checksums are also provided as alternative verification method.</p>
+
+ <h3 id="file-names">File names
+ <a class="headerlink" href="#file-names" title="Permanent link">¶</a>
+ </h3>
+
+ <p>The <code>solr-operator-VERSION.tgz</code> file contains the full source
code for that version, where <code>VERSION</code> is the version number of
+ the release, e.g. <code>{{ SOLR_OPERATOR_LATEST_RELEASE }}</code>.</p>
+
+ <p>Helm Charts do not allow a <strong>v</strong> prefix in the version, so
that is the only version in the Solr Operator release corpus that does not use
it.</p>
+
+ <h3 id="about-versions-and-support">About versions and support
+ <a class="headerlink" href="#about-versions-and-support" title="Permanent
link">¶</a>
+ </h3>
+
+ <p>The Apache Solr Operator is under active development with frequent
feature releases on the current minor version.
+ It is still in the beta phase, and working towards its <code>v1.0.0</code>
release.
+ The <strong>previous</strong> minor version will see occasional critical
security- or bug fixes releases.
+ Older versions are considered EOL (End Of Life) and will not be further
+ updated. For this reason it may also be difficult to obtain community
support for EOL versions.</p>
+
+ <p>Large changes or changes that break compatibility with existing
functionality are normally only included in the
+ <strong>next</strong> minor version.</p>
+
+ <p>After the <code>v1.0.0</code> release, large changes that break
compatibility will be reserved for major version changes.</p>
+
+ <table>
+ <tr align=left>
+ <th>Version</th>
+ <th>Description</th>
+ </tr>
+ <tr align=left>
+ <td>v0.{{ SOLR_OPERATOR_LATEST_RELEASE.split('.')[1] }}.x</td>
+ <td>Current minor version for feature releases (STABLE)</td>
+ </tr>
+ <tr align=left>
+ <td>{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE.split('.')[0] }}.{{
SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE.split('.')[1] }}.x</td>
+ <td>Previous minor version may sometimes receive critical bugfix
releases</td>
+ </tr>
+ <tr align=left>
+ <td>v0.{{ SOLR_OPERATOR_LATEST_RELEASE.split('.')[1] | int + 1 }}</td>
+ <td>Next minor version, yet to be released (UNSTABLE)</td>
+ </tr>
+ <tr align=left>
+ <td><{{ SOLR_OPERATOR_PREVIOUS_MAJOR_RELEASE }}</td>
+ <td>All older versions are End Of Life (EOL)</td>
+ </tr>
+ </table>
+
+ <p>For more about versions and upgrading the Solr Operator, see the
+ <a
href="https://github.com/apache/solr-operator/blob/main/docs/upgrade-notes.md">Upgrade
Notes page</a> in the documentation.
+ </p>
+
+ <h3>Docker Image License Information</h3>
+ <p>
+ The official <a href="https://hub.docker.com/r/apache/solr-operator">Solr
Operator Docker image</a> contains <code>NOTICE</code> and <code>LICENSE</code>
information in the <code>/etc/licenses</code> directory.
+ This is different from the source release <code>LICENSE</code> and
<code>NOTICE</code> files, so make sure to familiarize yourself when using the
image.
+ </p>
+</div>
+{% endblock content_inner %}
diff --git a/themes/solr/templates/operator/features.html
b/themes/solr/templates/operator/features.html
new file mode 100644
index 0000000..bbca3d0
--- /dev/null
+++ b/themes/solr/templates/operator/features.html
@@ -0,0 +1,231 @@
+{% extends "operator/fullwidth.html" %}
+
+{% block fullwidth_title %}<h1>Extension</h1>{% endblock %}
+
+{% block hero_header_inner %}
+<div class="large-12 columns">
+ <div class="annotation">
+ Apache Solr Operator<sup>™</sup> {{ SOLR_OPERATOR_LATEST_RELEASE }}
+ </div>
+ <h1>
+ Solr Operator Features
+ </h1>
+ <p>
+ The Solr Operator is a control-plane manager for a Solr ecosystem in
Kubernetes.
+ </p>
+ <div class="down-arrow"><a data-scroll href="#crds"><i class="fa
fa-angle-down fa-2x red"></i></a></div>
+</div>
+{% endblock %}
+
+{% block content_inner %}
+<section class="gray col-4 offset-small" id="crds">
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-3">
+ <li>
+ <div class="box">
+ <a href="#solr-cloud">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_fast_near_real-time.svg"/></div>
+ <div class="content">
+ <h3>Solr Cloud</h3>
+ <p>Orchestrate highly available Solr Cloud clusters in
Kubernetes.</p>
+ </div>
+ </a>
+ </div>
+ </li>
+ <li>
+ <div class="box">
+ <a href="#solr-metrics">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_monitorable_logging.svg"/></div>
+ <div class="content">
+ <h3>Solr Prometheus Exporter</h3>
+ <p>Manage collection of Solr Metrics, adapting to changes in
your Solr Cloud.</p>
+ </div>
+ </a>
+ </div>
+ </li>
+ <li>
+ <a href="#solr-backup">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_multiple_search_indices.svg"/></div>
+ <div class="content">
+ <h3>Solr Backup</h3>
+ <p>Take backups of your Solr Cloud.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+</section>
+
+<section class="hero alternate" id="solr-cloud">
+ <div class="row">
+ <div class="large-12 columns">
+ <div class="annotation">
+ Solr Cloud
+ </div>
+ <h1>
+ Managing Solr Cloud clusters in Kubernetes.
+ </h1>
+ <div class="down-arrow"><a data-scroll href="#solr-cloud-features"><i
class="fa fa-angle-down fa-2x red"></i></a></div>
+ </div>
+ </div>
+</section>
+
+<section class="gray col-4 offset-small" id="solr-cloud-features">
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-3">
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#update-strategy"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_standards_based_open_interfaces.svg"/></div>
+ <div class="content">
+ <h3>Advanced and Safe Rolling Restarts and Upgrades</h3>
+ <p>The Solr Operator can orchestrate a safe rolling restart and
upgrade of SolrCloud clusters.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#authentication-and-authorization"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_security.svg"/></div>
+ <div class="content">
+ <h3>Easy enablement of Solr Security</h3>
+ <p>Turning on Solr security, with Basic Auth, is as easy as
flipping a switch.</p>
+ <p>It's also never been easier to enable SSL within your Solr
Cloud.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#zookeeper-reference"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_highly_configurable.svg"/></div>
+ <div class="content">
+ <h3>Hassle-Free ZooKeeper Deployment</h3>
+ <p>
+ Easily spin up an external ZooKeeper cluster for your
SolrCloud.
+ Possible via an integration with the ZooKeeper Operator.
+ </p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#addressability"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-resources.svg"/></div>
+ <div class="content">
+ <h3>Easy Addressability for any Provider</h3>
+ <p>
+ With complete customizable addressability, you can run and
expose your Solr Nodes in any Kubernetes Provider.
+ Setup is automatic, all you have to do is provide the settings
that work in your environment.
+ </p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-cloud/solr-cloud-crd.html#override-built-in-solr-configuration-files"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_flexible_and_adaptable.svg"/></div>
+ <div class="content">
+ <h3>Customize the Kubernetes Components</h3>
+ <p>The Solr Operator gives many options for customizing the
Kubernetes components used to deploy the Solr Cloud.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+</section>
+
+<section class="hero alternate" id="solr-metrics">
+ <div class="row">
+ <div class="large-12 columns">
+ <div class="annotation">
+ Solr Prometheus Exporter
+ </div>
+ <h1>
+ Managing Solr Metrics in Kubernetes.
+ </h1>
+ <div class="down-arrow"><a data-scroll href="#solr-metrics-features"><i
class="fa fa-angle-down fa-2x red"></i></a></div>
+ </div>
+ </div>
+</section>
+
+<section class="gray col-4 offset-small" id="solr-metrics-features">
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-3">
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-prometheus-exporter#finding-the-solr-cluster-to-monitor"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_standards_based_open_interfaces.svg"/></div>
+ <div class="content">
+ <h3>Automatically Update Information</h3>
+ <p>Automatically restart when updates to TLS secrets, Auth or
ZooKeeper Connection Strings are made.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-prometheus-exporter#prometheus-stack"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_extensible_plugin.svg"/></div>
+ <div class="content">
+ <h3>Integrate with Prometheus Stack</h3>
+ <p>Integration with the Prometheus Operator in Kubernetes is
easy and well documented.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a
href="https://apache.github.io/solr-operator/docs/solr-prometheus-exporter#customize-prometheus-exporter-config"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_flexible_and_adaptable.svg"/></div>
+ <div class="content">
+ <h3>Customize the Kubernetes Components</h3>
+ <p>The Solr Operator gives many options for customizing the
Kubernetes components used to deploy the Solr Prometheus Exporter.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+</section>
+
+<section class="hero alternate" id="solr-backup">
+ <div class="row">
+ <div class="large-12 columns">
+ <div class="annotation">
+ Solr Backups
+ </div>
+ <h1>
+ Backup your SolrClouds in Kubernetes.
+ </h1>
+ <div class="down-arrow"><a data-scroll href="#solr-backup-features"><i
class="fa fa-angle-down fa-2x red"></i></a></div>
+ </div>
+ </div>
+</section>
+
+<section class="gray col-4 offset-small" id="solr-backup-features">
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-3">
+ <li>
+ <a href="https://apache.github.io/solr-operator/docs/solr-backup"
target="_blank">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/Solr_Icons_an_ajax_based.svg"/></div>
+ <div class="content">
+ <h3>Multiple Storage Options</h3>
+ <p>You have the ability to store your backups in S3 or
Kuberenetes Persistent Volumes.</p>
+ </div>
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+</section>
+
+{{ super() }}
+{% endblock content_inner %}
diff --git a/themes/solr/templates/operator/fullwidth.html
b/themes/solr/templates/operator/fullwidth.html
new file mode 100644
index 0000000..0d8bfdf
--- /dev/null
+++ b/themes/solr/templates/operator/fullwidth.html
@@ -0,0 +1,24 @@
+{% extends "operator/base.html" %}
+
+{% block hero_header %}
+<section class="hero alternate">
+ <div class="row">
+ {% block hero_header_inner %}
+ <div class="large-10 large-offset-1 columns">
+ <div class="annotation">
+ Apache Solr Operator<sup>™</sup> {{ SOLR_OPERATOR_LATEST_RELEASE
}}
+ </div>
+ <h1>
+ The Apache Solr Operator is built to reliably manage Apache
Solr<sup>™</sup> on Kubernetes.
+ </h1>
+
+ <div class="down-arrow"><a class="smooth-scroll" href="#learn-more"
target="_self"><i class="fa fa-angle-down fa-2x red"></i></a></div>
+ </div>
+ {% endblock hero_header_inner %}
+ </div>
+</section>
+{% endblock hero_header %}
+
+{% block content %}
+{% block content_inner %}{{ page.content }}{% endblock %}
+{% endblock %}
diff --git a/themes/solr/templates/operator/index.html
b/themes/solr/templates/operator/index.html
new file mode 100644
index 0000000..14f9a36
--- /dev/null
+++ b/themes/solr/templates/operator/index.html
@@ -0,0 +1,318 @@
+{% extends "operator/fullwidth.html" %}
+
+{% block bodyclass %}homepage{% endblock %}
+
+{% block solr_security_warning %}
+{% set latest_sec_articles = (articles | selectattr("category.name", "eq",
"solr/security") | list)[:1] %}
+{% if (latest_sec_articles | length) > 0 %}
+{% set latest_sec_date = latest_sec_articles[0].date | strftime("%Y-%m-%d") %}
+<section class="security" latest-date="{{ latest_sec_date }}">
+ <div class="row">
+ <div class="large-12 columns text-center">
+ <h2><a href="/security.html">⚠ There are recent security
announcements. Read more on the Solr Security page.</a></h2>
+ </div>
+ </div>
+</section>
+{% endif %}
+{% endblock %}
+
+{% block solr_operator_news %}
+{% set latest_articles = (articles | selectattr("category.name", "eq",
"solr/operator/news") | list)[:1] %}
+{% set latest_date = latest_articles[0].date | strftime("%Y-%m-%d") %}
+<section class="topnews" latest-date="{{ latest_date }}">
+ <div class="row">
+ {% for article in latest_articles %}
+ <p id="{{article.slug}}">
+ <a href="/operator/news.html#{{article.slug}}"><b>NEWS:</b>
{{article.title}}</a> <span class="news-date">({{ article.date |
strftime("%d.%b") }})</span>
+ </p>
+ {% endfor %}
+ </div>
+</section>
+{% endblock %}
+
+{% block content_inner %}
+<section class="gray offset-medium" id="learn-more"></section>
+
+<section class="gray col-4">
+ <div class="row">
+ <div class="large-10 large-offset-1 columns">
+ <div class="annotation">
+
+ </div>
+ <h1>
+ Learn more about the Solr Operator.
+ </h1>
+ <p>
+ Solr is highly reliable, scalable and fault tolerant, providing
distributed indexing, replication and load-balanced querying, automated
failover and recovery, centralized configuration and more. Solr powers the
search and navigation features of many of the world's largest internet sites.
+ </p>
+ </div>
+ </div>
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-4">
+ <li>
+ <a href="/operator/features.html"><div class="box"><div
class="img"><img src="{{ SITEURL }}/theme/images/icon-features.svg"/></div>
+ <div class="title">
+ <h3>Features</h3>
+ </div>
+ <p>What is included in a Solr ecosystem on Kubernetes?</p>
+ <span class="btn1">Learn More</span>
+ </div></a>
+ </li>
+ <li>
+ <a href="/operator/resources.html">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-resources.svg"/></div>
+ <div class="title">
+ <h3>Resources</h3>
+ </div>
+ <p>From tutorials to documentation, you'll find it here.</p>
+ <span class="btn1">Get Started</span>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a href="/operator/features.html#solr-cloud">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-scaling.svg"/></div>
+ <div class="title">
+ <h3>Easily Deploy Solr</h3>
+ </div>
+ <p>Easily deploy a Solr Cloud on Kubernetes.</p>
+ <span class="btn1">Deploy Solr</span>
+ </div>
+ </a>
+ </li>
+ <li>
+ <a href="/operator/community.html">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-community.svg"/></div>
+ <div class="title">
+ <h3>Solr Operator Community</h3>
+ </div>
+ <p>Get support and give back. Contribute to the Solr Operator
project.</p>
+ <span class="btn1">Learn More</span>
+ </div>
+ </a>
+ </li>
+ </ul>
+ </div>
+</section>
+
+<!-- TODO: Get a list of poweredBy. Might include Zillow, Apple, Bloomberg, etc
+<section class="white poweredby">
+ <div class="row">
+ <div class="large-12 columns text-center">
+ <div class="annotation">
+ Tested and proven
+ </div>
+ <h1 class="red">
+ The Solr Operator is trusted.
+ </h1>
+
+ <p>
+ The Solr Operator powers some of the most heavily-trafficked websites
and applications in the world.
+ </p>
+ <hr>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-11 small-centered columns">
+ <div class="slider powered">
+ <div><img src="{{ SITEURL }}/theme/images/logo-bloomberg.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-eharmony.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-duckduckgo.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-sears.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-stubhub.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-zappos.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-bestbuy.png"/></div>
+ <div><img src="{{ SITEURL }}/theme/images/logo-aol.png"/></div>
+ </div>
+ </div>
+ </div>
+ <div class="text-center">Other Notable Users</div>
+ <div class="list text-center">
+ <ul>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>AT&T
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Instagram
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Buy.com
+ </li>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>Ticketmaster
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Netflix</li>
+ </div>
+ <div class="small-4 columns">
+ <li>The Echo Nest
+ </li>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>Chegg
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Disney
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Adobe
+ </li>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>eBay
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Internet Archive
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>SAP Hybris
+ </li>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>Magento
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>IBM Websphere Commerce
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Bloomberg
+ </li>
+ </div>
+ </div>
+ <div class="row">
+ <div class="small-4 columns">
+ <li>Comcast
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>MTV Networks
+ </li>
+ </div>
+ <div class="small-4 columns">
+ <li>Travelocity
+ </li>
+ </div>
+ </div>
+ </ul>
+ </div>
+ <div class="text-center small">
+ <p>Want to see more? Want to see your app or website here? Visit Solr's
<a href="https://cwiki.apache.org/confluence/display/solr/PublicServers">Public
Servers</a> listing page to learn more.</p>
+ </div>
+</section>
+-->
+
+<section class="hero alternate">
+ <div class="row">
+ <div class="large-12 columns text-center">
+ <div class="annotation">
+ Take the first step
+ </div>
+ <h1>
+ Getting Started
+ </h1>
+ <p>
+ Power your global enterprise or your weekend project.
+ </p>
+ <div class="down-arrow "><a data-scroll href="#get-started"><i class="fa
fa-angle-down fa-2x red"></i></a></div>
+ </div>
+ </div>
+</section>
+
+<section class="gray col-3" id="get-started">
+ <div class="row">
+ <div class="large-4 columns">
+ <a href="https://artifacthub.io/packages/helm/apache-solr/solr-operator">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-run-install.svg"/></div>
+ <div class="title">
+ <h3>Install the Solr Operator</h3>
+ </div>
+ <p>Click here to install the Solr Operator in your Kubernetes
cluster via the provided Helm chart.</p>
+ <span class="btn1">Install</span>
+ </div>
+ </a>
+ </div>
+ <div class="large-4 columns">
+ <a href="/operator/resources.html#tutorials">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-check-out-tutorial.svg"/></div>
+ <div class="title">
+ <h3>Run Through the Tutorial</h3>
+ </div>
+ <p>The Solr Operator provides a quick tutorial on getting
started.</p>
+ <span class="btn1">Read the Tutorial</span>
+ </div>
+ </a>
+ </div>
+ <div class="large-4 columns">
+ <a href="/operator/resources.html">
+ <div class="box">
+ <div class="img"><img src="{{ SITEURL
}}/theme/images/icon-check-out-tutorial.svg"/></div>
+ <div class="title">
+ <h3>Level Up</h3>
+ </div>
+ <p>Once you've completed the tutorial, continue your mastery with
the Solr Operator resource library.</p>
+ <span class="btn1">More Resources</span>
+ </div>
+ </a>
+ </div>
+ </div>
+</section>
+
+<section class="hero alternate">
+ <div class="row">
+ <div class="large-12 columns text-center">
+ <div class="annotation">
+ Solr Operator News | {{
SOLR_OPERATOR_LATEST_RELEASE_DATE|strftime('%-d %B %Y') }}
+ </div>
+ <h1>
+ Apache Solr Operator {{ SOLR_OPERATOR_LATEST_RELEASE }} available
+ </h1>
+ <p>
+ The Solr PMC is pleased to announce the release of Apache Solr Operator
{{ SOLR_OPERATOR_LATEST_RELEASE }}. Download <a
href="/operator/downloads.html">here</a>.
+ </p>
+ <a href="/operator/news.html"><span class="white">Read More
News</span></a>
+ </div>
+ </div>
+</section>
+
+<section class="white">
+ <div class="row">
+ <div class="large-12 columns text-center">
+ <h1>
+ The Apache Software Foundation
+ </h1>
+ <p>
+ The Apache Software Foundation provides support for the Apache community
of open-source software projects. The Apache projects are defined by
collaborative consensus based processes, an open, pragmatic software license
and a desire to create high quality software that leads the way in its field.
Apache Lucene, Apache Solr, Apache PyLucene, Apache Open Relevance Project and
their respective logos are trademarks of The Apache Software Foundation. All
other marks mentioned may be trad [...]
+ </p>
+ <p>
+ <a target="_blank"
href="https://www.apache.org/events/current-event.html">
+ <img src="https://www.apache.org/events/current-event-234x60.png"/>
+ </a>
+ </p>
+ </div>
+ </div>
+</section>
+{% endblock content_inner %}
diff --git a/themes/solr/templates/operator/logos-and-assets.html
b/themes/solr/templates/operator/logos-and-assets.html
new file mode 100644
index 0000000..e963bfa
--- /dev/null
+++ b/themes/solr/templates/operator/logos-and-assets.html
@@ -0,0 +1,64 @@
+{% extends "operator/fullwidth.html" %}
+
+{% block hero_header_inner %}
+<div class="large-12 columns">
+ <div class="annotation">
+ Apache Solr Operator<sup>™</sup> {{ SOLR_OPERATOR_LATEST_RELEASE }}
+ </div>
+ <h1>Solr Operator Logos and Assets</h1>
+ <p>The Solr Operator's identity system: a style guide, icons, and logos</p>
+ <div class="down-arrow"><a data-scroll href="#top"><i class="fa
fa-angle-down fa-2x red"></i></a></div>
+</div>
+{% endblock %}
+
+{% block content_inner %}
+<section class="gray offset-small" id="top"></section>
+<section class="gray">
+ <div class="row">
+ <div class="small-12 columns">
+ <h3 class="asset-download">Download the <a href="{{ SITEURL
}}/theme/images/identity/Solr_Styleguide.pdf">Solr Style Guide</a> (PDF
format)</h3>
+ <h3 class="asset-download">Download the <a href="{{ SITEURL
}}/theme/images/identity/Solr_Icons.pdf">Solr Icons</a> (editable PDF
format)</h3>
+ </div>
+ </div>
+</section>
+
+<section class="gray col-4">
+ <div class="row">
+ <ul class="small-block-grid-1 medium-block-grid-3">
+ <li>
+ <div class="box logo-box">
+ <h3>Solr logo on orange</h3>
+ <p>PNG format, 1692x855</p>
+ <div class="img logo-container orange-background">
+ <img class="resizeable-solr-logo" alt="Solr Logo on orange (PNG
format, 1692x855)"
+ src="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_orange.png"/>
+ </div>
+ <br />
+ <p>Download editable PDF format <a href="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_orange.pdf">here</a></p>
+ </li>
+ <li>
+ <div class="box logo-box">
+ <h3 class="fixed-wrap-point-logo-title">Solr logo on white</h3>
+ <p>PNG format, 1692x855</p>
+ <div class="img logo-container white-background">
+ <img class="resizeable-solr-logo" alt="Solr Logo on white (PNG
format, 1692x855)"
+ src="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_white.png"/>
+ </div>
+ <br />
+ <p>Download editable PDF format <a href="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_white.pdf">here</a></p>
+ </li>
+ <li>
+ <div class="box logo-box">
+ <h3 class="fixed-wrap-point-logo-title">Solr logo on black</h3>
+ <p>PNG format, 1692x855</p>
+ <div class="img" style="background-color:#000; padding:20px;
height:auto; width:auto">
+ <img class="resizeable-solr-logo" alt="Solr Logo on black (PNG
format, 1692x855)"
+ src="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_black.png"/>
+ </div>
+ <br />
+ <p>Download editable PDF format <a href="{{ SITEURL
}}/theme/images/identity/Solr_Logo_on_black.pdf">here</a></p>
+ </li>
+ </ul>
+ </div>
+</section>
+{% endblock content_inner %}
diff --git a/themes/solr/templates/operator/news.html
b/themes/solr/templates/operator/news.html
new file mode 100644
index 0000000..ff19fbe
--- /dev/null
+++ b/themes/solr/templates/operator/news.html
@@ -0,0 +1,32 @@
+{% extends "operator/page.html" %}
+
+{% block ng_directives %}x-ng-app-root="/solr/operator"{% endblock %}
+{% block rss %}<link rel="alternate" type="application/atom+xml" title="Solr
Operator news" href="/feeds/solr/operator/news.atom.xml" />{% endblock %}
+
+{% block content_inner %}
+<div class="small-12 columns">
+
+ <style type="text/css">
+ .headerlink, .elementid-permalink {
+ visibility: hidden;
+ }
+ h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink,
h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink,
dt:hover > .elementid-permalink {
+ visibility: visible;
+ }
+ h2 {
+ /* Avoid news title being hidden behind header when linked by anchor
link */
+ padding-top: 70px;
+ margin-top: -70px;
+ }
+ </style>
+ <h1 id="solr-operator-news">Solr Operator<sup>™</sup> News<a
class="headerlink" href="#solr-operator-news" title="Permanent link">¶</a></h1>
+ {{page.content}}
+
+ {% for article in (articles | selectattr("category.name", "in",
['solr/operator/news'])|list) %}
+ <h2 id="{{ article.slug }}">{{ article.locale_date }}, {{ article.title }}
+ <a class="headerlink" href="#{{article.slug}}" title="Permanent link">¶</a>
+ </h2>
+ {{article.content}}
+ {% endfor %}
+</div>
+{% endblock content_inner %}
diff --git a/themes/solr/templates/operator/page.html
b/themes/solr/templates/operator/page.html
new file mode 100644
index 0000000..df892d3
--- /dev/null
+++ b/themes/solr/templates/operator/page.html
@@ -0,0 +1,11 @@
+{% extends "operator/base.html" %}
+
+{% block content %}
+<div class="container">
+ {% block subnav %}
+ {% endblock %}
+ <div class="row">
+ {% block content_inner %}{{ page.content }}{% endblock %}
+ </div>
+</div>
+{% endblock %}
diff --git a/themes/solr/templates/operator/resources.html
b/themes/solr/templates/operator/resources.html
new file mode 100644
index 0000000..fc4395e
--- /dev/null
+++ b/themes/solr/templates/operator/resources.html
@@ -0,0 +1,10 @@
+{% extends "operator/subnav.html" %}
+
+{% block subnav_title %}Resources{% endblock %}
+{% block subnav_subtitle %}Find everything you need about the Solr
Operator<sup>™</sup> here.{% endblock %}
+{% block subnav_nav_items %}
+<dd><a data-scroll href="#tutorials">Tutorials</a></dd>
+<dd><a data-scroll href="#documentation">Docs</a></dd>
+<dd><a data-scroll href="#presentations">Presentations</a></dd>
+<dd><a data-scroll href="#videos">Videos</a></dd>
+{% endblock %}
diff --git a/themes/solr/templates/operator/subnav.html
b/themes/solr/templates/operator/subnav.html
new file mode 100644
index 0000000..0ce2a01
--- /dev/null
+++ b/themes/solr/templates/operator/subnav.html
@@ -0,0 +1,20 @@
+{% extends "operator/page.html" %}
+
+{% block subnav %}
+<div class="row">
+ <div class="small-12 text-center columns">
+ <h1>{% block subnav_title %}{% endblock %}<br/>
+ <small>{% block subnav_subtitle %}{% endblock %}</small></h1>
+ </div>
+</div>
+<div class="sub-nav-container">
+ <div class="row sub-nav-border anchor-top">
+ <div class="small-12 text-center columns">
+ <dl class="sub-nav">
+ {% block subnav_nav_items %}
+ {% endblock %}
+ </dl>
+ </div>
+ </div>
+</div>
+{% endblock %}