-
Notifications
You must be signed in to change notification settings - Fork 924
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'galaxyproject:main' into main
Showing
67 changed files
with
6,330 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{% assign startdate = include.start | default: page.date_start %} | ||
{% assign enddate = include.end | default: page.date_end | default: page.date_start %} | ||
{% assign eventurl = include.url | default: page.url | prepend: site.baseurl | prepend: site.url %} | ||
{% assign eventname = include.name | default: page.title | default: ""%} | ||
{% assign location = include.location | default: page.location | format_location_simple %} | ||
|
||
<a href="https://calendar.google.com/calendar/render?action=TEMPLATE&dates={{startdate | date: '%Y%m%d'}}%2F{{enddate | date: '%Y%m%d'}}&details=Event%20Information%20{{eventurl}}&location={{location}}&text={{eventname}}" class="btn btn-info btn-sm" alt="Add to Google Calendar">Google</a> | ||
|
||
<a href="https://outlook.live.com/calendar/0/deeplink/compose?body=Event%20Information%20{{eventurl}}&enddt={{enddate | date: '%Y-%m-%d'}}&location={{location}}&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt={{startdate | date: '%Y-%m-%d'}}&subject={{eventname}}" class="btn btn-info btn-sm">Outlook</a> | ||
|
||
<a href="https://outlook.office.com/calendar/0/deeplink/compose/?body=Event%20Information%20{{eventurl}}&enddt={{enddate | date: '%Y-%m-%d'}}&allday=true&location={{location}}&path=%2fcalendar%2faction%2fcompose&rru=addevent&startdt={{startdate | date: '%Y-%m-%d'}}&subject={{eventname}}" class="btn btn-info btn-sm">Office 365</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
<table class="eventtable table table-striped"> | ||
<thead> | ||
<tr> | ||
<th>Date</th> | ||
<th>Event</th> | ||
<th>Location</th> | ||
<th>Contact</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
{% for event in include.events %} | ||
{% unless event.draft and jekyll.environment == "production" %} | ||
<tr> | ||
<td class="eventtable-date"> {{event | collapse_date_pretty }} </td> | ||
<td> | ||
|
||
<a class="eventtable-title" href="{% if event.external %}{{event.external}}{% else %}{{site.baseurl}}{{event.url}}{% endif %}">{{event.title}}{% if event.draft %} (draft, will be hidden) {% endif %}</a> | ||
<div class="eventtable-description"> {{event.description}} </div> | ||
</td> | ||
<td> {{event.location | format_location_short }} </td> | ||
<td> {% for org in event.contributions.organisers %} | ||
{% include _includes/contributor-badge-inline.html id=org %} | ||
{% endfor %} | ||
</td> | ||
</tr> | ||
{% endunless %} | ||
{% endfor %} | ||
</tbody> | ||
</table> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
--- | ||
layout: event | ||
--- |
Oops, something went wrong.