Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 32 additions & 18 deletions Al_Hamichya.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- saved from url=(0034)http://www.brochos.com/brochos/ahm -->
<html>
<html lang="he" dir="rtl">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -9,10 +9,10 @@
<link rel="icon" href="./Al_Hamichya_files/cookie.jpg" type="image/x-icon">
<link rel="stylesheet" type="text/css" href="./Al_Hamichya_files/mainStyle.css">

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>

<link rel="stylesheet" href="https://code.jquery.com/ui/1.11.3/themes/smoothness/jquery-ui.css">
<script src="https://code.jquery.com/ui/1.11.3/jquery-ui.min.js"></script>
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.14.0/themes/smoothness/jquery-ui.css">
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.14.0/jquery-ui.min.js"></script>

<style media="print" type="text/css">
body{
Expand Down Expand Up @@ -69,21 +69,25 @@
</style>
</head>
<body onload="">
<a href="#main-content" class="skip-link" lang="en">Skip to main content</a>
<div class="cdiv">
<div class="cdivs">
<div class="narrow" id="mmnarrow">
<div class="">

<header>
<div id="actionBox" class="actionBox">
<h1 class="title">ברכת מעין שלש</h1>

<img class="toggleImg" id="Mezonos" alt="Mezonos" src="./Al_Hamichya_files/cookie.jpg" />
<img class="toggleImg" id="Wine" alt="Wine" src="./Al_Hamichya_files/wine.jpg" />
<img class="toggleImg" id="ShivasHaminim" alt="Shivas Haminim" src="./Al_Hamichya_files/pomegranate.jpg" />
<img class="toggleImg" id="Mezonos" alt="Mezonos" src="./Al_Hamichya_files/cookie.jpg" role="button" tabindex="0" aria-pressed="true" />
<img class="toggleImg" id="Wine" alt="Wine" src="./Al_Hamichya_files/wine.jpg" role="button" tabindex="0" aria-pressed="false" />
<img class="toggleImg" id="ShivasHaminim" alt="Shivas Haminim" src="./Al_Hamichya_files/pomegranate.jpg" role="button" tabindex="0" aria-pressed="false" />
</div>
</header>

<hr />

<main id="main-content" tabindex="-1">
<div class="article barticle">
<p class="hpar" style="">בָּרוּךְ אַתָּה יהוה אֱלֹהֵינוּ מֶלֶךְ הָעוֹלָם,</p>

Expand All @@ -106,17 +110,17 @@ <h1 class="title">ברכת מעין שלש</h1>
</p>

<div id="accordion" style="background-color: #DDDDDD; ">
<h2>Rosh Chodesh</h2>
<h2 lang="en">Rosh Chodesh</h2>
<div>
<p class="hpar accordion-hpar" style="">וְזָכְרֵנוּ לְטוֹבָה בְּיוֹם רֹאש הַחֹדֶשׁ הַזֶה.</p>
</div>

<h2>Pesach</h2>
<h2 lang="en">Pesach</h2>
<div>
<p class="hpar accordion-hpar" style="">וְשַׂמְּחֵנוּ בְּיוֹם חַג הַמַּצּוֹת הַזֶה.</p>
</div>

<h2>Sukkos</h2>
<h2 lang="en">Sukkos</h2>
<div>
<p class="hpar accordion-hpar" style="">וְשַׂמְּחֵנוּ בְּיוֹם חַג הַסֻּכּוֹת הַזֶה.</p>
</div>
Expand All @@ -130,13 +134,13 @@ <h2>Sukkos</h2>

<div class="AlHagaphen type-option" style="background-color: #FAAFBA; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל פְּרִי הַגָּפֶן</p>
<p class="instr" style="">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פְּרִי גַפְנָהּ</p>
</div>

<div class="AlHaeitz type-option" style="background-color: #90EE90; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל הַפֵּרוֹת</p>
<p class="instr" style="">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פֵּירוֹתֶיהָ.</p>
</div>

Expand All @@ -148,17 +152,16 @@ <h2>Sukkos</h2>

<div class="AlHagaphen type-option" style="background-color: #FAAFBA; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל פְּרִי הַגָּפֶן</p>
<p class="instr" style="">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פְּרִי גַפְנָהּ</p>
</div>

<div class="AlHaeitz type-option" style="background-color: #90EE90; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל הַפֵּרוֹת</p>
<p class="instr" style="">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פֵּירוֹתֶיהָ.</p>
</div>

</div>
</div>
</main>
</div>
</div>
</div>
Expand Down Expand Up @@ -188,11 +191,22 @@ <h2>Sukkos</h2>
checkImage("ShivasHaminim");
});

$('.toggleImg').on('keydown', function(e)
{
if (e.key === 'Enter' || e.key === ' ')
{
e.preventDefault();
$(this).trigger('click');
}
});

function checkImage(id)
{
var opacity = $("#" + id).css('opacity');
var isActive = parseFloat(opacity).toFixed(1) !== '0.4';
$("#" + id).attr('aria-pressed', isActive);

if (parseFloat(opacity).toFixed(1) === '0.4')
if (!isActive)
{
sectionShowHide(id, false)
}
Expand Down
53 changes: 53 additions & 0 deletions Al_Hamichya_files/mainStyle.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
a {color:blue}

/* Skip navigation link (hidden until focused) */
.skip-link {
position: absolute;
top: -50px;
left: 0;
background: #000;
color: #fff;
padding: 8px 16px;
z-index: 9999;
font-size: 1rem;
text-decoration: none;
border-radius: 0 0 4px 0;
transition: top 0.2s;
}
.skip-link:focus {
top: 0;
}

/* Screen-reader-only utility */
.visually-hidden {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
border: 0;
}

html{
font-size:100%;
}
Expand Down Expand Up @@ -238,6 +269,16 @@ img{
cursor: pointer;
}

.toggleImg:focus-visible {
outline: 3px solid #005fcc;
outline-offset: 3px;
}

#theme-toggle:focus-visible {
outline: 3px solid #005fcc;
outline-offset: 2px;
}

#searcher .box{
background-color:#FFDC8A;
}
Expand Down Expand Up @@ -430,6 +471,18 @@ img{
margin-right: 5px;
}

@media (prefers-reduced-motion: reduce) {
*, *::before, *::after {
animation-duration: 0.01ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.01ms !important;
scroll-behavior: auto !important;
}
.skip-link {
transition: none;
}
}

@media (max-width: 750px) {
html {
font-size: 115%;
Expand Down
46 changes: 30 additions & 16 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<html lang="he" dir="rtl">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand Down Expand Up @@ -71,22 +71,26 @@
</style>
</head>
<body onload="">
<a href="#main-content" class="skip-link" lang="en">Skip to main content</a>
<div class="cdiv">
<div class="cdivs">
<div class="narrow" id="mmnarrow">
<div class="">

<header>
<div id="actionBox" class="actionBox">
<button id="theme-toggle"></button>
<button id="theme-toggle" aria-label="Toggle dark/light theme"></button>
<h1 class="title">ברכת מעין שלש</h1>

<img class="toggleImg" id="Mezonos" alt="Mezonos" src="./Al_Hamichya_files/cookie.jpg" />
<img class="toggleImg" id="Wine" alt="Wine" src="./Al_Hamichya_files/wine.jpg" />
<img class="toggleImg" id="ShivasHaminim" alt="Shivas Haminim" src="./Al_Hamichya_files/pomegranate.jpg" />
<img class="toggleImg" id="Mezonos" alt="Mezonos" src="./Al_Hamichya_files/cookie.jpg" role="button" tabindex="0" aria-pressed="true" />
<img class="toggleImg" id="Wine" alt="Wine" src="./Al_Hamichya_files/wine.jpg" role="button" tabindex="0" aria-pressed="false" />
<img class="toggleImg" id="ShivasHaminim" alt="Shivas Haminim" src="./Al_Hamichya_files/pomegranate.jpg" role="button" tabindex="0" aria-pressed="false" />
</div>
</header>

<hr />

<main id="main-content" tabindex="-1">
<div class="article barticle">
<p class="hpar" style="">בָּרוּךְ אַתָּה יהוה אֱלֹהֵינוּ מֶלֶךְ הָעוֹלָם,</p>

Expand All @@ -110,17 +114,17 @@ <h1 class="title">ברכת מעין שלש</h1>
</p>

<div id="accordion" >
<h2>Rosh Chodesh</h2>
<h2 lang="en">Rosh Chodesh</h2>
<div>
<p class="hpar accordion-hpar" style="">וְזָכְרֵנוּ לְטוֹבָה בְּיוֹם רֹאש הַחֹדֶשׁ הַזֶה.</p>
</div>

<h2>Pesach</h2>
<h2 lang="en">Pesach</h2>
<div>
<p class="hpar accordion-hpar" style="">וְשַׂמְּחֵנוּ בְּיוֹם חַג הַמַּצּוֹת הַזֶה.</p>
</div>

<h2>Sukkos</h2>
<h2 lang="en">Sukkos</h2>
<div>
<p class="hpar accordion-hpar" style="">וְשַׂמְּחֵנוּ בְּיוֹם חַג הַסֻּכּוֹת הַזֶה.</p>
</div>
Expand All @@ -134,13 +138,13 @@ <h2>Sukkos</h2>

<div class="AlHagaphen type-option" style="background-color: #FAAFBA; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל פְּרִי הַגָּפֶן</p>
<p class="instr" style="">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פְּרִי גַפְנָהּ</p>
</div>

<div class="AlHaeitz type-option" style="background-color: #90EE90; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל הַפֵּרוֹת</p>
<p class="instr" style="">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פֵּירוֹתֶיהָ.</p>
</div>

Expand All @@ -152,17 +156,16 @@ <h2>Sukkos</h2>

<div class="AlHagaphen type-option" style="background-color: #FAAFBA; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל פְּרִי הַגָּפֶן</p>
<p class="instr" style="">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the wine is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פְּרִי גַפְנָהּ</p>
</div>

<div class="AlHaeitz type-option" style="background-color: #90EE90; ">
<p class="hpar" style="margin-bottom: 0;">וְעַל הַפֵּרוֹת</p>
<p class="instr" style="">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="instr" style="" lang="en">* If the fruit is from Eretz Yisrael, some substitute with:</p>
<p class="hpar" style="">וְעַל פֵּירוֹתֶיהָ.</p>
</div>

</div>
</div>
</main>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Add missing closing div before closing main

Here </main> is emitted while the <div class="article barticle"> opened above is still unclosed (this revision leaves the page with 19 <div> openings but only 18 </div> closings). Browsers will auto-repair malformed markup, but that can produce inconsistent DOM structure for styling/accessibility tools and makes the landmark/content hierarchy unreliable; insert the missing </div> before closing main (the same pattern is present in Al_Hamichya.html).

Useful? React with 👍 / 👎.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codex address that feedback

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Summary

  • Addressed the review feedback by fixing invalid element nesting in index.html: the .article.barticle container is now explicitly closed before </main>. index.htmlL163-L170
  • Applied the same nesting fix in Al_Hamichya.html so both pages have consistent, valid structure (.article.barticle closes before </main>). Al_Hamichya.htmlL159-L166
  • Committed the changes (5ecb1d5) and created a follow-up PR titled “Follow-up: fix invalid main/article nesting in accessibility PR.”

Testing

  • for f in index.html Al_Hamichya.html; do echo "== $f =="; echo -n "open div: "; rg -o '<div\\b' "$f" | wc -l; echo -n "close div: "; rg -o '</div>' "$f" | wc -l; done
  • git diff -- index.html Al_Hamichya.html

View task →

</div>
</div>
</div>
Expand Down Expand Up @@ -192,11 +195,22 @@ <h2>Sukkos</h2>
checkImage("ShivasHaminim");
});

$('.toggleImg').on('keydown', function(e)
{
if (e.key === 'Enter' || e.key === ' ')
{
e.preventDefault();
$(this).trigger('click');
}
});

function checkImage(id)
{
var opacity = $("#" + id).css('opacity');
var isActive = parseFloat(opacity).toFixed(1) !== '0.4';
$("#" + id).attr('aria-pressed', isActive);

if (parseFloat(opacity).toFixed(1) === '0.4')
if (!isActive)
{
sectionShowHide(id, false)
}
Expand Down