summaryrefslogtreecommitdiff
path: root/rannak/mangud/partorg/plakat
diff options
context:
space:
mode:
Diffstat (limited to 'rannak/mangud/partorg/plakat')
-rw-r--r--rannak/mangud/partorg/plakat/index.html81
-rw-r--r--rannak/mangud/partorg/plakat/script.js8
-rw-r--r--rannak/mangud/partorg/plakat/styles.css5
3 files changed, 45 insertions, 49 deletions
diff --git a/rannak/mangud/partorg/plakat/index.html b/rannak/mangud/partorg/plakat/index.html
index 9dc2bac..93ac138 100644
--- a/rannak/mangud/partorg/plakat/index.html
+++ b/rannak/mangud/partorg/plakat/index.html
@@ -47,9 +47,9 @@
</div>
<div class="modal-body">
- Peale ajalehe väljalõigete olen aastate jooksul kogunud ja säilitanud meeleolukaid plakateid nõukogudeaja kuldsest elust.
+ Peale ajalehe väljalõigete olen aastate jooksul kogunud ja säilitanud meeleolukaid plakateid nõukogude aja kuldsest elust.
<br/>
- Jagan siinkohal teiega, seltsimehed noored, nelja nendest. Plakatid on pärit erinevatest aastakümnetest: <br/>1950ndad, 1960ndad, 1970ndad ja 1980ndad aastad.
+ Jagan siinkohal teiega, seltsimehed noored, nelja nendest. Plakatid on pärit erinevatest aastakümnetest: <br/>1950., 1960., 1970. ja 1980. aastad.
<br/>
<br/>
Palun uurige nende plakatite sisu ja vormi.
@@ -57,7 +57,7 @@
Õppige, õppige, õppige! Kas tajute, millisesse kümnendisse iga plakat kuulub?
<br/> <br/>
<strong>
- Mõelge plakatitele välja uus, kaasaega sobiv lööklause. Samuti kaunistage ja täiendage plakatit kaasaegsete kunsiliste detailidega. Ka huumor on lubatud!
+ Mõetle igale plakatitele välja uus, kaasaega sobiv loosungi tekst!
</strong>
</div>
@@ -73,15 +73,15 @@
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
- <button class="nav-link active" id="nav-60ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-60ndad" type="button" role="tab" aria-controls="nav-60ndad" aria-selected="true">
+ <button class="nav-link active" id="nav-70ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-70ndad" type="button" role="tab" aria-controls="nav-70ndad" aria-selected="true">
1
</button>
-
- <button class="nav-link" id="nav-70ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-70ndad" type="button" role="tab" aria-controls="nav-70ndad" aria-selected="false">
- 2
- </button>
<button class="nav-link" id="nav-90ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-90ndad" type="button" role="tab" aria-controls="nav-90ndad" aria-selected="false">
+ 2
+ </button>
+
+ <button class="nav-link" id="nav-60ndad-tab" data-bs-toggle="tab" data-bs-target="#nav-60ndad" type="button" role="tab" aria-controls="nav-60ndad" aria-selected="false">
3
</button>
@@ -93,17 +93,21 @@
</div>
</nav>
- <div class="tab-content" id="nav-tabContent">
-
- <div class="tab-pane fade show active p-3 text-white" id="nav-60ndad" role="tabpanel" aria-labelledby="nav-60ndad-tab">
+
+
+ <!-- Containers -->
+
+ <div class="tab-content" id="nav-tabContent">
+
+ <div class="tab-pane fade show active p-3 p-3 text-white" id="nav-70ndad" role="tabpanel" aria-labelledby="nav-70ndad-tab">
<div class="wrapper">
- <div class="plakatWrapper stalin"></div>
+ <div class="plakatWrapper veekogud"></div>
- <div id="stalin" class="inputWrapper">
- <select id="stalin" class="50">
+ <div id="veekogud" class="inputWrapper">
+ <select id="veekogud" class="60">
<option disabled hidden selected>Vali</option>
<option value="50">1950ndad</option>
<option value="60">1960ndad</option>
@@ -111,11 +115,10 @@
<option value="80">1980ndad</option>
</select>
-
- <strong><label for="stalin">Lisa Tekst</label></strong>
- <input disabled name="stalin" type="text" value=""/>
+ <strong><label for="veekogud">Lisa Tekst</label></strong>
+ <input disabled name="veekogud" type="text" value=""/>
<button disabled class="muuda">Lisa</button>
-
+
<div>
<button disabled class="ules">&uarr;</button>
<button disabled class="alla">&darr;</button>
@@ -132,18 +135,18 @@
</div>
- </div>
+ </div>
</div>
-
- <div class="tab-pane fade p-3 text-white" id="nav-70ndad" role="tabpanel" aria-labelledby="nav-70ndad-tab">
+
+ <div class="tab-pane fade p-3 text-white" id="nav-80ndad" role="tabpanel" aria-labelledby="nav-80ndad-tab">
<div class="wrapper">
- <div class="plakatWrapper veekogud"></div>
+ <div class="plakatWrapper malev pikkPlakat"></div>
- <div id="veekogud" class="inputWrapper">
- <select id="veekogud" class="60">
+ <div id="malev" class="inputWrapper">
+ <select id="malev" class="70">
<option disabled hidden selected>Vali</option>
<option value="50">1950ndad</option>
<option value="60">1960ndad</option>
@@ -151,8 +154,8 @@
<option value="80">1980ndad</option>
</select>
- <strong><label for="veekogud">Lisa Tekst</label></strong>
- <input disabled name="veekogud" type="text" value=""/>
+ <strong><label for="malev">Lisa Tekst</label></strong>
+ <input disabled name="malev" type="text" value=""/>
<button disabled class="muuda">Lisa</button>
<div>
@@ -176,18 +179,13 @@
-
-
-
-
-
- <div class="tab-pane fade p-3 text-white" id="nav-80ndad" role="tabpanel" aria-labelledby="nav-80ndad-tab">
+ <div class="tab-pane fade text-white" id="nav-60ndad" role="tabpanel" aria-labelledby="nav-60ndad-tab">
<div class="wrapper">
- <div class="plakatWrapper malev pikkPlakat"></div>
+ <div class="plakatWrapper stalin"></div>
- <div id="malev" class="inputWrapper">
- <select id="malev" class="70">
+ <div id="stalin" class="inputWrapper">
+ <select id="stalin" class="50">
<option disabled hidden selected>Vali</option>
<option value="50">1950ndad</option>
<option value="60">1960ndad</option>
@@ -195,10 +193,11 @@
<option value="80">1980ndad</option>
</select>
- <strong><label for="malev">Lisa Tekst</label></strong>
- <input disabled name="malev" type="text" value=""/>
+
+ <strong><label for="stalin">Lisa Tekst</label></strong>
+ <input disabled name="stalin" type="text" value=""/>
<button disabled class="muuda">Lisa</button>
-
+
<div>
<button disabled class="ules">&uarr;</button>
<button disabled class="alla">&darr;</button>
@@ -215,11 +214,12 @@
</div>
- </div>
+ </div>
</div>
+
<div class="tab-pane fade p-3 text-white" id="nav-90ndad" role="tabpanel" aria-labelledby="nav-90ndad-tab">
<div class="wrapper">
@@ -258,9 +258,6 @@
</div>
-
-
-
</div>
</div>
diff --git a/rannak/mangud/partorg/plakat/script.js b/rannak/mangud/partorg/plakat/script.js
index 7b19edd..1435d10 100644
--- a/rannak/mangud/partorg/plakat/script.js
+++ b/rannak/mangud/partorg/plakat/script.js
@@ -15,38 +15,40 @@ let newTextBtns = document.querySelectorAll(".muuda");
newTextBtns.forEach(btn => {
btn.addEventListener("click" , e => {
+ console.log("clicked");
for (el of e.target.parentElement.parentElement.childNodes[1].childNodes) {
- console.log(el);
if (el.classList != undefined && el.classList.contains("addedText")){
el.classList.remove("addedText");
- console.log('dingdong');
}
}
let inputText = e.target.parentElement.childNodes[5].value;
+
let mySpan = document.createElement('span');
mySpan.classList.add('addedText');
mySpan.classList.add('oldAddedText');
mySpan.innerHTML = inputText;
+
let parentEl= e.target.parentElement.parentElement.childNodes[1];
parentEl.appendChild(mySpan);
mySpan.style.top = "50%";
mySpan.style.left = "35%";
- e.target.parentElement.childNodes[5].value = '';
+ e.target.parentElement.childNodes[5].value = '';
if (!addedTexts.includes(parentEl.classList[1]))
addedTexts.push(parentEl.classList[1]);
+
// Check If Done
if (addedTexts.length >= 4)
checkIfAllGood();
diff --git a/rannak/mangud/partorg/plakat/styles.css b/rannak/mangud/partorg/plakat/styles.css
index 0ebe5f2..4010831 100644
--- a/rannak/mangud/partorg/plakat/styles.css
+++ b/rannak/mangud/partorg/plakat/styles.css
@@ -190,13 +190,10 @@ input:disabled{
}
.pikkPlakat{
- height: 78vh;
+ height: 98vh;
}
.addedText, .oldAddedText {
position: absolute;
font-size: 1.5rem;
}
-
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:08:17 +0000