diff --git a/_includes/mastodon_feed.html b/_includes/mastodon_feed.html new file mode 100644 index 0000000000..7caad34136 --- /dev/null +++ b/_includes/mastodon_feed.html @@ -0,0 +1,9 @@ +{% assign mastodon_account = include.account %} +{% assign mastodon_label = include.label | default: page.conference %} +{% assign mastodon_post_limit = include.post_limit | default: 2 %} + +
Mastodon Posts by {{ mastodon_label }}:
+
+See all Mastodon posts for {{ mastodon_label }} diff --git a/_includes/mastodon_head.html b/_includes/mastodon_head.html new file mode 100644 index 0000000000..05430a824d --- /dev/null +++ b/_includes/mastodon_head.html @@ -0,0 +1,2 @@ + + diff --git a/_layouts/conference.html b/_layouts/conference.html index b57c72b001..1865c52fd4 100644 --- a/_layouts/conference.html +++ b/_layouts/conference.html @@ -39,57 +39,7 @@ } {% if page.mastodon %} - - - {% elsif page.twitter %} - + {% include mastodon_head.html %} {% endif %} @@ -135,138 +85,132 @@

a.k.a. {{page.alt_name}} {{page.year}}

data-start="{{page.start}}" data-end="{{page.end}}" data-link="{{page.link}}"> -
-
- {% if cfp == "TBA" or cfp == "Cancelled" or cfp == "None" %}{{cfp}}{%endif%} -
-
- -
-
- {% include conference_detail_actions.html %} -
-
-
-
-
- Calendar icon - {% assign conf = page %}{%- translate_file dates/pretty_dates.html start=conf.start end=conf.end -%} -
-
- Location icon - {{page.place}} -
-
- Earth Icon - {{page.link}} +
+
+
+
+ {% if cfp == "TBA" or cfp == "Cancelled" or cfp == "None" %}{{cfp}}{%endif%} +
- {% if page.cfp_ext %} -
- Document Icon for original CfP - {% t global.cfp_ext %} {{page.cfp}} -
- {% endif %} - {% if page.cfp_link %} - - {% endif %} - - {% if page.finaid %} - - {% endif %} - {% if page.sponsor %} - - {% endif %} - {% if page.twitter %} -
- Twitter icon - @{{page.twitter}} + +
+
+ {% include conference_detail_actions.html %} +
- {% endif %} - {% if page.mastodon %} -
- Mastodon icon - Mastodon -
- {% endif %} -
-
-
-
-
- {% t conference.deadline_tz_theirs %}: -
-
- {{conf.cfp | date: "%A, %e %B %Y"}} -
-
- {% t conference.deadline_tz_local %}: +
+
+
+ Calendar icon + {% assign conf = page %}{%- translate_file dates/pretty_dates.html start=conf.start end=conf.end -%} +
+ + + {% if page.cfp_ext %} +
+ Document Icon for original CfP + {% t global.cfp_ext %} {{page.cfp}} +
+ {% endif %} + {% if page.cfp_link %} + + {% endif %} + + {% if page.finaid %} + + {% endif %} + {% if page.sponsor %} + + {% endif %} + {% if page.twitter %} + + {% endif %} + {% if page.mastodon %} +
+ Mastodon icon + Mastodon +
+ {% endif %} +
-
- +
+
+
+ {% t conference.deadline_tz_theirs %}: +
+
+ {{conf.cfp | date: "%A, %e %B %Y"}} +
+
+ {% t conference.deadline_tz_local %}: +
+
+ +
+
+
-
- {% if page.mastodon %} - -
Mastodon Posts by {{ page.conference }}:
-
- See all Mastodon posts for {{ page.conference }} - {% elsif page.twitter %} - - - {% endif %} + {% if page.mastodon %} +
+ {% include mastodon_feed.html account=page.mastodon label=page.conference %}
+ {% endif %}
-
{% if page.location %} {% google_map zoom="6" width="100%" %} diff --git a/_layouts/summary.html b/_layouts/summary.html index a2a822047a..80dac2620f 100644 --- a/_layouts/summary.html +++ b/_layouts/summary.html @@ -7,57 +7,7 @@ {% include head.html %} {% if page.mastodon %} - - - {% elsif page.twitter %} - + {% include mastodon_head.html %} {% endif %} @@ -101,75 +51,69 @@

-
-
- - {% if confs[0].twitter %} +
+
+
+
+ + {% if confs[0].twitter %} - {% endif %} - {% if confs[0].mastodon %} + {% endif %} + {% if confs[0].mastodon %} - {% endif %} + {% endif %}
-
- {% if confs[0].mastodon %} - -
Mastodon Posts by {{page.conference}}:
-
- See all Mastodon posts for {{ page.conference }} - {% elsif confs[0].twitter %} - - - {% endif %}
-
-
-
- {% for conf in confs %} - {% assign subs = conf.sub | split: "," %} -
- {% include index_conf_title_row.html %} - {% include_cached index_conf_date_place.html place=conf.place extra_places=conf.extra_places note=conf.note cfp=conf.cfp start=conf.start end=conf.end %} - {% include index_conf_subs.html subs=subs %} -
+
+ {% for conf in confs %} + {% assign subs = conf.sub | split: "," %} +
+ {% include index_conf_title_row.html %} + {% include_cached index_conf_date_place.html place=conf.place extra_places=conf.extra_places note=conf.note cfp=conf.cfp start=conf.start end=conf.end %} + {% include index_conf_subs.html subs=subs %} +
+
+ {% endfor %}
- {% endfor %} -
- {% if page.place == confs[0].place and confs[0].place == confs[1].place %} -
- {% google_map zoom="6" width="100%" %} +
+ {% if confs[0].mastodon %} +
+ {% assign summary_mastodon = confs[0].mastodon %} + {% include mastodon_feed.html account=summary_mastodon label=page.conference %} +
+ {% endif %} +
+ {% if page.place == confs[0].place and confs[0].place == confs[1].place %} +
+ {% google_map zoom="6" width="100%" %} +
+ {% endif %}
- {% endif %} -