Merge pull request #60 from fpapon/APACHECON
Add ApacheCon@Home track news
diff --git a/index.html b/index.html
index 2e5684e..95a055f 100644
--- a/index.html
+++ b/index.html
@@ -29,6 +29,13 @@
<div class="carousel-item active">
<div class="container">
<div class="carousel-caption">
+ <p><strong>ApacheCon 2020 @Home! (29/9/20)</strong> - Karaf is coming to your living room this September!. (<a href="/news.html">Details</a>)</p>
+ </div>
+ </div>
+ </div>
+ <div class="carousel-item">
+ <div class="container">
+ <div class="carousel-caption">
<p><strong>Karaf Cellar 4.2.1 has been released! (21/8/20)</strong> - This is a new major release for Apache Cellar 4.2.x, containing bug fixes and improvements. (<a href="/news.html">Details</a>)</p>
</div>
</div>
@@ -61,13 +68,6 @@
</div>
</div>
</div>
- <div class="carousel-item">
- <div class="container">
- <div class="carousel-caption">
- <p><strong>Karaf Decanter 2.3.0 has been released! (6/4/20)</strong> - This is the first minor release for Apache Decanter 2.3.x, containing bug fixes and improvements. (<a href="/news.html">Details</a>)</p>
- </div>
- </div>
- </div>
</div>
</div>
@@ -266,7 +266,7 @@
<div class="col-md-5 align-items-center">
<img class="featurette-image img-fluid mx-auto" src="/images/apache.png" alt="Apache"><br><br><br>
<a href="https://www.apache.org/events/current-event.html" target="_blank">
- <img class="featurette-image img-fluid mx-auto" src="https://svn.apache.org/repos/infra/apachecon/www.apachecon.com/images/landingpage/events/acna19.png" alt="ApacheCon" />
+ <img class="featurette-image img-fluid mx-auto" src="https://www.apache.org/events/current-event-234x60.png" alt="ApacheCon" />
</a>
</div>
</div>
diff --git a/news.html b/news.html
index 264f788..1eba0e1 100644
--- a/news.html
+++ b/news.html
@@ -13,11 +13,13 @@
<div class="card-body d-flex flex-column align-items-start">
<strong class="d-inline-block mb-2 text-primary"><i class="fas fa-globe"></i> World</strong>
<h3 class="mb-0">
- <a class="text-dark">Apache Karaf European Meetup</a>
+ <a class="text-dark">ApacheCon 2020 @Home</a>
</h3>
<div class="mb-1 text-muted">September 29, 2020</div>
- <p class="card-text mb-auto">Join the Apache Karaf track during ApacheCon @Home !</p>
- <a href="https://www.apachecon.com/acna2020/index.html" target="_blank">ApacheCon 2020 @Home</a>
+ <p class="card-text mb-auto">Join the Apache Karaf track during ApacheCon @Home!</p>
+ <a href="https://apachecon.com/acah2020/tracks/karaf.html" target="_blank">Karaf Track</a><br>
+ <a href="https://hopin.to/events/apachecon-home" target="_blank">Register</a><br>
+ <a href="https://www.apachecon.com/acna2020/index.html" target="_blank">Learn more</a>
</div>
</div>
</div>
