This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-events-site.git
The following commit(s) were added to refs/heads/main by this push:
new 33893d0 Trailing spaces
33893d0 is described below
commit 33893d0aa8c258a5d6889fbd05a176404986867a
Author: Sebb <[email protected]>
AuthorDate: Wed May 24 17:13:51 2023 +0100
Trailing spaces
---
Jenkinsfile | 8 ++++----
README.md | 8 ++++----
source/about/apachecon/__index.md | 14 +++++++-------
source/about/apachecon/playbook.md | 20 ++++++++++----------
source/about/apachecon/volunteer.md | 14 +++++++-------
source/event/__index.md | 2 +-
source/event/calendar.md | 2 +-
source/involved/__index.md | 6 +++---
source/organize/__index.md | 6 +++---
source/organize/logos/__index.md | 4 ++--
source/organize/roadshow.md | 2 +-
source/x/current-event.md | 4 ++--
static/.htaccess | 4 ++--
static/js/events-calendar.js | 4 ++--
static/style/screen.css | 4 ++--
15 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 22523bc..9140a90 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
//
https://cwiki.apache.org/confluence/display/INFRA/ci-builds.apache.org
label 'git-websites'
}
-
+
environment {
DEPLOY_BRANCH = "${env.BRANCH_NAME == "main" ? "asf-site" :
"${env.BRANCH_NAME}-staging"}"
HUGO_VERSION = '0.111.3'
@@ -89,7 +89,7 @@ pipeline {
env.TMP_DIR = sh(script:'mktemp -d', returnStdout:
true).trim()
env.OUT_DIR = "${env.TMP_DIR}/content"
sh "mkdir -p ${env.OUT_DIR}"
-
+
}
}
}
@@ -117,7 +117,7 @@ pipeline {
not {
branch '*'
}
- }
+ }
}
steps {
@@ -160,7 +160,7 @@ pipeline {
}
}
}
-
+
post {
always {
script {
diff --git a/README.md b/README.md
index 114e9bc..3e84471 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-<!--
+<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
@@ -19,7 +19,7 @@ limitations under the License.
This is the source code for the website of the [Apache Events
website](https://events.apache.org/), hosted at:
https://events.apache.org/
-
+
To get in touch with the Community Development PMC (responsible for the
website) please use the
[[email protected]](https://lists.apache.org/[email protected])
mailing list.
The repository for the main Community Development website is at
https://github.com/apache/comdev-site
@@ -41,7 +41,7 @@ Other Apache websites that are built with Hugo should be
listed by [this GitHub
To generate the static website, execute `hugo` to generate the website under
target/content.
-During development, it may be useful to run an incremental build. For this to
work, execute `hugo server -D` to
+During development, it may be useful to run an incremental build. For this to
work, execute `hugo server -D` to
continuously (re)generate and serve the website on `localhost:1313`.
# How-To add an ApacheCon event promotion to your project site
diff --git a/source/about/apachecon/__index.md
b/source/about/apachecon/__index.md
index 8bf8d03..b46f994 100644
--- a/source/about/apachecon/__index.md
+++ b/source/about/apachecon/__index.md
@@ -8,9 +8,9 @@ Its primary goals are education and community building. We try
to
produce one each calendar year somewhere in North America and Europe,
and are working on expanding this to the rest of the world.
-If you want to volunteer to help with ApacheCon, please
-[join our mailing lists](/involved/mailing-lists.html),
-and see what [volunteer opportunities](/about/apachecon/volunteer.html) we
have,
+If you want to volunteer to help with ApacheCon, please
+[join our mailing lists](/involved/mailing-lists.html),
+and see what [volunteer opportunities](/about/apachecon/volunteer.html) we
have,
bearing in mind that it sometimes gets out of date.
## What Is An ApacheCon?
@@ -25,7 +25,7 @@ are some components that you can count on happening at every
ApacheCon.
way, ApacheCon resembles a convention of Apache project conferences.
- There will be a hackathon space where projects can gather to work on
code, or work out community issues.
- - There will be a **State of the Feather** Keynote by the President or
+ - There will be a **State of the Feather** Keynote by the President or
other officer, providing an overview of the ASF's accomplishments.
- There will be a PGP key signing.
- An Apache BarCamp will held, typically on the day before or after the
@@ -33,12 +33,12 @@ are some components that you can count on happening at
every ApacheCon.
- The event is usually 3 days or more.
ApacheCon is the one annual event for the particular continent in
-question. As such, it draws an international audience, both in
+question. As such, it draws an international audience, both in
speakers and attendees.
The documentation around how to plan an ApacheCon may be found in the
-[ApacheCon Playbook](/about/apachecon/playbook.html). Most planning tasks
-are done by volunteers who commit to help - at least a little - throughout
+[ApacheCon Playbook](/about/apachecon/playbook.html). Most planning tasks
+are done by volunteers who commit to help - at least a little - throughout
the planning process for one specific conference.
You can find out more about what ApacheCon events are in the works on
diff --git a/source/about/apachecon/playbook.md
b/source/about/apachecon/playbook.md
index bee76b0..6fc6715 100644
--- a/source/about/apachecon/playbook.md
+++ b/source/about/apachecon/playbook.md
@@ -2,8 +2,8 @@
title: ApacheCon playbook
---
-This playbook is focused at ApacheCon or Roadshow volunteers who are
-actively involved in planning and running Apache events. Please be sure
+This playbook is focused at ApacheCon or Roadshow volunteers who are
+actively involved in planning and running Apache events. Please be sure
to bring your questions to the planners@ mailing list!
# What to do before, during, and after an Apache event
@@ -23,9 +23,9 @@ This is a work in progress - please feel free to make
suggestions!
## Before You Start
-Review the Event Branding Policy and secure permission for any
+Review the Event Branding Policy and secure permission for any
events not produced directly by the ASF or its contracted producer(s).
-If you are an Apache PMC running your own event, please review the
+If you are an Apache PMC running your own event, please review the
policy to ensure you're presenting the best face for ASF brands.
https://www.apache.org/foundation/marks/events
@@ -43,7 +43,7 @@ policy to ensure you're presenting the best face for ASF
brands.
network drop for reg desk.
* Room for media training - consult with [ASF Marketing &
Publicity](//www.apache.org/press/#contact)
* Board room for monthly board meeting (if the conference falls [during
board meeting](//www.apache.org/foundation/board/calendar)). Consult with
- [email protected]
+ [email protected]
* Communication
* Notify members@, commiters@ and all dev@ and users@ lists of an
@@ -58,7 +58,7 @@ policy to ensure you're presenting the best face for ASF
brands.
- Establish budget for paid digital ad campaign for Roadshows three months
before date of event.
- - Coordinate with M&P to research spend options, negotiate rate, and secure
media buy for digital advertising campaigns for Roadshows.
+ - Coordinate with M&P to research spend options, negotiate rate, and secure
media buy for digital advertising campaigns for Roadshows.
- Coordinate with M&P/Central Services to create artwork for online
promotions and digital ad campaigns.
@@ -139,7 +139,7 @@ policy to ensure you're presenting the best face for ASF
brands.
publicly for sponsoring (coordinate with producer/fundraising)
* Twitter
* Blog post on blogs.apache.org
- * Ask PMCs about upcoming or recent major releases that we can
+ * Ask PMCs about upcoming or recent major releases that we can
announce at the event. Keep [email protected] in the loop on this,
as well as our press contact at producer.
* Update the wiki - https://wiki.apache.org/apachecon/FrontPage -
@@ -199,19 +199,19 @@ policy to ensure you're presenting the best face for ASF
brands.
## Websites
-There are several different pages/directories that store event-related
+There are several different pages/directories that store event-related
information, both about ApacheCon and other ASF related events.
Main ApacheCon website, including separate archive.apachecon directories:
https://apachecon.com/
https://svn.apache.org/repos/infra/apachecon/www.apachecon.com
Flat HTML, published instantly upon checkin
-
+
General event info page:
https://events.apache.org/
https://svn.apache.org/repos/asf/concom/site/trunk/content/
Managed by the Apache CMS, publishing is a separate step
-
+
ComDev Event Calendar listing:
https://community.apache.org/calendars/
https://community.apache.org/about/#about-this-website
diff --git a/source/about/apachecon/volunteer.md
b/source/about/apachecon/volunteer.md
index c5e2528..fb79f97 100644
--- a/source/about/apachecon/volunteer.md
+++ b/source/about/apachecon/volunteer.md
@@ -16,17 +16,17 @@ At this time, we can use help in the following areas -
typically for each Apache
## Calls For Papers
-The CFP for each ApacheCon draws hundreds of submissions about projects all
-around the ASF. We always need volunteers who can show up **on time**
+The CFP for each ApacheCon draws hundreds of submissions about projects all
+around the ASF. We always need volunteers who can show up **on time**
when the CFP closes to help rate talks and schedule specific tracks.
-Many Apache PMCs are now managing their own tracks or co-located events
+Many Apache PMCs are now managing their own tracks or co-located events
at ApacheCon, which is great.
## Promotions and Publicity
-While the ApacheCon Planners work with VP, Marketing & Publicity for some
-basic services, we always could use Apache committers retweeting and
-amplifying the official notices about conferences.
+While the ApacheCon Planners work with VP, Marketing & Publicity for some
+basic services, we always could use Apache committers retweeting and
+amplifying the official notices about conferences.
Follow [@ApacheCon](https://twitter.com/apachecon) and
[@TheASF](https://twitter.com/apachecon), and help spread their message about
upcoming events.
@@ -52,7 +52,7 @@ Preferably someone that lives local to the venue: Update the
website to indicate
Identify people that can participate in a "meet the experts" area. Determine
what this entails. Coordinate scheduling of this event with Producer and VP
Conferences. Promote the event.
## Lightning Talks
-
+
* Write up web page defining the lightning talks
* Promote the lightning talks to our community
* Work with LightningTalk MCs to pre-register volunteers that want to speak<
diff --git a/source/event/__index.md b/source/event/__index.md
index d499748..9c34467 100644
--- a/source/event/__index.md
+++ b/source/event/__index.md
@@ -6,7 +6,7 @@ slug: index
## Upcoming Apache events
This is the list of upcoming official Apache events, and
-those events which have been approved to use Apache Marks under the
+those events which have been approved to use Apache Marks under the
[Third Party Event Branding Policy][1].
<ul id="events">
diff --git a/source/event/calendar.md b/source/event/calendar.md
index bccd542..f4207bc 100644
--- a/source/event/calendar.md
+++ b/source/event/calendar.md
@@ -2,7 +2,7 @@
title: Apache Conferences Calendar
---
-This Calendar is maintained by the [Apache Conferences Committee][1] (ConCom).
It's used to list official Apache events, and
+This Calendar is maintained by the [Apache Conferences Committee][1] (ConCom).
It's used to list official Apache events, and
those events which have been approved to use Apache Marks under the [Third
Party Event Branding Policy][2].
<iframe
src="https://www.google.com/calendar/embed?src=nerseigospses068jd57bk5ar8%40group.calendar.google.com&ctz=America/New_York";
diff --git a/source/involved/__index.md b/source/involved/__index.md
index 21f6e3d..7dd1f1e 100644
--- a/source/involved/__index.md
+++ b/source/involved/__index.md
@@ -5,11 +5,11 @@ slug: index
There are a number of different ways to get involved with Events at Apache.
Many of these come under the umbrella of the Conferences Committee, but
-some fall under different groups, such as the
+some fall under different groups, such as the
[Apache Community Development Project](https://community.apache.org/).
If you are an Apache Committer, and you're interested in putting on an
-Apache Event, please see the [Organising Events](/organize/index.html)
+Apache Event, please see the [Organising Events](/organize/index.html)
section for more help. If you are interested in helping others out with
putting on an Apache Event, you are advised to join the appropriate
[mailing list](mailing-lists.html), and volunteer for events there.
@@ -34,7 +34,7 @@ information on finding speakers.
If you are putting on an external event, and you are interested in
having an Apache track, or an Apache barcamp / hackathon style event,
-please contact
+please contact
[ConCom, the Conference
Committee](https://www.apache.org/foundation/conferences.html)
to discuss the possibility.
diff --git a/source/organize/__index.md b/source/organize/__index.md
index a2278e2..160fbc6 100644
--- a/source/organize/__index.md
+++ b/source/organize/__index.md
@@ -4,13 +4,13 @@ slug: index
---
If you want to host your own Apache project event, or propose a
-[roadshow](/about/roadshow.html) about the ASF, get in touch with us on the
[Event Planning
+[roadshow](/about/roadshow.html) about the ASF, get in touch with us on the
[Event Planning
mailing list](mailto:[email protected]).
-**Important!** While we appreciate other parties producing events to tell the
world about
+**Important!** While we appreciate other parties producing events to tell the
world about
our many great Apache projects and communities, [Apache trademarks and
brands](https://whimsy.apache.org/brand/list)
are also important to us. To use any Apache trademarks in conjunctions with
events,
-you **must** request permission by following the
+you **must** request permission by following the
[Third Party Event Branding
Policy](https://www.apache.org/foundation/marks/events.html).
* [Organizing a Roadshow event](roadshow)
diff --git a/source/organize/logos/__index.md b/source/organize/logos/__index.md
index e3bf5f4..9655498 100644
--- a/source/organize/logos/__index.md
+++ b/source/organize/logos/__index.md
@@ -11,7 +11,7 @@ please see the
[Third Party Event Branding
Policy](https://www.apache.org/foundation/marks/events.html).
For events that have been approved to use Apache Logos (typically
-events being [organized](/organize/) by Apache committers and projects,
+events being [organized](/organize/) by Apache committers and projects,
which have been approved by ConCom), a number of Event Logos are
available. Some of these can be used as-is by approved events,
others provide a useful starting point when designing logos, especially
@@ -24,7 +24,7 @@ for print.
High resolution and Vector Graphics versions of the Foundation Logo
are available from the [Foundation Press Kit
Page](https://www.apache.org/foundation/press/kit/)
-## Apache Feather
+## Apache Feather
<img src="https://www.apache.org/images/feather-small.gif"; alt="Apache
Feather" />
diff --git a/source/organize/roadshow.md b/source/organize/roadshow.md
index 5d7e227..db3a2c6 100644
--- a/source/organize/roadshow.md
+++ b/source/organize/roadshow.md
@@ -27,5 +27,5 @@ To run a roadshow or other small event without ASF budget,
you only need to:
* Follow our branding guidelines -
https://www.apache.org/foundation/marks/events
* [Tell us about it](mailto:[email protected])
-* Have an Apache member involved in the planning
+* Have an Apache member involved in the planning
diff --git a/source/x/current-event.md b/source/x/current-event.md
index 059fabc..b92b338 100644
--- a/source/x/current-event.md
+++ b/source/x/current-event.md
@@ -11,8 +11,8 @@ title: ApacheCon Events
var m = ref.match(/https?:\/\/([-_a-zA-Z0-9.]+)\/?/);
if (m) {
ref = m[1];
- } else {
- ref = 'unknown';
+ } else {
+ ref = 'unknown';
}
location.href = "https://apachecon.com/?ref="; + ref;
</script>
diff --git a/static/.htaccess b/static/.htaccess
index 78d6087..b5e496d 100644
--- a/static/.htaccess
+++ b/static/.htaccess
@@ -1,6 +1,6 @@
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
+# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
diff --git a/static/js/events-calendar.js b/static/js/events-calendar.js
index f7a5c35..99b3094 100644
--- a/static/js/events-calendar.js
+++ b/static/js/events-calendar.js
@@ -17,7 +17,7 @@ if (!events) {
// Options
var now = (new Date()).toISOString();
-var opts = "?key=" + API_KEY
+var opts = "?key=" + API_KEY
+ "&timeMin=" + now
+ "&singleEvents=true"
+ "&orderBy=startTime"
@@ -34,7 +34,7 @@ $.ajax({
var el = response['items'];
let reg = /T.*$/;
let official = /(ApacheCon|Roadshow)/;
- if (el.length > 0) {
+ if (el.length > 0) {
for (i = 0; i < el.length; i++) {
var ev = el[i];
var when = ev.start.dateTime;
diff --git a/static/style/screen.css b/static/style/screen.css
index f914178..22f62c8 100644
--- a/static/style/screen.css
+++ b/static/style/screen.css
@@ -139,7 +139,7 @@ h1,h2,h3,h4,h5,h6 {
}
#navigation li {
- border-bottom: 1px solid #e6ebed;
+ border-bottom: 1px solid #e6ebed;
margin: 0.2em 0;
padding: 0;
}
@@ -181,7 +181,7 @@ dt {
}
/* tables */
-thead tr, thead th,
+thead tr, thead th,
tbody tr, tbody td {
margin: 0;
outline: 0 none;
![https://www.apache.org/images/feather-small.gif"](https://www.apache.org/images/feather-small.gif"){kind=link}