From 187b5bddb35ece11337116b7bf064c48c260b221 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Thu, 13 Feb 2020 11:33:10 -0500 Subject: [PATCH] Changes for integration with drupal program and speakerlist generation --- 2020/Makefile | 35 ++------- 2020/assets/css/custom.css | 142 +++++++++++++++++++++++++++++++++++++ 2020/program/index.html | 11 +-- 2020/speakers/index.html | 5 +- 4 files changed, 158 insertions(+), 35 deletions(-) mode change 100644 => 100755 2020/program/index.html diff --git a/2020/Makefile b/2020/Makefile index 4f28977a..9979c15d 100644 --- a/2020/Makefile +++ b/2020/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2016 Free Software Foundation +# Copyright (C) 2016-2020 Free Software Foundation # # This program is free software: you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -14,17 +14,6 @@ # along with this program. If not, see # . -LP_YEAR = 2019 - -SPEAKERS_TEMPLATE = assets/templates/lp-speakers.jinja2 -SPEAKERS_MD = /home/owner/brains/campaigns/libreplanet/2019/program/bios-for-site.mdwn -SPEAKERS_HTML = program/generated-bios.html - -SESSIONS_TEMPLATE = assets/templates/lp-schedule.jinja2 -SESSIONS_MD = /home/owner/brains/campaigns/libreplanet/2019/program/sessions-for-site.mdwn -SESSIONS_HTML = program/generated-sessions.html - - all: @echo "Give me something to make." # for f in $(find -name '*.mdwn' -type f); do python -m markdown $f > ${f%mdwn}html; done @@ -36,25 +25,15 @@ wikipages: fi \ done -speakers: $(SPEAKERS_HTML) - - -sessions: $(SESSIONS_HTML) +speakers: + curl -s https://my.fsf.org/lp-talk/30| sed -n 's=/lp-schedule-2020=/2020/program/=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-bios.html +sessions: + curl -s https://my.fsf.org/lp-schedule-2020| sed -n 's=/lp-talk/30=/2020/speakers=g; s/fa fa-/glyphicon glyphicon-/g; /pagestart/s/<\/div>//; /pagestart/,/pageend/p; ' > includes/generated-sessions.html clean: - rm -f $(SPEAKERS_HTML) $(SESSIONS_HTML) - - -both: $(SPEAKERS_HTML) $(SESSIONS_HTML) - - -$(SPEAKERS_HTML): $(SPEAKERS_MD) - @lps_gen -sp $(SPEAKERS_TEMPLATE) $< > $@ - - -$(SESSIONS_HTML): $(SESSIONS_MD) - @lps_gen -s --ical $(LP_YEAR) $(SESSIONS_TEMPLATE) $< > $@ + rm -f includes/generated-sessions.html includes/generated-bios.html +both: sessions speakers .PHONY: all speakers sessions both clean diff --git a/2020/assets/css/custom.css b/2020/assets/css/custom.css index a888ec6b..f728fad4 100644 --- a/2020/assets/css/custom.css +++ b/2020/assets/css/custom.css @@ -909,3 +909,145 @@ body { width:100%; height:450px; } + +/* generated schedule and speakers list */ + +.lptrack{ +padding:0 4px 0 4px; +border-radius: 5px +} + +#speakerlist .glyphicon-road{ +margin-top:10px +} + +.talkblock .glyphicon-home{ +margin-left:10px +} + + +.lptrack1{background-color:#3fcc91;} /*licensing*/ +.lptrack2{background-color:#bcc2c8;} /*LP special*/ +.lptrack3{background-color:#e687c1;} /*community*/ +.lptrack4{background-color:#ff9556;} /*social context*/ +.lptrack5{background-color:#ff7979;} /*government*/ +.lptrack6{background-color:orange;} +.lptrack7{background-color:#00d6f9;} /*workshop*/ +.lptrack8{background-color:green;} +.lptrack9{background-color:#91c1ff;} /*FS in practice*/ +.lptrack10{background-color:#ffdd28;} /*exploring fs concepts*/ + +.view-id-lp_schedule_2020 .view-grouping-header{ + font-size: 25px; + font-weight: bold; + border-top:4px solid #ccc; + padding-top:20px!important; +} + +.view-id-lp_schedule_2020 .col-1{ + width:33% +} +.view-id-lp_schedule_2020 .col-2{ + width:33%; +} +.speakerpic{ +border-radius: 10px + +} + +.talkblock{ + clear: both; + float:right; + display: block; + width:55%; + text-align: justify; + margin-bottom:40px; + background-color:#eee; + padding:4% 5% 4% 5%; + border-radius: 20px; + +} + +.speakerblock{ + float:left; + display: block; + width:40%; + border-right:10px dotted #eee; + padding-right:3%; + text-align: justify; + margin-bottom:40px; +} + +.speakerheader { + text-align: right +} + +.view-content hr{ + border:3px solid orange; + border-radius: 3px; +clear:both +} + +.speakerblock h2{ + text-align: right; +} + +.speakerblock .speakerpic{ + width: 60%; + display:inline-block; + margin:0 0% 5% 0%; +} + +.speakerblock h2{ + padding-bottom: 0.3em +} + +.talkblock h2{ + padding-bottom: 0.3em; + font-size:20px; + text-align: left; +} + +.talkblock .abstract{ + margin-top:20px +} + +#program table td { + border:1px solid #204a87; + width:33%; + vertical-align:top; + padding:7px 10px 5px 10px; + background-color: #f5f5f5; +} + +#program table .views-field-value{ + font-weight: bold; + color: #f57900 +} + +.view-grouping-header, #speakerlist .view-content h3{ + font-size: x-large; + font-weight: bold; + display:block; + border-bottom:3px solid #f57900; + margin:20px 0 20px 0; + padding:5px 0 5px 15px; + background-color: #204a87; + color: white + +} + +.lpcalendarlink { +color:#f57900; +border:none; +} +.talkblockheader{ + font-weight: 500 +} + +#program h3, #speakerlist h3{ +clear:both +} + + +/* END generated schedule and speakers list */ diff --git a/2020/program/index.html b/2020/program/index.html old mode 100644 new mode 100755 index 7eeb38c0..5c79a2a5 --- a/2020/program/index.html +++ b/2020/program/index.html @@ -18,8 +18,8 @@ Contents
-

Saturday sessions

-

Sunday sessions

+

Saturday sessions

+

Sunday sessions

@@ -27,11 +27,12 @@ Contents -
+ +
- +
diff --git a/2020/speakers/index.html b/2020/speakers/index.html index 8302053b..90843d0f 100755 --- a/2020/speakers/index.html +++ b/2020/speakers/index.html @@ -5,9 +5,10 @@ -

Program Speakers

- +

Program

+
+
-- 2.25.1