This is an automated email from the ASF dual-hosted git repository. gmcdonald pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tac-website.git
commit f1255c8d2e6870274454ec7d1e7b899602888fb3 Author: gmcdonald <[email protected]> AuthorDate: Sun Feb 26 19:35:02 2023 +0100 uglyURLs back on, makes for more sensible and prettier! url schemes. Re-org some content --- config.toml | 2 +- layouts/_default/baseof.html | 5 +++ source/_index.md | 28 +---------------- source/{stories/index.md => events/__index.md} | 1 + source/{stories/index.md => events/current.md} | 6 ++-- source/events/previous.md | 43 ++++++++++++++++++++++++++ source/stories/{index.md => __index.md} | 1 + 7 files changed, 55 insertions(+), 31 deletions(-) diff --git a/config.toml b/config.toml index bb597b6..0933e2a 100644 --- a/config.toml +++ b/config.toml @@ -6,7 +6,7 @@ contentDir = "source" publishDir = "target/content" disablePathToLower = true -# uglyURLs = true # disable ugly +uglyURLs = true enableRobotsTXT = true disableBrowserError = true timeout = 3000 diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index bd004a0..41cb9ec 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -86,6 +86,11 @@ Events </a> <div class="dropdown-menu" aria-labelledby="eventDropdown"> + <a class="dropdown-item text-uppercase disabled" href="#">TAC Supported Events</a> + <a class="dropdown-item" href="/events/current.html">Current Events</a> + <a class="dropdown-item" href="/events/previous.html">Previous Events</a> + <div class="dropdown-divider"></div> + <a class="dropdown-item text-uppercase disabled" href="#">Related External Links</a> <a class="dropdown-item" href="https://apachecon.com/";>ApacheCon - The official event of the ASF</a> <a class="dropdown-item" href="/calendars/">Major Apache-related Events</a> <a class="dropdown-item" href="https://www.apache.org/events/meetups.html";>Upcoming Apache-related meetups</a> diff --git a/source/_index.md b/source/_index.md index b8f6868..635c20b 100644 --- a/source/_index.md +++ b/source/_index.md @@ -1,5 +1,6 @@ --- title: Travel Assistance Committee - TAC +slug: index --- <div class="jumbotron"> @@ -57,32 +58,5 @@ We've put together stories from past TAC recipients of their experiences with TA <h4>Who are TAC?</h4> <p>Please see our official committee listing.</p> </div> - <div class="col-md-auto"> - <h4>Past Events</h4> - <p>Participants attending the following events have received support from the Travel Assistance Committee: - - Fosdem 2020, Brussels, Belgium - ApacheCon EU 2019, Berlin, Germany - ApacheCon NA 2019, Las Vegas, Nevada - ApacheCon NA 2018, Montreal, Canada - ApacheCon NA 2017, Miami, Florida - ApacheCon EU 2016, Seville, Spain - ApacheCon NA 2016, Vancouver, Canada - ApacheCon EU 2015, Budapest, Hungary - ApacheCon NA 2015, Austin, Taxes - ApacheCon EU 2014, Budapest, Hungary - ApacheCon NA 2014, Denver Colorado - ApacheCon NA 2013, Portland Oregon - ApacheCon Europe 2012, Sinsheim, Germany - ApacheCon NA 2011, Vancouver - Apache Retreat Ireland 2011 - ApacheCon NA 2010, Atlanta - Apache Retreat Hursley 2010 - Apache Retreat Ireland 2010 - ApacheCon US 2009 Oakland - ApacheCon EU 2009 Amsterdam - ApacheCon US 2008 New Orleans -</p> - </div> </div> diff --git a/source/stories/index.md b/source/events/__index.md similarity index 97% copy from source/stories/index.md copy to source/events/__index.md index 660fccb..f0f9b38 100644 --- a/source/stories/index.md +++ b/source/events/__index.md @@ -1,5 +1,6 @@ --- title: Travel Assistance Committee - TAC +slug: index --- <div class="jumbotron"> diff --git a/source/stories/index.md b/source/events/current.md similarity index 71% copy from source/stories/index.md copy to source/events/current.md index 660fccb..c1ac034 100644 --- a/source/stories/index.md +++ b/source/events/current.md @@ -5,7 +5,7 @@ title: Travel Assistance Committee - TAC <div class="jumbotron"> <a href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-125x125.png"; style="float: right;"/></a> <h2>Travel Assistance Committee</h2> -<h3>Stories</h3> +<h3>Events currently being supported by TAC</h3> </div> <a name="Index-Startingpoints"></a> @@ -14,8 +14,8 @@ title: Travel Assistance Committee - TAC <!-- Row 1 --> <div class="row"> <div class="col-md-auto"> - <h4>Stories from previous successful applicants</h4> - <p>Stories coming soon!</p> + <h4>Currently supported events</h4> + <p>No events currently supported, check back regularly!</p> </div> </div> diff --git a/source/events/previous.md b/source/events/previous.md new file mode 100644 index 0000000..7a52802 --- /dev/null +++ b/source/events/previous.md @@ -0,0 +1,43 @@ +--- +title: Travel Assistance Committee - TAC +--- + +<div class="jumbotron"> +<a href="https://www.apache.org/events/current-event.html";><img src="https://www.apache.org/events/current-event-125x125.png"; style="float: right;"/></a> +<h2>Travel Assistance Committee</h2> +<h3>Past events</h3> +</div> + +<a name="Index-Startingpoints"></a> + + +<!-- Row 1 --> +<div class="row"> + <div class="col-md-auto"> + <h4>Previous events that TAC supported</h4> + <p>Fosdem 2020, Brussels, Belgium <br /> + ApacheCon EU 2019, Berlin, Germany <br /> + ApacheCon NA 2019, Las Vegas, Nevada <br /> + ApacheCon NA 2018, Montreal, Canada <br /> + ApacheCon NA 2017, Miami, Florida <br /> + ApacheCon EU 2016, Seville, Spain <br /> + ApacheCon NA 2016, Vancouver, Canada <br /> + ApacheCon EU 2015, Budapest, Hungary <br /> + ApacheCon NA 2015, Austin, Taxes <br /> + ApacheCon EU 2014, Budapest, Hungary <br /> + ApacheCon NA 2014, Denver Colorado <br /> + ApacheCon NA 2013, Portland Oregon <br /> + ApacheCon Europe 2012, Sinsheim, Germany <br /> + ApacheCon NA 2011, Vancouver <br /> + Apache Retreat Ireland 2011 <br /> + ApacheCon NA 2010, Atlanta <br /> + Apache Retreat Hursley 2010 <br /> + Apache Retreat Ireland 2010 <br /> + ApacheCon US 2009 Oakland <br /> + ApacheCon EU 2009 Amsterdam <br /> + ApacheCon US 2008 New Orleans</p> + </div> +</div> + +</div> + diff --git a/source/stories/index.md b/source/stories/__index.md similarity index 97% rename from source/stories/index.md rename to source/stories/__index.md index 660fccb..f0f9b38 100644 --- a/source/stories/index.md +++ b/source/stories/__index.md @@ -1,5 +1,6 @@ --- title: Travel Assistance Committee - TAC +slug: index --- <div class="jumbotron"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
![https://www.apache.org/events/current-event-125x125.png"](https://www.apache.org/events/current-event-125x125.png"){kind=link}