You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2020/02/17 09:28:39 UTC
[lucene-site] branch master updated: LUCENE-9198 Remove news
section from TLP website (#11)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-site.git
The following commit(s) were added to refs/heads/master by this push:
new 2f49fd9 LUCENE-9198 Remove news section from TLP website (#11)
2f49fd9 is described below
commit 2f49fd92b58711c0972f214ced1100049bcf8e17
Author: Jan Høydahl <ja...@users.noreply.github.com>
AuthorDate: Mon Feb 17 10:28:31 2020 +0100
LUCENE-9198 Remove news section from TLP website (#11)
* LUCENE-9198 Remove news section from TLP website
Solr news: Show all in one page, fix anchor on mouse hover
Add link to TLP news in main sidebar
---
content/pages/index.md | 7 ---
content/pages/pylucene/news.md | 6 +++
themes/lucene/static/css/lucene/global.css | 28 ++++++++----
themes/lucene/static/javascript/solr/main.js | 1 +
themes/lucene/templates/lucene/tlp/_sidebar.html | 1 +
themes/lucene/templates/lucene/tlp/index.html | 58 ++++++++++++++++++------
themes/lucene/templates/solr/news.html | 16 +++----
7 files changed, 79 insertions(+), 38 deletions(-)
diff --git a/content/pages/index.md b/content/pages/index.md
index 80f52bc..78b1684 100644
--- a/content/pages/index.md
+++ b/content/pages/index.md
@@ -2,10 +2,3 @@ Title: Welcome to Apache Lucene
URL: index.html
save_as: index.html
Template: lucene/tlp/index
-
-The Apache Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> project develops open-source search software, including:
-
-
-- *[Lucene Core](./core/)*, our flagship sub-project, provides Java-based indexing and search technology, as well as spellchecking, hit highlighting and advanced analysis/tokenization capabilities.
-- *[Solr](./solr)*<span style="vertical-align: super; font-size: xx-small">TM</span> is a high performance search server built using Lucene Core, with XML/HTTP and JSON/Python/Ruby APIs, hit highlighting, faceted search, caching, replication, and a web admin interface.
-- [PyLucene](./pylucene/index.html) is a Python wrapper around the Core project.
diff --git a/content/pages/pylucene/news.md b/content/pages/pylucene/news.md
new file mode 100644
index 0000000..a2f15ab
--- /dev/null
+++ b/content/pages/pylucene/news.md
@@ -0,0 +1,6 @@
+Title: PyLucene news
+URL: pylucene/news.html
+save_as: pylucene/news.html
+template: lucene/pylucene/news
+slug: pylucene-news
+
diff --git a/themes/lucene/static/css/lucene/global.css b/themes/lucene/static/css/lucene/global.css
index a58f56f..06a5391 100644
--- a/themes/lucene/static/css/lucene/global.css
+++ b/themes/lucene/static/css/lucene/global.css
@@ -559,17 +559,17 @@ input.button {
#col1 {
float: left;
- width: 260px;
+ width: 349px;
padding: 0;
- margin: 20px 0 0 20px;
+ margin: 20px 0 0 10px;
display: inline;
}
#col2 {
float: left;
- width: 260px;
+ width: 349px;
padding: 0;
- margin: 20px 0 0 20px;
+ margin: 20px 0 0 10px;
display: inline;
}
@@ -713,7 +713,6 @@ input.button {
margin-left: 20px;
}
-
/********************************
Content Styles
********************************/
@@ -918,7 +917,7 @@ body#home #header #slides .mantle{
body#home #col1 {
float: left;
- width: 260px;
+ width: 340px;
padding: 0;
margin: 5px 0 0 0px;
display: inline;
@@ -926,9 +925,9 @@ body#home #col1 {
body#home #col2 {
float: left;
- width: 260px;
+ width: 340px;
padding: 0;
- margin: 5px 0 0 20px;
+ margin: 5px 0 0 10px;
display: inline;
}
@@ -948,6 +947,19 @@ body#home #col2 {
display:inline;
}
+/* Lucene and Solr logos on TLP front page */
+.front-logo-container {
+ height:110px;
+ position: relative;
+ background: none;
+}
+
+.front-logo-container img {
+ position: absolute;
+ left: 10px;
+ bottom: 5px;
+}
+
/*SUBPAGE - NO SIDEBAR*/
body#full #wrap {
position: relative;
diff --git a/themes/lucene/static/javascript/solr/main.js b/themes/lucene/static/javascript/solr/main.js
index b90d956..481807d 100644
--- a/themes/lucene/static/javascript/solr/main.js
+++ b/themes/lucene/static/javascript/solr/main.js
@@ -9,6 +9,7 @@
$(function() {
$('h2').addClass('offset');
+ $('.container .row .small-12 h2 ').removeClass('offset');
$('.smooth-scroll').smoothScroll({ offset: 100 })
});
diff --git a/themes/lucene/templates/lucene/tlp/_sidebar.html b/themes/lucene/templates/lucene/tlp/_sidebar.html
index 84d070e..fb2fd97 100644
--- a/themes/lucene/templates/lucene/tlp/_sidebar.html
+++ b/themes/lucene/templates/lucene/tlp/_sidebar.html
@@ -23,6 +23,7 @@
<ul>
<li><a href="https://www.apache.org/licenses/">License</a></li>
<li><a href="{{ SITEURL }}/whoweare.html">Who We are</a></li>
+ <li><a href="{{ SITEURL }}/news.html">TLP News</a></li>
</ul>
<h1 id="events">Events<a class="headerlink" href="#events" title="Permanent link">¶</a></h1>
diff --git a/themes/lucene/templates/lucene/tlp/index.html b/themes/lucene/templates/lucene/tlp/index.html
index e775fc0..ab2c46e 100644
--- a/themes/lucene/templates/lucene/tlp/index.html
+++ b/themes/lucene/templates/lucene/tlp/index.html
@@ -3,23 +3,51 @@
{% block content %}
{{ super() }}
-<h1 id="lucene-project-news">Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Project News
- <a class="headerlink" href="#lucenetm-project-news" title="Permanent link">¶</a>
-</h1>
+<p>
+ The Apache Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> project develops open-source search
+ software. The project releases a core search library, named Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> core,
+ as well as the Solr<span style="vertical-align: super; font-size: xx-small">TM</span> search server.
+</p>
-<div>
- {% for article in (articles | selectattr("category.name", "eq", "news")|list)[:3] %}
- <h2 id="{{article.slug}}">
- {{article.locale_date|title}} - {{article.title}}
- <a class="headerlink" href="#{{article.slug}}" title="Permanent link">¶</a>
- </h2>
- {{article.content}}
- {% endfor %}
+<div id="col1">
+ <div class="front-logo-container">
+ <a href="/core/">
+ <img src="/theme/images/lucene/lucene_logo_green_300.png" width="300" alt="Lucene Logo" />
+ </a>
+ </div>
+ <p><a href="/core/">Lucene Core</a> is a Java library providing powerful indexing and search features,
+ as well as spellchecking, hit highlighting and advanced analysis/tokenization capabilities. The <a href="/pylucene/">PyLucene</a>
+ sub project provides Python bindings for Lucene Core.
+ </p>
+ <h2 id="lucene-core-news">Latest Lucene Core News</h2>
+ <div>
+ {% for article in (articles | selectattr("category.name", "eq", "core/news")|list)[:3] %}
+ <p id="{{article.slug}}">
+ <a href="/core/corenews.html#{{article.slug}}">{{article.title}}</a>
+ </p>
+ {% endfor %}
+ </div>
</div>
-
-<div>
- <h3>For more see <a href url="{{ SITEURL }}/news.html"> all Lucene<span style="vertical-align: super; font-size: xx-small">TM</span> Project News</a></h3>
+<div id="col2">
+ <div class="front-logo-container">
+ <a href="/solr/">
+ <img src="/theme/images/solr/Solr_Logo_200x101.png" width="200" alt="Solr Logo" />
+ </a>
+ </div>
+ <p><a href="/solr/">Solr<span style="vertical-align: super; font-size: xx-small">TM</span></a> is a high
+ performance search server built using Lucene Core. Solr is highly scalable, providing fully fault tolerant distributed
+ indexing, search and analytics. It exposes Lucene's features through easy to use JSON/HTTP interfaces or native clients
+ for Java and other languages.
+ </p>
+ <h2 id="solr-news">Latest Solr News</h2>
+ <div>
+ {% for article in (articles | selectattr("category.name", "eq", "solr/news")|list)[:3] %}
+ <p id="{{article.slug}}">
+ <a href="/solr/news.html#{{article.slug}}">{{article.title}}</a>
+ </p>
+ {% endfor %}
+ </div>
</div>
-
+<br clear="all"/>
{% include "lucene/_asf.html" %}
{% endblock content %}
diff --git a/themes/lucene/templates/solr/news.html b/themes/lucene/templates/solr/news.html
index 99a10e7..9fd15ea 100644
--- a/themes/lucene/templates/solr/news.html
+++ b/themes/lucene/templates/solr/news.html
@@ -6,18 +6,18 @@
<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
- }
+ .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-news">Solr<sup>™</sup> News<a class="headerlink" href="#solr-news" title="Permanent link">¶</a></h1>
{{page.content}}
- {% for article in (articles | selectattr("category.name", "eq", "solr/news")|list)[:15] %}
- <h2 id="{{ article.slug }}" class="offset">{{ article.locale_date }}, {{ article.title }}
+ {% for article in (articles | selectattr("category.name", "eq", "solr/news")|list) %}
+ <h2 id="{{ article.slug }}">{{ article.locale_date }}, {{ article.title }}
<a class="headerlink" href="#{{article.slug}}" title="Permanent link">¶</a>
</h2>
{{article.content}}