Merge pull request #33 from apache/UNOMI-843
UNOMI-843 Various website fixes & improvements
diff --git a/README.md b/README.md
index 0770ec3..a5d99e3 100644
--- a/README.md
+++ b/README.md
@@ -59,8 +59,8 @@
docker run --rm \
--volume="$PWD:/srv/jekyll:Z" \
-p 4000:4000 \
- jekyll/jekyll:4.2.0 \
+ jekyll/jekyll:4.2.0 \
jekyll serve
```
-Then access to http://localhost:4000/ to access the site. Note that source changes are detected and apply automatically.
\ No newline at end of file
+Then access to http://localhost:4000/ to access the site. Note that source changes are detected and apply automatically.
diff --git a/src/main/webapp/_layouts/default.html b/src/main/webapp/_layouts/default.html
index de42fd1..9804c17 100644
--- a/src/main/webapp/_layouts/default.html
+++ b/src/main/webapp/_layouts/default.html
@@ -10,14 +10,14 @@
<title>{{ site.title }} | {{ page.title }}</title>
<!-- Google Analytics -->
+ <!-- Google tag (gtag.js) -->
+ <script async src="https://www.googletagmanager.com/gtag/js?id=G-4LJ70BXZR2"></script>
<script>
- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
- })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+ window.dataLayer = window.dataLayer || [];
+ function gtag(){dataLayer.push(arguments);}
+ gtag('js', new Date());
- ga('create', 'UA-70313240-1', 'auto');
- ga('send', 'pageview');
+ gtag('config', 'G-4LJ70BXZR2');
</script>
<!-- End Google Analytics -->
diff --git a/src/main/webapp/community/index.html b/src/main/webapp/community/index.html
index 1cbcea2..2aa3a4d 100644
--- a/src/main/webapp/community/index.html
+++ b/src/main/webapp/community/index.html
@@ -28,6 +28,12 @@
</thead>
<tbody>
<tr>
+ <td><a href="https://lists.apache.org/thread/70oo862br3d4g7j8dvnyy3o4z1p0ozfq">Monthly meeting</a></td>
+ <td>The Apache Unomi meets monthly online, with alternating times to accomodate most time zones. Current
+ status and future work is usually discussed but anyone is welcome !
+ </td>
+ </tr>
+ <tr>
<td><a target="_blank" href="https://lists.apache.org/list.html?users@unomi.apache.org">users@</a> mailing list</td>
<td>Users discussions (<a href="mailto:users-subscribe@unomi.apache.org">Subscribe</a>, <a href="mailto:users-unsubscribe@unomi.apache.org">Unsubscribe</a>)</td>
</tr>
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 3ba7be6..4645026 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -66,9 +66,9 @@
<ul>
<li>[<a href='https://issues.apache.org/jira/browse/UNOMI-822'>UNOMI-822</a>] - Add search event
</li>
- <li>[<a href='https://issues.apache.org/jira/browse/UNOMI-825'>UNOMI-825</a>] - Hide some profile properties from context request when requirered is set to with all (*)
+ <li>[<a href='https://issues.apache.org/jira/browse/UNOMI-825'>UNOMI-825</a>] - Hide some profile properties from context request when required is set to with all (*)
</li>
- <li>[<a href='https://issues.apache.org/jira/browse/UNOMI-827'>UNOMI-827</a>] - Relase Unomi-tracker 1.4.0
+ <li>[<a href='https://issues.apache.org/jira/browse/UNOMI-827'>UNOMI-827</a>] - Release Unomi-tracker 1.4.0
</li>
<li>[<a href='https://issues.apache.org/jira/browse/UNOMI-829'>UNOMI-829</a>] - Upgrade the dependencies version
</li>
@@ -177,7 +177,7 @@
<h3>Version 1.9.0 released!</h3>
<h4>Changes in 1.9.0 (since 1.8.0)</h4>
<ul>
- <li>Oneshot profiles export improved and faster</li>
+ <li>One-shot profiles export improved and faster</li>
<li>Segment recalculation job scheduling fixed</li>
<li>Profile merge system optimized to consume less memory</li>
<li>Ability to use scrolling when searching events using REST API</li>
@@ -394,7 +394,6 @@
<ul>
<li>Initial Kafka consumer support</li>
</ul>
- </p>
</div><!-- /.col-lg-8 -->
<div class="col-lg-6 my-auto mx-auto">
<img src="assets/images/apache-unomi-functionalities.png" class="img-thumbnail"
@@ -430,7 +429,6 @@
<ul>
<li>Analytics.js integration, providing an out-of-the-box ready-to-use web tracker</li>
</ul>
- </p>
</div><!-- /.col-lg-8 -->
</div><!-- /.row -->
@@ -438,7 +436,7 @@
<div class="row featurette">
<div class="col-lg-8 pl-5">
- <h3>Version 1.3.0 introduced Privacy (GPDR consent management) features</h3>
+ <h3>Version 1.3.0 introduced Privacy (GDPR consent management) features</h3>
<p>New in release 1.3.0 are features to manage visitor consents,
in order to make it easier to comply with new privacy regulations such as the <a target="_blank"
href="https://en.wikipedia.org/wiki/General_Data_Protection_Regulation">GDPR</a>.
@@ -563,14 +561,14 @@
</p>
</div>
<div class="col-md-5 align-items-center">
- <a href="http://apache.org" target="_blank">
+ <a href="https://apache.org" target="_blank">
<img class="featurette-image img-fluid mx-auto" src="assets/images/apache.png"
alt="Apache Software Foundation">
</a>
<br><br><br>
<a href="https://events.apache.org/x/current-event.html" target="_blank">
<img class="featurette-image img-fluid mx-auto"
- src="http://www.apache.org/events/current-event-234x60.png" alt="ApacheCon"/>
+ src="https://www.apache.org/events/current-event-234x60.png" alt="Community over Code"/>
</a>
</div>
</div>
diff --git a/src/main/webapp/resources.html b/src/main/webapp/resources.html
index b3170b3..0a43a72 100644
--- a/src/main/webapp/resources.html
+++ b/src/main/webapp/resources.html
@@ -37,10 +37,7 @@
in slideshare »</a>
</div>
<div class="col-md-6">
- <div class="embed-responsive embed-responsive-16by9 w-75 d-flex justify-content-center">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/ut2ReqhMl2Y?t=3687" frameborder="0"
- allow="autoplay; encrypted-media" allowfullscreen></iframe>
- </div>
+ <a class="btn btn-primary mt-3" target="_blank" href="https://www.youtube.com/watch?v=ut2ReqhMl2Y">Watch now</a>
</div>
</div>
<hr class="featurette-divider">
@@ -51,9 +48,7 @@
<a class="btn btn-primary mt-3" target="_blank" href="https://www.slideshare.net/sergehuber/apachecon-na-2018-apache-unomi-an-open-source-customer-data-platformapache-unomi-cdp-presentation">View in slideshare »</a>
</div>
<div class="col-md-6">
- <div class="embed-responsive embed-responsive-16by9 w-75 d-flex justify-content-center">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/XO1cLSgeRsw" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
- </div>
+ <a class="btn btn-primary mt-3" target="_blank" href="https://www.youtube.com/watch?v=XO1cLSgeRsw">Watch now</a>
</div>
</div>
<hr class="featurette-divider">
@@ -64,22 +59,7 @@
<a class="btn btn-primary mt-3" target="_blank" href="https://www.slideshare.net/Jahia/apache-unomi-project-indepth">View in slideshare »</a>
</div>
<div class="col-md-6">
- <div class="embed-responsive embed-responsive-16by9 w-75 d-flex justify-content-center">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/y4uNwnVMVyg" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
- </div>
- </div>
- </div>
- <hr class="featurette-divider">
- <div class="row pb-2 pt-4">
- <div class="col-md-6">
- <h6 class="pb-2 pt-2">Keynote - Introducing Apache Unomi</h6>
- <p>In his keynote, Serge Huber will provide a brief introduction to Apache Unomi, a new Apache project in incubation. Unomi is a prototype reference implementation of the OASIS Context Server specification currently being worked on by the OASIS Context Server Technical Committee. This new server provides an ethical WEM platform that provides real-time user profile and event storage as well as a rule engine and fully featured REST+JSON interfaces which make integration with Big Data systems easier.</p>
- <a class="btn btn-primary mt-3" target="_blank" href="https://www.slideshare.net/Jahia/introducing-apache-unomi">View in slideshare »</a>
- </div>
- <div class="col-md-6">
- <div class="embed-responsive embed-responsive-16by9 w-75 d-flex justify-content-center">
- <iframe width="560" height="315" src="https://www.youtube.com/embed/4gJPY-KfQ10" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
- </div>
+ <a class="btn btn-primary mt-3" target="_blank" href="https://www.youtube.com/watch?v=y4uNwnVMVyg">Watch now</a>
</div>
</div>
<hr class="featurette-divider">
