I've become Jacobi...

...merging too many commits into one
1. Multi-line small and big makes sense
2. Split weekday limudim and Shabbat ones - shabbat gets its own section on the sidebar
3. Add MishnaYomi
4. Tekufot notices in LA will be a lot better when it happens in their midnight
5. Add Purim Meshulash
6. Fix Shabbat flyer dates
7. Add programmable auto-schedule, give to Ish Matzliach
8. Adjust Rahimi flyer
9. Brooklyn Makam adding
10. TorahFlix addon :)

_data/designLocationList.yml

@@ -30,15 +30,14 @@ rahimi:
     humra: 0
     timeFormat: h12
 east:
-  - name: |
-      Five Boroughs, NY<br>
-      <span class="sml">+ Teaneck & Passaic NJ, 5 Towns & Great Neck NY</span>
+  - name: Five Boroughs, NY
+    otherName: + Teaneck & Passaic NJ, 5 Towns & Great Neck NY
     twoLine: True
     # Shul: Beth Torah
     lat: 40.622795584652465
     lng: -73.96960885888677
     timezone: America/New_York
-    humra: 2
+    humra: 1
     timeFormat: h12
   - name: Baltimore, MD
     #flag: https://upload.wikimedia.org/wikipedia/commons/a/a0/Flag_of_Maryland.svg
@@ -48,9 +47,8 @@ east:
     timezone: America/New_York
     humra: 0
     timeFormat: h12
-  - name: |
-      Deal, NJ<br>
-      <span class="sml">+ Lakewood, NJ</span>
+  - name: Deal, NJ
+    otherName: + Lakewood, NJ
     twoLine: True
     # Location: Beth Medrash Govoha
     lat: 40.09562417811022
@@ -66,12 +64,12 @@ east:
     humra: 0
     timeFormat: h24
   - name: Miami, FL
+    otherName: + Boca Raton & Hollywood
     #flag: https://upload.wikimedia.org/wikipedia/commons/f/f7/Flag_of_Florida.svg
     # Location: Chabad of Midtown Miami
     lat: 25.804507405080564
     lng: -80.19053877936163
     timezone: America/New_York
-    doubleLocation: True
     humra: 0
     timeFormat: h12
 central:

_data/learning.yml

@@ -1,85 +1,114 @@
----
-- limud: dafBavli
-  text:
-    ru:
-      short: Бавли
-      full: Талмуд Бавли
-    hb:
-      short: בבלי
-      full: תלמוד בבלי
-    en:
-      short: Babylonian
-      full: Babylonian Talmud
-    et:
-      short: Bavli
-      full: Talmud Bavli
-- limud: DafYerushalmi
-  text:
-    ru:
-      short: Ерушалми-В
-      full: Талмуд Ерушалми (Вильна)
-    hb:
-      short: ירושלמי (ו)
-      full: תלמוד ירושלמי (וילנה)
-    en:
-      short: Jerusalemite-V
-      full: Jerusalemite Talmud (Vilna)
-    et:
-      short: Yerushalmi-V
-      full: Talmud Yerushalmi (Vilna)
-- limud: ccYomi
-  text:
-    ru:
-      short: Хафец Хаим
-      full: Хафец Хаим Ёми
-    hb:
-      short: חפץ חיים
-      full: חפץ חיים יומי
-    en:
-      short: Ḥafes Ḥayim
-      full: Daily Ḥafes Ḥayim
-    et:
-      short: Ḥafes Ḥayim
-      full: Ḥafes Ḥayim Yomi
-- limud: TehilimHodshi
-  text:
-    ru:
-      short: Теилим (месячный)
-      full: Теилим (месячный)
-    hb:
-      short: תהילים (חדשי)
-      full: תהילים יומי (חדשי)
-    en:
-      short: Psalms (Monthly)
-      full: Daily Psalms (Monthly)
-    et:
-      short: Tehilim (Monthly)
-      full: Tehilim Yomi (Monthly)
-- limud: TehilimShvui
-  text:
-    ru:
-      short: Теилим (недельной)
-      full: Теилим (недельной)
-    hb:
-      short: תהילים (שבועי)
-      full: תהילים יומי (שבועי)
-    en:
-      short: Psalms (Weekly)
-      full: Daily Psalms (Weekly)
-    et:
-      short: Tehilim (Weekly)
-      full: Tehilim Yomi (Weekly)
-- limud: Haftara
-  text:
-    ru:
-      short: Хафтара
-      full: Хафтара
-    hb:
-      short: הפטרה
-      full: הפטרה
-    en:
-      short: Haftara
-      full: Haftara
-    et:
-      short: Haftara
-      full: Haftara
+weekday:
+  - limud: dafBavli
+    text:
+      ru:
+        short: Бавли
+        full: Талмуд Бавли
+      hb:
+        short: בבלי
+        full: תלמוד בבלי
+      en:
+        short: Babylonian
+        full: Babylonian Talmud
+      et:
+        short: Bavli
+        full: Talmud Bavli
+  - limud: DafYerushalmi
+    text:
+      ru:
+        short: Ерушалми-В
+        full: Талмуд Ерушалми (Вильна)
+      hb:
+        short: ירושלמי (ו)
+        full: תלמוד ירושלמי (וילנה)
+      en:
+        short: Jerusalemite-V
+        full: Jerusalemite Talmud (Vilna)
+      et:
+        short: Yerushalmi-V
+        full: Talmud Yerushalmi (Vilna)
+  - limud: ccYomi
+    text:
+      ru:
+        short: Хафец Хаим
+        full: Хафец Хаим Ёми
+      hb:
+        short: חפץ חיים
+        full: חפץ חיים יומי
+      en:
+        short: Ḥafes Ḥayim
+        full: Daily Ḥafes Ḥayim
+      et:
+        short: Ḥafes Ḥayim
+        full: Ḥafes Ḥayim Yomi
+  - limud: TehilimHodshi
+    text:
+      ru:
+        short: Теилим (месячный)
+        full: Теилим (месячный)
+      hb:
+        short: תהילים (חדשי)
+        full: תהילים יומי (חדשי)
+      en:
+        short: Psalms (Monthly)
+        full: Daily Psalms (Monthly)
+      et:
+        short: Tehilim (Monthly)
+        full: Tehilim Yomi (Monthly)
+  - limud: TehilimShvui
+    text:
+      ru:
+        short: Теилим (недельной)
+        full: Теилим (недельной)
+      hb:
+        short: תהילים (שבועי)
+        full: תהילים יומי (שבועי)
+      en:
+        short: Psalms (Weekly)
+        full: Daily Psalms (Weekly)
+      et:
+        short: Tehilim (Weekly)
+        full: Tehilim Yomi (Weekly)
+  - limud: MishnaYomi
+    text:
+      ru:
+        short: Мишна
+        full: Мишна Ёми
+      hb:
+        short: משנה
+        full: משנה יומי
+      en:
+        short: Mishna
+        full: Daily Mishna
+      et:
+        short: Mishna
+        full: Mishna Yomi
+shabbat:
+  - limud: Haftara
+    text:
+      ru:
+        short: Хафтара
+        full: Хафтара
+      hb:
+        short: הפטרה
+        full: הפטרה
+      en:
+        short: Haftara
+        full: Haftara
+      et:
+        short: Haftara
+        full: Haftara
+  - limud: makamot
+    text:
+      ru:
+        short: Макам
+        full: Макам
+      hb:
+        short: מקם
+        full: מקם
+      en:
+        short: Makam
+        full: Makam
+      et:
+        short: Makam
+        full: Makam

assets/css/style.css

@@ -55,8 +55,9 @@ body {
 		display: grid;
 		grid-template-areas:
 			"crucial zmanim"
+			"shabbat zmanim"
 			"extra zmanim";
-		grid-template-rows: auto auto;
+		grid-template-rows: 1fr .3fr .3fr;
 		grid-template-columns: 40% 60%;
 		align-items: center;
 	}
@@ -78,6 +79,13 @@ body {
 		margin-top: .5rem;
 	}
 
+	#wideGrid > #shabbat {
+		grid-area: shabbat;
+		margin-inline-end: .5rem;
+		margin-top: .5rem;
+		margin-bottom: .5rem;
+	}
+
 	.timeDisplay {
 		width: 20ch;
 		text-align: center;