You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/04/27 08:16:30 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2728] ApacheCon banner is fixed, link to privacy policy is added
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new df0a1f7ce [OPENMEETINGS-2728] ApacheCon banner is fixed, link to privacy policy is added
df0a1f7ce is described below
commit df0a1f7ce91bb5d44b5eec231bcc6485018e5e59
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 27 15:16:19 2022 +0700
[OPENMEETINGS-2728] ApacheCon banner is fixed, link to privacy policy is added
---
openmeetings-server/src/site/resources/css/site.css | 7 +------
openmeetings-server/src/site/resources/js/site.js | 21 +++++++++++----------
openmeetings-server/src/site/site.xml | 1 +
openmeetings-server/src/site/xdoc/index.xml | 4 +---
src/site/site.xml | 12 ++++++++++--
5 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/openmeetings-server/src/site/resources/css/site.css b/openmeetings-server/src/site/resources/css/site.css
index e8f6de2b5..c97c559b7 100644
--- a/openmeetings-server/src/site/resources/css/site.css
+++ b/openmeetings-server/src/site/resources/css/site.css
@@ -8,12 +8,7 @@ iframe {
min-height: 700px;
}
.apachecon-banner {
- float: left;
- margin: 5px;
-}
-.apachecon-banner.bannerRight img {
- max-width: 250px;
- height: initial !important;
+ margin: 5px;
}
.bannerRight img, .bannerLeft img {
height: 80px !important;
diff --git a/openmeetings-server/src/site/resources/js/site.js b/openmeetings-server/src/site/resources/js/site.js
index 328a71146..9d0680dd2 100644
--- a/openmeetings-server/src/site/resources/js/site.js
+++ b/openmeetings-server/src/site/resources/js/site.js
@@ -19,15 +19,16 @@
*/
$(document).ready(function() {
// "New" markers
- var topics = ["Call For Logo", "REST API Swagger"];
- for (var i = 0; i < topics.length; ++i) {
- $('ul.nav li a[title="' + topics[i] + '"').append(' <span class="badge badge-success">New</span>')
+ ["Call For Logo", "REST API Swagger"].forEach(
+ topic => $('ul.nav li a[title="' + topic + '"').append(' <span class="badge badge-success">New</span>')
+ );
+ // "ApacheCon" banner on the right
+ $('.header .bannerRight').parent()
+ .append($('<div class="float-right">')
+ .append($('<a class="apachecon-banner bannerRight acevent" data-format="wide" data-width="250"></a>')));
+ const banners = $('.acevent>img');
+ if (banners.length !== 2) {
+ banners.remove();
+ render_snippet();
}
- // "ACNA" banner on the right
- $('.header .bannerRight').parent().append(
- $('<div class="float-right">')
- .append($('<a href="https://www.apache.org/events/current-event" class="apachecon-banner bannerRight">')
- .append($('<img src="https://www.apache.org/events/current-event-234x60.png">'))
- )
- );
})
diff --git a/openmeetings-server/src/site/site.xml b/openmeetings-server/src/site/site.xml
index 5da64f639..12ba8afed 100644
--- a/openmeetings-server/src/site/site.xml
+++ b/openmeetings-server/src/site/site.xml
@@ -137,6 +137,7 @@
</index>
</pages>
<endContent>
+ <script src="https://www.apachecon.com/event-images/snippet.js"></script>
<script type="text/javascript" src="$resourcePath/js/site.js"></script>
<script type="text/javascript" src="$resourcePath/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="$resourcePath/js/netcalc.js"></script>
diff --git a/openmeetings-server/src/site/xdoc/index.xml b/openmeetings-server/src/site/xdoc/index.xml
index 4f417c73b..3b83cd7ae 100644
--- a/openmeetings-server/src/site/xdoc/index.xml
+++ b/openmeetings-server/src/site/xdoc/index.xml
@@ -139,9 +139,7 @@
<div class="row">
<div class="col-md-1"></div>
<div class="col-md-8">
- <a href="https://www.apache.org/events/current-event">
- <img alt="ASF Current Events" src="https://www.apache.org/events/current-event-234x60.png"/>
- </a>
+ <a href="#" class="acevent" data-format="wide" data-width="250"></a>
</div>
</div>
</div>
diff --git a/src/site/site.xml b/src/site/site.xml
index b97703a2a..3449e089f 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -75,9 +75,17 @@
<highlightJs>true</highlightJs>
<highlightJsTheme>github</highlightJsTheme>
<endContent>
+ <script src="https://www.apachecon.com/event-images/snippet.js"></script>
<script type="text/javascript" src="$resourcePath/js/site.js"></script>
- <p class="text-center">Apache OpenMeetings, OpenMeetings, Apache, the Apache feather, and the Apache OpenMeetings project logo</p>
- <p class="text-center">are trademarks of the Apache Software Foundation.</p>
+ <div class="text-center">
+ Apache OpenMeetings, OpenMeetings, Apache, the Apache feather, and the Apache OpenMeetings project logo
+ </div>
+ <div class="text-center">
+ are trademarks of the Apache Software Foundation.
+ </div>
+ <div class="text-center">
+ <a href="https://privacy.apache.org/policies/privacy-policy-public.html">Privacy policy</a>
+ </div>
</endContent>
</reflowSkin>
</custom>