From 9d9e1590c862772c713fd95929d5b2cdfaa30f7d Mon Sep 17 00:00:00 2001 From: SaketThota Date: Sat, 15 Oct 2022 14:35:10 +0530 Subject: [PATCH 1/3] :sparkles: feat: Remove duplicate title in individual summary Co-authored-by: Kartik Soneji kartiksoneji@rocketmail.com --- summary/combined-summary-template.adoc | 2 ++ summary/combined-summary.adoc | 2 +- summary/individual-summary.adoc | 4 +--- util/build.sh | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/summary/combined-summary-template.adoc b/summary/combined-summary-template.adoc index 454db4ae..b13e409f 100644 --- a/summary/combined-summary-template.adoc +++ b/summary/combined-summary-template.adoc @@ -1,5 +1,7 @@ +ifndef::building_combined_summary[] [#{catchup_display_number}] === link:/summary/{catchup_display_number}[OTC CatchUp #{catchup_display_number}] +endif::[] include::sessions/{catchup_number}/content.adoc[] diff --git a/summary/combined-summary.adoc b/summary/combined-summary.adoc index 55d4a8db..963c4b38 100644 --- a/summary/combined-summary.adoc +++ b/summary/combined-summary.adoc @@ -24,7 +24,7 @@ NOTE: link:https://catchup.ourtech.community/showcase[Showcase a project on OTC == Summaries // include autogenerated combined summaries -include::autogenerated-combined-summary.adoc[] +include::autogenerated-combined-summary.adoc[leveloffset = -1] NOTE: For older summaries, please visit link:https://twitter.com/OurTechComm[our Twitter account (@OurTechComm)^]. diff --git a/summary/individual-summary.adoc b/summary/individual-summary.adoc index b921c834..2468bb88 100644 --- a/summary/individual-summary.adoc +++ b/summary/individual-summary.adoc @@ -1,4 +1,4 @@ -= OTC CatchUp #{catchup_display_number} Summary += link:/summary/{catchup_display_number}[OTC CatchUp #{catchup_display_number} Summary] Our Tech Community v1 :favicon: /public/img/favicon.ico @@ -13,8 +13,6 @@ v1 :catchup_display_number: 0 :combined_summary_file: combined-summary-template.adoc -''' - == About OTC CatchUp NOTE: link:https://catchup.ourtech.community[OTC CatchUps^] are weekly informal sessions involving project showcases and technical discussions. They are held every Saturday from 10:30 PM IST. link:https://catchup.ourtech.community/attend[Join in!^]. + diff --git a/util/build.sh b/util/build.sh index 8b5b6c3b..f1ef3f52 100755 --- a/util/build.sh +++ b/util/build.sh @@ -71,6 +71,7 @@ done; # Build combined summary site asciidoctor \ -a webfonts! \ + -a building_combined_summary \ -o "${public_dir}/html/summary/combined-summary.html" \ "${summary_dir}/combined-summary.adoc"; # Lazy load images From 9328f53b2413cc034380cd31a5dfcd1a06a7a478 Mon Sep 17 00:00:00 2001 From: SaketThota Date: Fri, 21 Oct 2022 20:56:07 +0530 Subject: [PATCH 2/3] :wrench: feat: Remove duplicate title --- summary/combined-summary-template.adoc | 2 +- summary/combined-summary-template.html | 468 +++++++++++++++++++++++++ 2 files changed, 469 insertions(+), 1 deletion(-) create mode 100644 summary/combined-summary-template.html diff --git a/summary/combined-summary-template.adoc b/summary/combined-summary-template.adoc index b13e409f..407e843c 100644 --- a/summary/combined-summary-template.adoc +++ b/summary/combined-summary-template.adoc @@ -1,6 +1,6 @@ ifndef::building_combined_summary[] [#{catchup_display_number}] -=== link:/summary/{catchup_display_number}[OTC CatchUp #{catchup_display_number}] +=== link:/summary/{catchup_display_number}[OTC CatchUp #{catchup_display_number} Summary] endif::[] include::sessions/{catchup_number}/content.adoc[] diff --git a/summary/combined-summary-template.html b/summary/combined-summary-template.html new file mode 100644 index 00000000..c071bf00 --- /dev/null +++ b/summary/combined-summary-template.html @@ -0,0 +1,468 @@ + + + + + + + +OTC CatchUp #{catchup_display_number} Summary + + + + + +
+
+

OTC CatchUp #{catchup_display_number} Summary

+
+

Unresolved directive in combined-summary-template.adoc - include::sessions/{catchup_number}/content.adoc[]

+
+
+

Unresolved directive in combined-summary-template.adoc - include::sessions/{catchup_number}/attendees.adoc[]

+
+
+

Meet Screenshot

+
+
+Meet #{catchup_display_number} screenshot +
+
+
+
+
+
+ + + \ No newline at end of file From b7a877f2a16a63fd22d9f4713bbcc4a8e4840a48 Mon Sep 17 00:00:00 2001 From: SaketThota Date: Sat, 22 Oct 2022 00:23:07 +0530 Subject: [PATCH 3/3] :wrench: Fix: Remove duplicate title (#71) --- summary/combined-summary-template.adoc | 9 ++++----- summary/combined-summary.adoc | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/summary/combined-summary-template.adoc b/summary/combined-summary-template.adoc index 407e843c..aba99a70 100644 --- a/summary/combined-summary-template.adoc +++ b/summary/combined-summary-template.adoc @@ -1,13 +1,12 @@ -ifndef::building_combined_summary[] -[#{catchup_display_number}] -=== link:/summary/{catchup_display_number}[OTC CatchUp #{catchup_display_number} Summary] -endif::[] +:leveloffset: -1 include::sessions/{catchup_number}/content.adoc[] include::sessions/{catchup_number}/attendees.adoc[] -==== Meet Screenshot +:leveloffset: +1 + +=== Meet Screenshot image::{catchup_number}.jpg[alt="Meet #{catchup_display_number} screenshot", 600, 600] diff --git a/summary/combined-summary.adoc b/summary/combined-summary.adoc index 963c4b38..26cd3a0d 100644 --- a/summary/combined-summary.adoc +++ b/summary/combined-summary.adoc @@ -1,6 +1,4 @@ = OTC CatchUp Summaries -Our Tech Community -v1 :toc: :favicon: /public/img/favicon.ico :imagesdir: /public/img/summary