Finalize Sha'are Tefila

Zemaneh-Yosef · Sep 19, 2024 · 9838283 · 9838283
1 parent afdc945
commit 9838283
Show file tree

Hide file tree

Showing 6 changed files with 123 additions and 28 deletions.
diff --git a/_config.yml b/_config.yml
@@ -2,7 +2,7 @@ host         : 0.0.0.0
 title        : "זמני יוסף"
 repo         : "Elyahu41/royzmanimwebsite"
 description  : "Use our website to get Halachic times for anywhere in the world, in compliance with the Sepharadi Shita's of Maran Ovadia Yosef, Rabbi Yitzhak Yosef & Rabbi David Yosef"
-markdown_ext : "markdown,mkdown,mkdn,mkd,md,html"
+markdown_ext : "markdown,mkdown,mkdn,mkd,md"
 
 compress_html:
   comments: ["<!-- ", " -->"]

diff --git a/_data/tv/learningShaareTefila.yml b/_data/tv/learningShaareTefila.yml
@@ -0,0 +1,57 @@
+---
+- 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: 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)
diff --git a/assets/js/shul-wall/limud.js b/assets/js/shul-wall/limud.js
@@ -34,8 +34,9 @@ document.querySelector('[data-zfReplace="TehilimHodshi"]').innerHTML
 	= KosherZmanim.TehilimYomi.byDayOfMonth(jCal).map(met => met.toString()).join(' - ');
 
 const haftara = KosherZmanim.Haftara.getThisWeeksHaftarah(jCal.shabbat())
-document.querySelector('[data-zfReplace="Haftara"]').innerHTML
-	= `<b>${haftara.text}</b> (${haftara.source})`;
+for (const haftaraElem of document.querySelectorAll('[data-zfReplace="Haftara"]'))
+	haftaraElem.innerHTML
+		= `<b>${haftara.text}</b> (${haftara.source})`;
 
 const chafetzChayimYomi = jCal.getChafetzChayimYomi();
 for (const ccYomi of document.querySelectorAll('[data-zfReplace="ccYomi"]'))

diff --git a/assets/js/shul-wall/preSettings.js b/assets/js/shul-wall/preSettings.js
@@ -31,7 +31,32 @@ switch (window.location.href.split('/').at(-1)) {
 				tzeithIssurMelakha: () => ({ minutes: 30, degree: 7.14 })
 			}
 		});
-	case 'ohel-michael':
+		break;
+	case 'mercaz-bne-aliya':
+		preSetSettings = Object.freeze({
+			seconds: () => false,
+			timeFormat: () => 'h12',
+			language: () => 'en',
+			location: {
+				name: () => "מרכז בני עליה",
+				lat: () => 40.724398257899246,
+				long: () => -73.82106240353995,
+				elevation: () => 0,
+				timezone: () => "America/New_York"
+			},
+			calendarToggle: {
+				hourCalculators: () => 'degrees',
+				rtKulah: () => true,
+				tzeitTaanitHumra: () => false,
+				tekufaMidpoint: () => 'hatzoth',
+				tekufaCalc: () => 'shemuel'
+			},
+			customTimes: {
+				candleLighting: () => 20,
+				tzeithIssurMelakha: () => ({ minutes: 30, degree: 7.14 })
+			}
+		});
+		break;
 	case 'ohel-michael-adj':
 		preSetSettings = Object.freeze({
 			seconds: () => false,

diff --git a/pages/netz-year-export.html b/pages/netz-year-export.html
@@ -412,7 +412,7 @@ <h1 class="hebrewTitle">אוצר<br>המאורות</h1>
 	<div>
 		<div data-printFind>
 			<div class="explanationPreface">
-				<h4 style="text-align: center; font-family: 'Guttman Mantova-Decor';">קונתרס כי יעיר השמש</h4>
+				<h4 style="text-align: center; font-family: 'Guttman Mantova-Decor';">קונטרס כי יעיר השמש</h4>
 				<p style="text-align: center;">The benefits of תפילה בהנץ החמה, calculating, leniencies, so on and so forth...</p>
 				<div class="columnSplit" id="explanationCont">
 					<span class="lang lang-en">{{ netzExpl | markdownify }}</span>

diff --git a/pages/shul-wall/sha'areh-tefila-queens.html b/pages/shul-wall/sha'areh-tefila-queens.html
@@ -61,16 +61,16 @@
 		text-align: center;
 		display: flex;
 		justify-content: space-evenly;
-		width: 60%;
+		width: 65%;
 		justify-self: center;
 		align-self: start;
 		color: black;
 		z-index: 3;
 		line-height: 1;
 		height: 12vh;
 		align-items: center;
-		font-size: 1.15em;
-        font-weight: 500;
+		font-size: .8em;
+		font-weight: 500;
 	}
 
 	#topBar > * {
@@ -104,13 +104,13 @@
 
 	#bsD {
         font-family: "Narkisim";
-        justify-self: end;
-        line-height: 1;
-        padding-right: 3rem;
-        color: black;
-        font-size: 4rem;
-        padding-top: 1.5rem;
-        align-self: start;
+		justify-self: end;
+		line-height: 1;
+		padding-right: 1rem;
+		color: black;
+		font-size: 4rem;
+		padding-top: .25rem;
+		align-self: start;
 		z-index: 3;
     }
 
@@ -132,17 +132,28 @@
         background: rgba(0,0,0,.75);
         border-top-left-radius: 50% 15%;
         border-top-right-radius: 50% 15%;
-        padding: 1rem;
+        padding: .5rem;
         box-shadow: 0 0 7px 5px black;
-        padding-top: 2.5rem;
+        padding-top: 1.55rem;
+		font-size: .625rem;
+    }
+
+	#dataGrid > *:not(#megaline) h1 {
+        font-size: 1.5rem;
     }
 
+	#dataGrid > *:not(#limudSection) .list-group-item {
+		--bs-list-group-item-padding-y: .25rem;
+		--bs-list-group-border-color: #49505799;
+		--bs-list-group-item-padding-x: .5rem;
+	}
+
 	#gne {
 		height: 13vh;
 		justify-self: start;
 		align-self: start;
 		margin-top: .5rem;
-		margin-left: 2.5rem;
+		margin-left: 1.5rem;
 		z-index: 3;
     }
 
@@ -201,12 +212,13 @@
 		backdrop-filter: blur(6px);
 		padding: 5px;
 		border-radius: 3rem;
+		font-size: .5rem;
 	}
 
 	.hiloulotCard .list-group-item {
-		--bs-list-group-item-padding-y: .25rem;
+		--bs-list-group-item-padding-y: .125rem;
 		--bs-list-group-border-color: #49505799;
-		--bs-list-group-item-padding-x: 1.25rem;
+		--bs-list-group-item-padding-x: .75rem;
 	}
 
 	.hiloulotCard .card-header {
@@ -216,13 +228,13 @@
     #megaline {
 		grid-column: 1 / span 4;
 		text-align: center;
-		font-size: 1.6em;
-        margin-left: -1vw;
-        margin-right: -1vw;
-        background-color: #f3ebd7;
-        color: black;
-        padding-top: 1rem;
-        padding-bottom: 1rem;
+		font-size: 1.2em;
+		margin-left: -1vw;
+		margin-right: -1vw;
+		background-color: #f3ebd7;
+		color: black;
+		padding-top: .5rem;
+		padding-bottom: .5rem;
 	}
 
     #megalineCont {
@@ -491,7 +503,7 @@ <h1 style="text-align: center;">
                 <span class="langTV lang-ru">лимуд ёми</span>
             </h1>
             <dl data-zfFind="DafYomi">
-                {% for learning in site.data.learning %}
+                {% for learning in site.data.tv.learningShaareTefila %}
                 <div style="text-align: center;">
                     <dt class="langTV lang-hb">{{ learning.text.hb.short }}</dt>
                     <dt class="langTV lang-ru">{{ learning.text.ru.short }}</dt>