Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge staged into production #17

Merged
merged 2 commits into from
Mar 4, 2020
Merged

Merge staged into production #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cff21c
Conditionally show security warning block only if news last 60 days. …
janhoy Mar 4, 2020
d0820ef
LUCENE-9261: Change download links to new downloads.apache.org (#16)
janhoy Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@ end_of_line = lf
insert_final_newline = true
indent_style = space
charset = utf-8
indent_size = 4
indent_size = 2

[*.md]
trim_trailing_whitespace = false

[*.html]
indent_size = 2

[*.css]
indent_size = 2
1 change: 1 addition & 0 deletions themes/lucene/static/css/solr/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@ section.orange.full-width {
background-color: #cccc33;
padding-top: 10px;
padding-bottom: 0px;
display: none;
}

.security a {
Expand Down
7 changes: 6 additions & 1 deletion themes/lucene/static/javascript/solr/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
$('h2').addClass('offset');
$('.container .row .small-12 h2').removeClass('offset');
$('.security .row .large-12 h2').removeClass('offset');
$('.smooth-scroll').smoothScroll({ offset: 100 })
$('.smooth-scroll').smoothScroll({ offset: 100 });
// Conditionally show security news block
var latest_sec_days = (new Date() - new Date($('.security').attr('latest-date'))) / (1000*60*60*24);
if (latest_sec_days < 60) {
$('.security').show();
}
});

/*
Expand Down
26 changes: 13 additions & 13 deletions themes/lucene/templates/lucene/core/downloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ <h3 id="lucene-{{ LUCENE_LATEST_RELEASE | replace(".", "") }}">Lucene {{ LUCENE_
<ul>
<li>Source release:
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz">lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}-src.tgz.sha512">SHA512</a>]
</li>

<li>Binary releases:
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz">lucene-{{ LUCENE_LATEST_RELEASE }}.tgz</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.tgz.sha512">SHA512</a>]
/
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip">lucene-{{ LUCENE_LATEST_RELEASE }}.zip</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_LATEST_RELEASE }}/lucene-{{ LUCENE_LATEST_RELEASE }}.zip.sha512">SHA512</a>]
</li>

<li><a href="{{ SITEURL }}/core/{{ LUCENE_LATEST_RELEASE | replace(".", "_") }}/changes/Changes.html">Change log</a></li>
Expand All @@ -38,24 +38,24 @@ <h3 id="lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE | replace(".", "") }}">Lucene {{
<ul>
<li>Source release:
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz">lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.sha512">SHA512</a>]
</li>

<li>Binary releases:
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz">lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.sha512">SHA512</a>]
/
<a href="https://www.apache.org/dyn/closer.lua/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip">lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip</a>
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/java/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/lucene-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.sha512">SHA512</a>]
</li>

<li><a href="{{ SITEURL }}/core/{{ LUCENE_PREVIOUS_MAJOR_RELEASE | replace(".", "_") }}/changes/Changes.html">Change log</a></li>
</ul>

<p>The above release files should be verified using the PGP signatures and the <a href="https://www.apache.org/dist/lucene/KEYS">project release KEYS</a>.
<p>The above release files should be verified using the PGP signatures and the <a href="https://downloads.apache.org/lucene/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>

Expand Down
26 changes: 13 additions & 13 deletions themes/lucene/templates/solr/downloads.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ <h2 id="solr-{{ LUCENE_LATEST_RELEASE | replace(".", "") }}">Solr {{ LUCENE_LATE
<ul>
<li>Source release:
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz">solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}-src.tgz.sha512">SHA512</a>]
</li>

<li>Binary releases:
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.tgz">solr-{{ LUCENE_LATEST_RELEASE }}.tgz</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.tgz.sha512">SHA512</a>]
/
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.zip">solr-{{ LUCENE_LATEST_RELEASE }}.zip</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.zip.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_LATEST_RELEASE }}/solr-{{ LUCENE_LATEST_RELEASE }}.zip.sha512">SHA512</a>]
</li>

<li><a href="{{ SITEURL }}/solr/{{ LUCENE_LATEST_RELEASE | replace(".", "_") }}/changes/Changes.html">Change log</a></li>
Expand All @@ -50,18 +50,18 @@ <h3 id="solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE | replace(".", "") }}">Solr {{ LUC
<ul>
<li>Source release:
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz">solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}-src.tgz.sha512">SHA512</a>]
</li>

<li>Binary releases:
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz">solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.tgz.sha512">SHA512</a>]
/
<a href="https://www.apache.org/dyn/closer.lua/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip">solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip</a>
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://www.apache.org/dist/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.sha512">SHA512</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.asc">PGP</a>]
[<a href="https://downloads.apache.org/lucene/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}/solr-{{ LUCENE_PREVIOUS_MAJOR_RELEASE }}.zip.sha512">SHA512</a>]
</li>

<li><a href="{{ SITEURL }}/solr/{{ LUCENE_PREVIOUS_MAJOR_RELEASE | replace(".", "_") }}/changes/Changes.html">Change log</a></li>
Expand All @@ -87,7 +87,7 @@ <h3 id="verify-downloads">Verify downloads
<a class="headerlink" href="#verify-downloads" title="Permanent link">&para;</a>
</h3>

<p>The above release files should be verified using the PGP signatures and the <a href="https://www.apache.org/dist/lucene/KEYS">project release KEYS</a>.
<p>The above release files should be verified using the PGP signatures and the <a href="https://downloads.apache.org/lucene/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>

Expand Down
7 changes: 3 additions & 4 deletions themes/lucene/templates/solr/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
{% block bodyclass %}homepage{% endblock %}

{% block security_warning %}
{% set num_security_news_90d = articles | selectattr("category.name", "eq", "solr/security") | selectattr("date", "age_days_lt", 90) | list | length %}
{% if num_security_news_90d > 0 %}
<section class="security">
{% set latest_sec_articles = (articles | selectattr("category.name", "eq", "solr/security") | list)[:1] %}
{% set latest_date = latest_sec_articles[0].date | strftime("%Y-%m-%d") %}
<section class="security" latest-date="{{ latest_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 Security page.</a></h2>
</div>
</div>
</section>
{% endif %}
{% endblock %}

{% block content_inner %}
Expand Down