diff options
33 files changed, 1143 insertions, 6 deletions
diff --git a/rannak/endPage/index.html b/rannak/endPage/index.html index 24b42a7..a3bcfc7 100644 --- a/rannak/endPage/index.html +++ b/rannak/endPage/index.html @@ -4,7 +4,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <title> Tehtud</title> + <title>Tehtud</title> <link rel="stylesheet" href="style.css" type="text/css"/> </head> diff --git a/rannak/endPage/main.js b/rannak/endPage/main.js index 2813fc0..7f21f65 100644 --- a/rannak/endPage/main.js +++ b/rannak/endPage/main.js @@ -7,7 +7,6 @@ if (localStorage.roll != undefined){ delete localStorage.roll; if (roll == 'Kaitseliitlase'){ - console.log(span1); document.querySelector('h3').innerHTML = 'Baltiketti andmed:'; spans[1].innerHTML = 'Asula: ' + localStorage.asula; spans[2].innerHTML = 'Kaugus: ' + localStorage.kaugus; @@ -15,4 +14,17 @@ if (localStorage.roll != undefined){ delete localStorage.asula; delete localStorage.kaugus; } + + else if (roll == 'Direktori'){ + document.querySelector('h3').innerHTML = 'Baltiketti andmed:'; + spans[3].innerHTML = 'Baltiketi pikkus: ' + localStorage.teekond; + spans[1].innerHTML = 'Asula: ' + localStorage.asula; + spans[2].innerHTML = 'Kaugus: ' + localStorage.kaugus; + + console.log(localStorage.teekond); + + delete localStorage.asula; + delete localStorage.kaugus; + delete localStorage.teekond; + } } diff --git a/rannak/mangud/direktor/baltikett/index.html b/rannak/mangud/direktor/baltikett/index.html new file mode 100644 index 0000000..f4e44cd --- /dev/null +++ b/rannak/mangud/direktor/baltikett/index.html @@ -0,0 +1,121 @@ +<html lang="en"> +<head> + <meta charset="UTF-8"> + <meta name="viewport" content="width=, initial-scale=1.0"> + <title>Baltikett</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="styles.css"> +</head> + +<body class="text-white"> + + <div class="container text-center text-white align-items-center"> + <h1 class="pb-1 pt-2">Baltikett</h1> + <p> + Joonlauaga (vali parempoolsest rippmenüüst joonlaua ikoon + (vasakpoolse paneeli võid ruumi tegemiseks sulgeda)) + saab mitme klikiga mööda joont kaugust mõõta. Selleks, + et saada võimalikult täpne tulemus, zoomi kaardile lähemale + või kaugemale, vastavalt vajadusele.<br>Leia Baltiketi pikkus Eestis + ning sinu kodukoha kaugus ketist. + </p> + + <div class="row"> + <div> + <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + </div> + + + </div> + + + </div> + + + <!-- Modal --> + <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + + <div class="modal-header"> + <div class="modalHeaderWrapper"> + <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> + </div> + <img class="avatar" alt="avatar" src="pildid/avatar.jpg"/> + </div> + + <div class="modal-body"> + + + <p> + <strong>Olen nüüd püüdnud julgelt uue ajaga sammu käia.</strong> + <br> <br> + 23.augustil 1989 aastal käisime kogu kooliperega Balti ketis, + see oli rahumeelne poliitiline meeleavaldus, mille eesmärgiks + oli demonstreerida maailmale Baltimaade vabadustahet ja juhtida + tähelepanu NSV Liidu ja Saksamaa vahel poole sajandi eest sõlmitud + Molotovi-Ribbentropi paktile, mille salaprotokollid viisid Baltimaade + okupeerimise ja annekteerimiseni NSV Liidu poolt. + Meid oli Balti ketis kokku ligi 300 õpilast ja õpetajat, hoidsime + kätest kinni ja tundsime, et oleme selle pika keti väärikas lüli. + Lausa pisar tuli silma, kui hüüdsime üheskoos: “Vabadus, vabadus, vabadus!” + <br> <br> + <strong> + Kas käisid Balti ketis? Mõõda, kui pikk oli Balti keti teekond Eestis? + Kui kaugelt Balti kett sinu kodukohast möödus? Anna vastus kilomeetrites + </strong> + </p> + + </div> + + </div> + </div> + </div> + + + + + <div class="inputWrapper"> + <div> + <label for="teekond">Baltiketi Teekond Eestis:</label> + <input class="teekondInput" name="teekond" type="text" value="" placeholder="Pikkus (km)"/> + </div> + + <div> + <label for="asula">Asula:</label> + <input class="asulaInput" name="asula" type="text" value="" placeholder="Sinu valitud asula"/> + </div> + + <div> + <label class="rightWrapper" for="kaugus">Kaugus:</label> + <input class="kaugusInput" name="kaugus" type="text" value="" placeholder="Kaugus (km)"/> + </div> + </div> + + + + + + <!-- Mainer --> + <div class="main"> + + <iframe width="100%" height="95%" src="https://xgis.maaamet.ee/xgis2/page/link/OFw1OabK"></iframe> + + </div> + + + + + <script src="script.js"></script> + + <!-- JavaScript Bundle with Popper --> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> +</body> +</html> diff --git a/rannak/mangud/direktor/baltikett/pildid/EVkuulutamine.jpg b/rannak/mangud/direktor/baltikett/pildid/EVkuulutamine.jpg Binary files differnew file mode 100644 index 0000000..f462f69 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/EVkuulutamine.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/avatar.jpg b/rannak/mangud/direktor/baltikett/pildid/avatar.jpg Binary files differnew file mode 100644 index 0000000..37ae271 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/avatar.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/baltikett.jpg b/rannak/mangud/direktor/baltikett/pildid/baltikett.jpg Binary files differnew file mode 100644 index 0000000..f395c65 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/baltikett.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/hirvepark.jpg b/rannak/mangud/direktor/baltikett/pildid/hirvepark.jpg Binary files differnew file mode 100644 index 0000000..b94f2b0 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/hirvepark.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/interrinne.jpg b/rannak/mangud/direktor/baltikett/pildid/interrinne.jpg Binary files differnew file mode 100644 index 0000000..3d6d386 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/interrinne.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/laulupidu.jpg b/rannak/mangud/direktor/baltikett/pildid/laulupidu.jpg Binary files differnew file mode 100644 index 0000000..6ad8ad9 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/laulupidu.jpg diff --git a/rannak/mangud/direktor/baltikett/pildid/teletorn.jpg b/rannak/mangud/direktor/baltikett/pildid/teletorn.jpg Binary files differnew file mode 100644 index 0000000..c539324 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/pildid/teletorn.jpg diff --git a/rannak/mangud/direktor/baltikett/script.js b/rannak/mangud/direktor/baltikett/script.js new file mode 100644 index 0000000..f5d1016 --- /dev/null +++ b/rannak/mangud/direktor/baltikett/script.js @@ -0,0 +1,47 @@ +document.addEventListener('DOMContentLoaded', () => { + let btn = document.querySelector('.modalButton'); + btn.click(); +}); + + + +const inputs = document.querySelectorAll('input'); +let asulaVal; +let kaugusVal; +let teekondVal; + +for (input of inputs){ + input.addEventListener('input', () => { + getInputs() + }); +} + + +function getInputs(){ + let teekond = document.querySelector('.teekondInput'); + let asula = document.querySelector('.asulaInput'); + let kaugus = document.querySelector('.kaugusInput'); + + asulaVal = asula.value; + kaugusVal = kaugus.value; + teekondVal = teekond.value; + + if (asulaVal != '' && kaugusVal != '' && teekondVal != '') + allGood(); +} + + + +/// All Done /// + + + +function allGood(){ + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + localStorage.setItem("roll", "Direktori"); + localStorage.setItem("asula", asulaVal); + localStorage.setItem("kaugus", kaugusVal); + localStorage.setItem("teekond", teekondVal); + btn.onclick = () => location.href = "../../../endPage"; +} diff --git a/rannak/mangud/direktor/baltikett/styles.css b/rannak/mangud/direktor/baltikett/styles.css new file mode 100644 index 0000000..cc1f6ec --- /dev/null +++ b/rannak/mangud/direktor/baltikett/styles.css @@ -0,0 +1,98 @@ +* { + box-sizing: border-box; +} +h1 { + color: #154734; + font-weight: bold; +} +body{ + background-color: #4D5157; +} + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; + cursor: not-allowed; +} + + + + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; + max-width: 15rem; +} + +.modalHeaderWrapper{ + text-align: center; + margin: 0; + width: 100%; +} + + + + +.closeModalButton { + border-radius: 50px; +} + + +.modalButton{ + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; +} + + + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8); +} + +span{ + font-size: .1rem; +} + + +/* Mainer */ +.inputWrapper{ + margin-top: 1rem; + display: flex; + items-align: center; + justify-content: center; +} + +.rightWrapper{ + margin-left: 2rem; +} + + +input{margin: .3rem;} + +.main{padding: 2.5%;} +iframe{ + border: solid .5rem black; + border-radius: 10px; +} diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/OFL.txt b/rannak/mangud/direktor/loosung/fonts/alkatra/OFL.txt new file mode 100644 index 0000000..f3e21ec --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Alkatra Project Authors (https://github.com/suman51284/Alkatra)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/README.txt b/rannak/mangud/direktor/loosung/fonts/alkatra/README.txt new file mode 100644 index 0000000..f612e43 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/README.txt @@ -0,0 +1,66 @@ +Alkatra Variable Font +===================== + +This download contains Alkatra as both a variable font and static fonts. + +Alkatra is a variable font with this axis: + wght + +This means all the styles are contained in a single file: + Alkatra-VariableFont_wght.ttf + +If your app fully supports variable fonts, you can now pick intermediate styles +that aren’t available as static fonts. Not all apps support variable fonts, and +in those cases you can use the static font files for Alkatra: + static/Alkatra-Regular.ttf + static/Alkatra-Medium.ttf + static/Alkatra-SemiBold.ttf + static/Alkatra-Bold.ttf + +Get started +----------- + +1. Install the font files you want to use + +2. Use your app's font picker to view the font family and all the +available styles + +Learn more about variable fonts +------------------------------- + + https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts + https://variablefonts.typenetwork.com + https://medium.com/variable-fonts + +In desktop apps + + https://theblog.adobe.com/can-variable-fonts-illustrator-cc + https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts + +Online + + https://developers.google.com/fonts/docs/getting_started + https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide + https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts + +Installing fonts + + MacOS: https://support.apple.com/en-us/HT201749 + Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux + Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows + +Android Apps + + https://developers.google.com/fonts/docs/android + https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts + +License +------- +Please read the full license text (OFL.txt) to understand the permissions, +restrictions and requirements for usage, redistribution, and modification. + +You can use them in your products & projects – print or digital, +commercial or otherwise. + +This isn't legal advice, please consider consulting a lawyer and see the full +license for all details. diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/alkatara.ttf b/rannak/mangud/direktor/loosung/fonts/alkatra/alkatara.ttf Binary files differnew file mode 100644 index 0000000..f39dae7 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/alkatara.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Bold.ttf b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Bold.ttf Binary files differnew file mode 100644 index 0000000..3b347f1 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Bold.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Medium.ttf b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Medium.ttf Binary files differnew file mode 100644 index 0000000..f8cc0e2 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Medium.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Regular.ttf b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Regular.ttf Binary files differnew file mode 100644 index 0000000..e6f0bb5 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-Regular.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-SemiBold.ttf b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-SemiBold.ttf Binary files differnew file mode 100644 index 0000000..a74197d --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/alkatra/static/Alkatra-SemiBold.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/bebas/Bebas_Neue.zip b/rannak/mangud/direktor/loosung/fonts/bebas/Bebas_Neue.zip Binary files differnew file mode 100644 index 0000000..0a4553d --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/bebas/Bebas_Neue.zip diff --git a/rannak/mangud/direktor/loosung/fonts/bebas/OFL.txt b/rannak/mangud/direktor/loosung/fonts/bebas/OFL.txt new file mode 100644 index 0000000..9d66059 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/bebas/OFL.txt @@ -0,0 +1,93 @@ +Copyright © 2010 by Dharma Type.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/mangud/direktor/loosung/fonts/bebas/bebas.ttf b/rannak/mangud/direktor/loosung/fonts/bebas/bebas.ttf Binary files differnew file mode 100644 index 0000000..d2190b5 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/bebas/bebas.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/changa/ChangaOne-Italic.ttf b/rannak/mangud/direktor/loosung/fonts/changa/ChangaOne-Italic.ttf Binary files differnew file mode 100644 index 0000000..e0652fc --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/changa/ChangaOne-Italic.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/changa/OFL.txt b/rannak/mangud/direktor/loosung/fonts/changa/OFL.txt new file mode 100644 index 0000000..2ea25fa --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/changa/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2011, Eduardo Tunni (http://www.tipo.net.ar),
+with Reserved Font Name "Changa"
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/mangud/direktor/loosung/fonts/changa/changa.ttf b/rannak/mangud/direktor/loosung/fonts/changa/changa.ttf Binary files differnew file mode 100644 index 0000000..3d238fc --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/changa/changa.ttf diff --git a/rannak/mangud/direktor/loosung/fonts/handrawn/OFL.txt b/rannak/mangud/direktor/loosung/fonts/handrawn/OFL.txt new file mode 100644 index 0000000..33ece60 --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/handrawn/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Delicious Handrawn Project Authors (https://github.com/alphArtype/Delicious-Handrawn)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/rannak/mangud/direktor/loosung/fonts/handrawn/handrawn.ttf b/rannak/mangud/direktor/loosung/fonts/handrawn/handrawn.ttf Binary files differnew file mode 100644 index 0000000..ca25b7a --- /dev/null +++ b/rannak/mangud/direktor/loosung/fonts/handrawn/handrawn.ttf diff --git a/rannak/mangud/direktor/loosung/index.html b/rannak/mangud/direktor/loosung/index.html new file mode 100644 index 0000000..b3dc5d5 --- /dev/null +++ b/rannak/mangud/direktor/loosung/index.html @@ -0,0 +1,154 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="UTF-8"> + + <title>Loosung</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> + +<body> + + + <div class="container text-white text-center"> + <h1>Loosung</h1> + + <p> + Loe ja uuri alltoodud sündmuste kohta ning vali neist siis üks + <br> + ja koosta selle kohta loosung. + </p> + + <div class="text-center"> + + <div class="col"> + <button class="moveOn" disabled>Liigu Edasi</button> + + <!-- Button trigger modal --> + <button id="testModal" type="button" class="btn btn-primary modalButton" data-bs-toggle="modal" data-bs-target="#myModal"> + Sissejuhatus + </button> + </div> + + </div> + </div> + + + + + <!-- Modal --> + <div class="modal fade text-black" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + + <div class="modal-header"> + <div class="modalHeaderWrapper"> + <h3 class="modal-title" id="myModalLabel">Sissejuhatus</h5> + </div> + <img class="avatar" alt="avatar" src="pildid/avatar.png"/> + </div> + + <div class="modal-body"> + <p> + Eestimaa on ärganud uuele poliitilisele elule. Pidevalt toimub + mõni rahvuslikult meelestatud üritus. Ole sinagi aktiivne ja + tegutse Eesti hüvanguks! Mõtle, millisest üritusest soovid + osa võtta: Hirvepargi miiting, Tartu muinsuskaitsepäevad, + Roheliste rattaretk Virumaal, Öölaulupidu, Balti kett, + Teletorni kaitsmine… ? + <br><br> + <strong> + Et meeleolu oleks kohe alguses õige ja sinu mõtted + kaugele näha, vali üks sündmus ning pane kirja loosung! + </strong> + <p> + </div> + + </div> + </div> + </div> + + + + + <!-- Mainy --> + + <div class="main"> + + <div class="options"> + + <label for="fondid">Vali font:</label> + <select id="fontPick" name="fondid"> + <option value="tavaline" selected>Tavaline</option> + <option value="alkatara">Alkatara</option> + <option value="bebas">Bebas</option> + <option value="changa">Changa</option> + <option value="handrawn">Handrawn</option> + </select> + + <label for="fontSize">Teksti suurus:</label> + <input type="number" value="20" size="5" id="fontSize" name="fontSize" min="10" max="50"> + + <label for="color">Särgi värv:</label> + <input type="color" id="fontColor" value="#ffffff"/> + + <button id="resetBtn">Taasta</button> + + </div> + + <div class="loosungWrapper"> + <h3 id="loosung" contenteditable=true>Muuda loosung enda omaks!</h3> + </div> + + + + <div class="info"> + <h4>Loe sündmustest Lähemalt ning vali siis üks:</h4> + <div class="innerWrapper"> + <div> + <input type="radio" id="sundmus" name="sundmuseValik" value="hirvepark"> + <a href="https://et.wikipedia.org/wiki/Hirvepargi_miiting" target="_blank">Hirvepargi miiting</a> + </div> + <div> + <input type="radio" id="sundmus" name="sundmuseValik" value="ratas"> + <a href="https://et.wikipedia.org/wiki/Roheliste_rattaretk" target="_blank">Roheliste rattaretk</a> + </div> + <div> + <input type="radio" id="sundmus" name="sundmuseValik" value="muinsus"> + <a href="https://et.wikipedia.org/wiki/Tartu_muinsuskaitsep%C3%A4evad" target="_blank">Tartu muinsuskaitsepäevad</a> + </div> + + <div> + + <input type="radio" id="sundmus" name="sundmuseValik" value="laulupidu"> + <a href="https://et.wikipedia.org/wiki/%C3%96%C3%B6laulupidu" target="_blank">Öölaulupidu</a> + </div> + + <div> + <input type="radio" id="sundmus" name="sundmuseValik" value="baltikett"> + <a href="https://et.wikipedia.org/wiki/Balti_kett" target="_blank">Balti kett</a> + </div> + + <div> + <input type="radio" id="sundmus" name="sundmuseValik" value="teletorn"> + <a href="https://et.wikipedia.org/wiki/Augustiput%C5%A1_Eestis" target="_blank">Teletorni kaitsmine 1991</a> + </div> + + </div> + </div> + + + </div> <!-- End of main class--> + + + + <script src="script.js"></script> + + <!-- JavaScript Bundle with Popper --> + <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-A3rJD856KowSb7dwlZdYEkO39Gagi7vIsF0jrRAoQmDKKtQBHUuLZ9AsSv4jD4Xa" crossorigin="anonymous"></script> + +</body> +</html> diff --git a/rannak/mangud/direktor/loosung/pildid/avatar.png b/rannak/mangud/direktor/loosung/pildid/avatar.png Binary files differnew file mode 100644 index 0000000..94d7a31 --- /dev/null +++ b/rannak/mangud/direktor/loosung/pildid/avatar.png diff --git a/rannak/mangud/direktor/loosung/script.js b/rannak/mangud/direktor/loosung/script.js new file mode 100644 index 0000000..191d743 --- /dev/null +++ b/rannak/mangud/direktor/loosung/script.js @@ -0,0 +1,124 @@ +document.addEventListener('DOMContentLoaded', () => { + let btn = document.querySelector('.modalButton'); + btn.click(); +}); + + +// To Know when to move on +changedArr = new Array(); + + + + +// Loosung Font +let fontPick = document.querySelector("#fontPick"); +fontPick.addEventListener("change", () => { + + let loosung = document.querySelector("#loosung"); + let val = fontPick.value; + loosung.style.fontFamily = val; + + if (!changedArr.includes("font")) + changedArr.push("font"); + + CheckIfAllGood(); + +}); + + + +// Loosung Size +let fontSize = document.querySelector("#fontSize"); +fontSize.addEventListener("change", () => { + + + let loosung = document.querySelector("#loosung"); + let val = fontSize.value; + let newSize = parseInt(val)/10; + + + if (val > 50) + loosung.style.fontSize="5rem"; + + else if (val < 10) + loosung.style.fontSize="1rem"; + + else + loosung.style.fontSize = newSize+"rem"; + + + if (!changedArr.includes("size")) + changedArr.push("size"); + + CheckIfAllGood(); + +}); + + + + +// Loosung Color +let fontColor = document.querySelector("#fontColor"); +fontColor.addEventListener("change", () => { + + let loosung = document.querySelector("#loosung"); + let val = fontColor.value; + loosung.style.color = val; + + + if (!changedArr.includes("color")) + changedArr.push("color"); + + CheckIfAllGood(); + +}); + + + + +// Reset BTN +let resetBtn = document.querySelector("#resetBtn"); +resetBtn.addEventListener("click", () => { + + let loosung = document.querySelector("#loosung"); + loosung.style.color= "#fff"; + loosung.style.fontSize= "2rem"; + loosung.style.fontFamily= "inherit"; + + fontPick.value = "tavaline"; + fontColor.value = "#ffffff"; + fontSize.value = 20; + + loosung.innerHTML = "Muuda Loosung enda omaks!"; + changedArr = new Array(); +}); + + +document.querySelector("#loosung").addEventListener("input", () => {CheckIfAllGood()}) + + + + +// Funcs // + +function CheckIfAllGood(){ + //let radioBtn = document.querySelector("input[name='sundmuseValik']:checked"); + let loosung = document.querySelector("#loosung"); + + + if (document.querySelector("input[name='sundmuseValik']:checked") != null && + changedArr.length >= 3 && loosung.innerHTML != "Muuda loosung enda omaks!"){ + moveOnEnable(); + } + + return false +} + + +// If Done +function moveOnEnable(){ + const btn = document.querySelector(".moveOn"); + btn.disabled = false; + btn.onclick = () => location.href = ""; +} + diff --git a/rannak/mangud/direktor/loosung/style.css b/rannak/mangud/direktor/loosung/style.css new file mode 100644 index 0000000..c605ce8 --- /dev/null +++ b/rannak/mangud/direktor/loosung/style.css @@ -0,0 +1,142 @@ + @font-face { + font-family: "alkatara"; + src: url(fonts/alkatra/alkatara.ttf); +} + + @font-face { + font-family: "bebas"; + src: url(fonts/bebas/bebas.ttf); +} + + @font-face { + font-family: "changa"; + src: url(fonts/changa/changa.ttf); +} + + @font-face { + font-family: "handrawn"; + src: url(fonts/handrawn/handrawn.ttf); +} + +/*--------------------------------------*/ + +* { + box-sizing: border-box; +} + +body{ + background-color: #43464b; + color: white; +} + +h1 { + color: #ED8B00; + font-weight: bold; +} + +.moveOn{ + display: inline-block; + border: none; + padding: 6px 12px; + margin-botton: 0; + font-size: 1rem; + font-weight: normal; + text-align: center; + cursor: pointer; + border-radius: 4px; + background-color: #4BB543; + color: white; +} + +button:disabled{ + opacity: 0.5; + cursor: not-allowed; +} + + + +/* Modal Stuff */ + +.avatar { + border-radius: 20px; + width: 100%; + max-width: 15rem; +} + +.modalHeaderWrapper{ + text-align: center; + margin: 0; + width: 100%; +} + +.modalButton{ + display: inline-block; + padding: 6px 12px; + margin-left: 30px; + background-color: rgba(0,136,169,1); + border: none; + border-radius: 50px; + cursor: pointer; + transition: all 0.3 ease 0; + font-size: 1rem; +} + +.modalButton:hover{ + background-color: rgba(0,136,169,0.8); +} + + +/* Mainers */ + +.main{ + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: 5% 15%; +} + +.loosungWrapper { + overflow: hidden; + overflow-wrap: break-word; +} + +#loosung{ + padding: 6rem 1rem; + font-size: 2rem; + border-top: 3px solid #fff; + border-bottom: 3px solid #fff; +} + + + +.info .innerWrapper{ + display: flex; + flex-direction: column; + justify-content: start; + align-items: start; +} + + +.info h4{ + margin-top: 2rem; + color: #ED8B00; +} + +.info a { + text-decoration: underline; + color: white; +} + + +#resetBtn{ + border: none; + border-radius: 4px; + font-size:1.3rem; + color:white; + padding: 4px; + margin: .7rem; + font-size: 0.9rem; + background-color: red; + margin-left: 3rem; +} diff --git a/rannak/mangud/index.html b/rannak/mangud/index.html index 526809b..908b763 100644 --- a/rannak/mangud/index.html +++ b/rannak/mangud/index.html @@ -64,8 +64,8 @@ <h3>Direktor</h3> <ol> <li><a href="direktor/kone">Kõne</a></li> - <li></li> - <li></li> + <li><a href="direktor/baltikett">Baltikett</a></li> + <li><a href="direktor/loosung">Loosung</a></li> </ol> </div> diff --git a/rannak/mangud/kaitseliitlane/soomusmasinad/index.html b/rannak/mangud/kaitseliitlane/soomusmasinad/index.html index c94ad66..3eae230 100644 --- a/rannak/mangud/kaitseliitlane/soomusmasinad/index.html +++ b/rannak/mangud/kaitseliitlane/soomusmasinad/index.html @@ -14,11 +14,11 @@ <div class="container text-center text-white align-items-center"> <h1 class="pb-1 pt-2">Soomusmasinad</h1> <p> - Joonlauaga (vali parempoolsest menüüst joonlaua ikoon + Joonlauaga (vali parempoolsest rippmenüüst joonlaua ikoon (vasakpoolse paneeli võid ruumi tegemiseks sulgeda)) saab mitme klikiga mööda joont kaugust mõõta. Selleks, et saada võimalikult täpne tulemus, zoomi kaardile lähemale - ning liigu hiirega klõpsates mööda valitud teekonda baltiketini. + ning liigu hiirega klõpsates mööda valitud teekonda soomusmasinate teekonnani. </p> <div class="row"> |
