diff options
Diffstat (limited to 'rannak')
20 files changed, 103 insertions, 37 deletions
diff --git a/rannak/mangud/arimees/muusika/index.html b/rannak/mangud/arimees/muusika/index.html index 6a1e1ce..ef453ec 100644 --- a/rannak/mangud/arimees/muusika/index.html +++ b/rannak/mangud/arimees/muusika/index.html @@ -19,6 +19,7 @@ <p> Vajuta lingile ja vaata muusikavideosid youtubes ning seejärel järjesta vastavalt oma eelistustele. + <br> Põhjenda oma esikohta tekstiväljal. </p> @@ -97,10 +98,14 @@ </a> </div> + + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/EestlaneOlen.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> @@ -127,10 +132,13 @@ </a> </div> + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/TerePerestroika.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> @@ -157,10 +165,13 @@ </a> </div> + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/OhkKonnibTanaval.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> @@ -187,10 +198,13 @@ </a> </div> + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/MagedeHaal.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> @@ -217,10 +231,13 @@ </a> </div> + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/TulgeKoik.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> @@ -247,10 +264,13 @@ </a> </div> + <textarea name="pohjendus" placeholder="Põhjendus..." rows="2"></textarea> + <!-- <audio controls> <source src="laulud/AppiMaVajanArmastust.mp3" type="audio/mpeg"> Your browser does not support the audio element. </audio> + --> </div> </li> diff --git a/rannak/mangud/arimees/muusika/script.js b/rannak/mangud/arimees/muusika/script.js index 0bcaae0..85d0292 100644 --- a/rannak/mangud/arimees/muusika/script.js +++ b/rannak/mangud/arimees/muusika/script.js @@ -4,8 +4,12 @@ document.addEventListener('DOMContentLoaded', () => { }); -const selectors = document.querySelectorAll('select'); +allPohjendatud = false; +allSelected = false; + +// EventListenres +const selectors = document.querySelectorAll('select'); for(el of selectors){ el.addEventListener('change', () => { @@ -16,13 +20,46 @@ for(el of selectors){ } if (selected.length == 6) + allSelected = true; + else + allSelected = false; + + if (allPohjendatud && allSelected) + moveOnEnable(); + }); +} + + + +const pohjendused = document.querySelectorAll('textarea'); +for(el of pohjendused){ + el.addEventListener('input', () => { + + let pohjendatud = new Array(); + for (el of pohjendused){ + if (!pohjendatud.includes(el) && el.value != '') + pohjendatud.push(el); + } + + if (pohjendatud.length == 6) + allPohjendatud = true; + else + allPohjendatud = false; + + if (allPohjendatud && allSelected) moveOnEnable(); }); } -// If All Else Done + + + + + + +// If All Done function moveOnEnable(){ const btn = document.querySelector(".moveOn"); diff --git a/rannak/mangud/arimees/muusika/style.css b/rannak/mangud/arimees/muusika/style.css index 3b7e248..cbc77a9 100644 --- a/rannak/mangud/arimees/muusika/style.css +++ b/rannak/mangud/arimees/muusika/style.css @@ -101,6 +101,12 @@ li:nth-child(even){background-color: #eee8;} li:hover{transform: scale(1.03);} +textarea{ + width: 80%; + margin: 0 .7rem; +} + + .laul{ display: flex; align-items: center; @@ -108,13 +114,6 @@ li:hover{transform: scale(1.03);} min-width: 100%; } -.laulInner { - display: flex; - justify-content: space-between; - -} - - .info { padding-left: 1rem; @@ -123,19 +122,22 @@ li:hover{transform: scale(1.03);} width: 50%; } -.audioWrap{ - width: 50%; -} - .info a { text-decoration: underline; font-weight: bold; color: #000; } + + + .info h2{font-size: 1.2rem;} select{margin-right: 1rem;} + + + + select { -webkit-appearance: menulist-button; height: 3rem; diff --git a/rannak/mangud/direktor/baltikett/pildid/avatar.png b/rannak/mangud/direktor/baltikett/pildid/avatar.png Binary files differindex 7b13556..d643367 100644 --- a/rannak/mangud/direktor/baltikett/pildid/avatar.png +++ b/rannak/mangud/direktor/baltikett/pildid/avatar.png diff --git a/rannak/mangud/direktor/kone/pildid/avatar.png b/rannak/mangud/direktor/kone/pildid/avatar.png Binary files differindex 7b13556..d643367 100644 --- a/rannak/mangud/direktor/kone/pildid/avatar.png +++ b/rannak/mangud/direktor/kone/pildid/avatar.png diff --git a/rannak/mangud/direktor/loosung/pildid/avatar.png b/rannak/mangud/direktor/loosung/pildid/avatar.png Binary files differindex 7b13556..d643367 100644 --- a/rannak/mangud/direktor/loosung/pildid/avatar.png +++ b/rannak/mangud/direktor/loosung/pildid/avatar.png diff --git a/rannak/mangud/partorg/plakat/img/stalinBlank.png b/rannak/mangud/partorg/plakat/img/stalinBlank.png Binary files differindex 7efdc4e..1f5183e 100644 --- a/rannak/mangud/partorg/plakat/img/stalinBlank.png +++ b/rannak/mangud/partorg/plakat/img/stalinBlank.png diff --git a/rannak/mangud/perenaine/kuulamine/index.html b/rannak/mangud/perenaine/kuulamine/index.html index 8b2cd6f..21a3a6e 100644 --- a/rannak/mangud/perenaine/kuulamine/index.html +++ b/rannak/mangud/perenaine/kuulamine/index.html @@ -2,11 +2,10 @@ <html lang="en"> <head> <meta charset="UTF-8"> - <title>Kuulamine</title> + <!-- Bootstrap - CSS only --> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous"> - <link rel="stylesheet" href="style.css"> </head> @@ -165,7 +164,7 @@ <div class="tableWrapper"> <h3 class="minuPlaan">MINU SUKKPÜKSTE HANKIMISE PLAAN:</h3> - <p>NB: Sisesta vastused nimetavas käänetes. Kui veerg on korrektne, muutub see roheliseks.</p> + <p>NB: Sisesta vastused nimetavas käänetes.</p> <table class="table table-dark table-striped"> @@ -196,7 +195,7 @@ <td class="toBeEdited">Kellele </td> </tr> <tr> - <td class="toBeEdited">Mida </td> + <td class="toBeEdited firstCheck">Mida </td> </tr> </table> </td> @@ -207,7 +206,7 @@ <td class="toBeEdited">Kellele </td> </tr> <tr> - <td class="toBeEdited">Mida </td> + <td class="toBeEdited secCheck">Mida </td> </tr> </table> </td> @@ -218,7 +217,7 @@ <td class="toBeEdited">Kellele </td> </tr> <tr> - <td class="toBeEdited">Mida </td> + <td class="toBeEdited thirdCheck">Mida </td> </tr> </table> </td> @@ -227,9 +226,9 @@ <tr> <td><strong>Saan</strong></td> - <td class="toBeEdited">Mille</td> - <td class="toBeEdited">Mille</td> - <td class="toBeEdited">Mille</td> + <td class="toBeEdited firstCheck">Mille</td> + <td class="toBeEdited secCheck">Mille</td> + <td class="toBeEdited thirdCheck">Mille</td> <td><strong>Käes!</strong></td> </tr> </table> diff --git a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png Binary files differindex 41c1bb9..b0cd3a1 100644 --- a/rannak/mangud/perenaine/kuulamine/pildid/avatar.png +++ b/rannak/mangud/perenaine/kuulamine/pildid/avatar.png diff --git a/rannak/mangud/perenaine/kuulamine/script.js b/rannak/mangud/perenaine/kuulamine/script.js index 680c6fd..72b8e70 100644 --- a/rannak/mangud/perenaine/kuulamine/script.js +++ b/rannak/mangud/perenaine/kuulamine/script.js @@ -6,11 +6,18 @@ document.addEventListener('DOMContentLoaded', () => { const cells = document.querySelectorAll(".toBeEdited"); -console.log(cells); + +// For Checking +firsts = document.querySelectorAll(".firstCheck"); +secs = document.querySelectorAll(".secCheck"); +thirds = document.querySelectorAll(".thirdCheck"); + + + + for (let i=0;i < cells.length; i++){ cells[i].onclick = function(){ - console.log('Clicked'); if (this.hasAttribute('data-clicked')) return; @@ -41,7 +48,6 @@ for (let i=0;i < cells.length; i++){ td.removeAttribute('data-text'); td.innerHTML = curText; td.style.cssText = 'padding: .5rem .5rem'; - console.log('Sth Change'); } else { td.removeAttribute('data-clicked'); @@ -52,7 +58,15 @@ for (let i=0;i < cells.length; i++){ // Here Check if Done - //TODO + if (firsts[0].textContent != '' && firsts[0].textContent == firsts[1].textContent){ + if (secs[0].textContent != '' && secs[0].textContent == secs[1].textContent){ + + if (thirds[0].textContent != '' && thirds[0].textContent == thirds[1].textContent) + moveOnEnable(); + + } + } + @@ -80,17 +94,6 @@ for (let i=0;i < cells.length; i++){ -/// Chekers Funcers /// - - - - - - - - - - // If Done diff --git a/rannak/mangud/perenaine/kuulamine/style.css b/rannak/mangud/perenaine/kuulamine/style.css index effe5f9..5ae01a5 100644 --- a/rannak/mangud/perenaine/kuulamine/style.css +++ b/rannak/mangud/perenaine/kuulamine/style.css @@ -83,3 +83,8 @@ strong{font-size: 1.1rem;} border-top: 4px solid white; color: #FEDD00; } + + + + + diff --git a/rannak/mangud/perenaine/memori/img/avatar.png b/rannak/mangud/perenaine/memori/img/avatar.png Binary files differindex 41c1bb9..b0cd3a1 100644 --- a/rannak/mangud/perenaine/memori/img/avatar.png +++ b/rannak/mangud/perenaine/memori/img/avatar.png diff --git a/rannak/mangud/perenaine/ristsona/pildid/avatar.png b/rannak/mangud/perenaine/ristsona/pildid/avatar.png Binary files differindex 41c1bb9..b0cd3a1 100644 --- a/rannak/mangud/perenaine/ristsona/pildid/avatar.png +++ b/rannak/mangud/perenaine/ristsona/pildid/avatar.png diff --git a/rannak/rolliValik/pildid/direktor.bak.png b/rannak/rolliValik/pildid/direktor.bak.png Binary files differnew file mode 100644 index 0000000..7b13556 --- /dev/null +++ b/rannak/rolliValik/pildid/direktor.bak.png diff --git a/rannak/rolliValik/pildid/direktor.jpg b/rannak/rolliValik/pildid/direktor.jpg Binary files differnew file mode 100644 index 0000000..2a0d71c --- /dev/null +++ b/rannak/rolliValik/pildid/direktor.jpg diff --git a/rannak/rolliValik/pildid/direktor.png b/rannak/rolliValik/pildid/direktor.png Binary files differindex 7b13556..d643367 100644 --- a/rannak/rolliValik/pildid/direktor.png +++ b/rannak/rolliValik/pildid/direktor.png diff --git a/rannak/rolliValik/pildid/perenaine.bak.png b/rannak/rolliValik/pildid/perenaine.bak.png Binary files differnew file mode 100644 index 0000000..41c1bb9 --- /dev/null +++ b/rannak/rolliValik/pildid/perenaine.bak.png diff --git a/rannak/rolliValik/pildid/perenaine.jpg b/rannak/rolliValik/pildid/perenaine.jpg Binary files differnew file mode 100644 index 0000000..4f74a65 --- /dev/null +++ b/rannak/rolliValik/pildid/perenaine.jpg diff --git a/rannak/rolliValik/pildid/perenaine.png b/rannak/rolliValik/pildid/perenaine.png Binary files differindex 41c1bb9..b0cd3a1 100644 --- a/rannak/rolliValik/pildid/perenaine.png +++ b/rannak/rolliValik/pildid/perenaine.png diff --git a/rannak/rolliValik/vids/partorg.mp4 b/rannak/rolliValik/vids/partorg.mp4 Binary files differdeleted file mode 100644 index 7ca12fd..0000000 --- a/rannak/rolliValik/vids/partorg.mp4 +++ /dev/null |
