JasTobi/WeihnachtsKalenderMelly
3
0
Fork 0
Code Issues 3 Pull Requests Releases 4 Activity

Update 23 #32

Merged
Jason merged 14 commits from Develop into master 2023-11-06 14:40:24 +01:00
Conversation 0 Commits 14 Files Changed 7029 +223 -32
19 changed files with 223 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2ae47f86f0 - Show all commits

14
index.php
View File

@@ -26,21 +26,28 @@ if ($tab == "") {$tab = "home";}
<script src="main/lightbox-plus-jquery.min.js"></script>
<!--link rel="stylesheet" type="text/css" href="main/lightbox.min.css"-->
<script src="main/nav2.js"></script>
<script src="main/.js"></script>
<script src="main/schnee.js"></script>
<!--script src="main/schneeTeet.js"></script-->
</head>
<div class="develop">
<h1>!!! Develop !!!</h1>
</div>
<!--header in tap/nav2.php -->
<?php include('tab/nav2.php');?>
<!--body id="winter"-->
<body>
<div class="develop">
<h1>!!! Develop !!!</h1>
</div>
<article>
<?php include('tab/'.$tab.'.php');?>
@@ -51,6 +58,7 @@ if ($tab == "") {$tab = "home";}
<img src="./inc/bg/1605110464788.png"></img>
<a href="?tab=impressum" <?php if ($tab == "impressum")?>>Impressum</a> <span id="footer2">-</span>
<a href="?tab=datenschutz" <?php if ($tab == "datenschutz")?>>Datenschutz</a> <span id="footer2">-</span>
<!--a href="?tab=datenschutz" <?php if ($tab == "danke")?>>Danke an...</a> <span id="footer2">-</span-->
<a href="mailto:jason@illg.me?subject=WeihnachtsKalender" target="_blank">Kontak</a>
</footer>

2
main/min-style.css
View File

File diff suppressed because one or more lines are too long

2
main/min-style.css.map
View File

File diff suppressed because one or more lines are too long

17
main/schnee.js
View File

@@ -48,14 +48,8 @@ function randommaker(range) {
}
function initsnow() {
if (ie5 || opera) {
marginbottom = document.body.clientHeight;
marginright = document.body.clientWidth;
}
else if (ns6) {
marginbottom = window.innerHeight;
marginright = window.innerWidth;
}
marginright = window.innerWidth;
marginbottom = window.innerHeight;
var snowsizerange=snowmaxsize-snowminsize;
for (i=0;i<=snowmax;i++) {
crds[i] = 0;
@@ -64,7 +58,7 @@ function initsnow() {
snow[i]=document.getElementById("s"+i);
snow[i].style.fontFamily=snowtype[randommaker(snowtype.length)];
snow[i].size=randommaker(snowsizerange)+snowminsize;
snow[i].style.fontSize=snow[i].size;
snow[i].style.fontSize=snow[i].size+"px";
snow[i].style.color=snowcolor[randommaker(snowcolor.length)];
snow[i].sink=sinkspeed*snow[i].size/5;
if (snowingzone==1) {snow[i].posx=randommaker(marginright-snow[i].size);}
@@ -79,6 +73,9 @@ function initsnow() {
}
function movesnow() {
marginright = window.innerWidth;
marginbottom = window.innerHeight
$("#kstart").html(marginbottom);
for (i=0;i<=snowmax;i++) {
crds[i] += x_mv[i];
snow[i].posy+=snow[i].sink;
@@ -97,5 +94,5 @@ function movesnow() {
}
for (i=0;i<=snowmax;i++) {
document.write("<span id='s"+i+"' style='position:absolute;top:-"+snowmaxsize+"px;'>"+snowletter+"</span>");
document.write("<span id='s"+i+"' style='position:fixed;top:-"+snowmaxsize+"px;'>"+snowletter+"</span>");
}

116
main/schneeTeet.js Normal file
View File

@@ -0,0 +1,116 @@
//
// Copyright (C) 2008 by Fabian Schlieper
// Schnee v1.2
// http://www.fabi.me/
// Ohne dieses Copyright darf dieser Code nicht verwendet werden!
//
// die ID des HTML-Elements, in dem es schneien soll
var snow_area_id = 'winter';
// maximale Anzahl der sichtbaren Schneeflocken
var snow_flake_count = 50;
// die verschiedenen Farbe, die die Schneeflocken haben sollen
var snow_colors = new Array('#AAAACC','#DDDDFF','#CCCCDD','#F3F3F3','#F0FFFF');
// die Schriftarten, aus denen die Schneeflocken bestehen sollen
var snow_fonts = new Array('Arial Black', 'Arial Narrow', 'Times', 'Comic Sans MS');
var snow_char = '●'; // das Zeichen, das als Schneeflocke verwendet wird
var snow_gravity = 0.8; // wie schnell die Schneeflocken fallen
var snow_max_size = 22; // die maximale Schriftgröße einer Schneeflocke
var snow_min_size = 8; // die minimale Schriftgröße einer Schneeflocke
var snow_init_delay = 30; // Verzögerungszeit in Millisekunden, bevor es zu schneien anfängt
// ######################################################################
// HIER ENDET DIE KONFIGURATION. ÄNDERUNGEN IM FOLGENDEN SETZEN JAVSCRIPT-KENNTNISSE VORAUS
// ######################################################################
var snow_init_time = 0;
var snowflakes = new Array();
var snow_area_el = null;
function createSnowflakes()
{
var style = 'position:absolute; top:-' + snow_max_size + 'px; z-index:99;';
for (var i = 0; i <= snow_flake_count; i++)
document.write('<sp' + 'an id="snwflk' + i + '" style="' + style + '">' + snow_char + '</sp' + 'an>');
}
function randInt(range) { return Math.floor(Math.random() * range); }
function initSnow()
{
snow_area_el = document.getElementById(snow_area_id);
// reapeat until we have the snow_area_el
if(!snow_area_el || snow_area_el.offsetWidth <= snow_max_size || snow_area_el.offsetHeight <= snow_max_size) {
// after 5 secs cancel
if(snow_init_time < 5000)
window.setTimeout('initSnow()', 50);
snow_init_time += 50;
return;
}
// offest fix
snow_area_el.style.position = 'relative';
for (var i = 0; i <= snow_flake_count; i++)
{
snowflakes[i] = document.getElementById('snwflk' + i);
snowflakes[i].size = (randInt(snow_max_size - snow_min_size) + snow_min_size);
snowflakes[i].posx = -snowflakes[i].size;
snowflakes[i].posy = -snowflakes[i].size;
snowflakes[i].sink = (snow_gravity * snowflakes[i].size / snow_min_size);
snowflakes[i].wobamp = (Math.random() * (snowflakes[i].size));
snowflakes[i].wob = 0.0;
snowflakes[i].wobspeed = (0.03 + Math.random() / 10.0);
snowflakes[i].style.fontFamily = snow_fonts[randInt(snow_fonts.length)];
snowflakes[i].style.fontSize = snowflakes[i].size + 'px';
snowflakes[i].style.color = snow_colors[randInt(snow_colors.length)];
}
window.setInterval('updateSnow()', 50);
}
function updateSnow()
{
var bl = snow_area_el.offsetLeft;
var bt = snow_area_el.offsetTop;
var bw = snow_area_el.offsetWidth;
var bh = snow_area_el.offsetHeight;
var br = bl + bw;
var bb = bt + bh;
for (var i = 0; i <= snow_flake_count; i++)
{
snowflakes[i].wob += snowflakes[i].wobspeed;
var x = snowflakes[i].posx + (snowflakes[i].wobamp * Math.sin(snowflakes[i].wob));
snowflakes[i].posy += snowflakes[i].sink;
snowflakes[i].style.left = Math.round(x) + 'px';
snowflakes[i].style.top = Math.round(snowflakes[i].posy) + 'px';
var s = snowflakes[i].size;
// check bounds
if (snowflakes[i].posy > (bb - s) || x < bl || x > (br - s))
{
snowflakes[i].posx = bl + s + randInt(bw - (3 * s));
if(snowflakes[i].posy < 0)
snowflakes[i].posy = bt + randInt(bh - 2 * s);
else
snowflakes[i].posy = bt;
}
}
}
// Schnee initialisieren
createSnowflakes();
window.setTimeout('initSnow()', Math.max(50, snow_init_delay));

BIN
src/images/SchneeMann-Zylinder .png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 609 KiB

5
src/sass/_kalender.sass
View File

@@ -21,6 +21,7 @@ $doorWidth: ($kalenderWidth - 3.5*$marginLeftRight - 3*$marginBetween)/4
/*background-size: $backgroundWidth
background-size: $backgroundSize
background-position: $bgPosition
//padding: 0 0 10vh 0
div
position: absolute
@@ -32,7 +33,7 @@ $doorWidth: ($kalenderWidth - 3.5*$marginLeftRight - 3*$marginBetween)/4
h3
padding-top: 1.5rem
font-weight: bold
//font-weight: bold
padding: 1rem
color: #E8690F
@@ -87,7 +88,7 @@ $doorWidth: ($kalenderWidth - 3.5*$marginLeftRight - 3*$marginBetween)/4
pointer-events: none
cursor: default
@for $row from 0 through 5
@for $row from 0 through 6
@for $col from 0 through 3
$leftCalc: $marginLeftRight+($doorWidth+$marginBetween+2*$doorBorderSize)*$col
$topCalc: $marginTop+($doorWidth+$marginBetween+2*$doorBorderSize)*$row

8
src/sass/_other.sass
View File

@@ -147,7 +147,7 @@ button
.sGalerie
display: inline-block
max-width: 30rem
max-width: 35vh
div
background-color: #fff
@@ -195,10 +195,10 @@ button
background: gainsboro
.develop
display: inline-block
//display: inline-block
text-decoration: underline
position: absolute
//position: absolute
color: red
font-weight: bold
margin: 3rem 0 0 -7rem
//margin: 3rem 0 0 -7rem
text-shadow: -1px -1px 1rem black, 1px 1px 1rem black

4
src/sass/main.sass
View File

@@ -10,8 +10,8 @@ body
margin: 0
//background-image: url("../inc/bg/snow3.png")
background-size: 90%
background-color: #e2e4e6
background-color: hsla(190, 50%, 80%, 0.7)
background-color: darkgray //hsla(190, 50%, 80%, 0.7)
//height: 100vh

0
tab/Galerie/G2018Luehtjes.php → tab/Galerie/2018Luehtjes.php
View File

0
tab/Galerie/G2019Luehtjes.php → tab/Galerie/2019Luehtjes.php
View File

0
tab/Galerie/G2019WeihTobi.php → tab/Galerie/2019WeihTobi.php
View File

0
tab/Galerie/G2019WeihnachtsMLuebeck.php → tab/Galerie/2019WeihnachtsMLuebeck.php
View File

0
tab/Galerie/G2020WeihTobi.php → tab/Galerie/2020WeihTobi.php
View File

0
tab/Galerie/G2021WeihAnja.php → tab/Galerie/2021WeihAnja.php
View File

23
tab/Galerie/2022.php Normal file
View File

@@ -0,0 +1,23 @@
<div class="titel">
<img src="inc/bg/1609858275128.png"></img>
<h3>2021 Anja</h3>
</div>
<br>
<div class="gimages">
<?php
$path = 'src/images/2021WeihAnja/';
foreach (new DirectoryIterator($path) as $file) {
if ($file->isDot() || $file->isDir()) continue;;
if ($file->getExtension()=="jpeg" || $file->getExtension()=="jpg") {
echo '<a href="src/images/2021WeihAnja/';
echo $file;
echo '"data-lightbox="mygallery"><img src="src/images/2021WeihAnja/';
echo $file;
echo '"></a>';
}
}
?>
</div>

14
tab/galerie.php
View File

@@ -6,17 +6,19 @@
<div class="sGalerie">
<span id="leer">
<button onclick="window.location.href='?tab=Galerie/G2018Luehtjes';"><img src="src/images/2018Luethje/PSX_20211122_165852.jpg"></img><div>2018 Lühtjes</div></button></span>
<button onclick="window.location.href='?tab=Galerie/2018Luehtjes';"><img src="src/images/2018Luethje/PSX_20211122_165852.jpg"></img><div>2018 Lühtjes</div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=/Galerie/G2019WeihnachtsMLuebeck';"><img src="src/images/2019WeihMarktLuebeck/20191216_175633.jpg"></img><div>2019 Lübeck</div></button></span>
<button onclick="window.location.href='?tab=Galerie/2019WeihnachtsMLuebeck';"><img src="src/images/2019WeihMarktLuebeck/20191216_175633.jpg"></img><div>2019 Lübeck</div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=/Galerie/G2019WeihTobi';"><img src="src/images/2019WeihTobi/20191221_165331.jpg"></img><div>2019 mit Tobi<br></div></button></span>
<button onclick="window.location.href='?tab=Galerie/2019WeihTobi';"><img src="src/images/2019WeihTobi/20191221_165331.jpg"></img><div>2019 mit Tobi<br></div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=/Galerie/G2019Luehtjes';"><img src="src/images/2019Luehtjes/20191224_172651.jpg"></img><div>2019 Lüthjes</div></button></span>
<button onclick="window.location.href='?tab=Galerie/2019Luehtjes';"><img src="src/images/2019Luehtjes/20191224_172651.jpg"></img><div>2019 Lüthjes</div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=/Galerie/G2020WeihTobi';"><img src="src/images/2020WeihTobi/20201225_172206.jpg"></img><div>2020 mit Tobi</div></button></span>
<button onclick="window.location.href='?tab=Galerie/2020WeihTobi';"><img src="src/images/2020WeihTobi/20201225_172206.jpg"></img><div>2020 mit Tobi</div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=G2021WeihAnja';"><img src="src/images/2021WeihAnja/20211224_155222.jpg"></img><div>2021 mit Anja</div></button></span>
<button onclick="window.location.href='?tab=Galerie/2021WeihAnja';"><img src="src/images/2021WeihAnja/20211224_155222.jpg"></img><div>2021 mit Anja</div></button></span>
<span id="leer">
<button onclick="window.location.href='?tab=Galerie/2022';"><img src="src/images/"></img><div>2022</div></button></span>
<!------Test Bereich------>

27
tab/kalender.php
View File

@@ -144,10 +144,30 @@
<div class="left"><span>24</span></div>
</a>
</div>
<!-- Zusatz Türen-->
<div class="türPlus">
<div class="active" id="ak25">
<a href="?tab=tuer&nr=25">
<h3 id="hiddenTuer">Tür 25</h3>
<div class="left"><span>25</span></div>
</a>
</div>
<div class="active" id="ak26">
<a href="?tab=tuer&nr=26">
<h3 id="hiddenTuer">Tür 26</h3>
<div class="left"><span>26</span></div>
</a>
</div>
</div>
<script>
<?php
$numberArray = [];
for($i=1; $i<=24; $i++) {
for($i=1; $i<=26; $i++) {
array_push($numberArray, $i);
}
shuffle($numberArray);
@@ -181,7 +201,8 @@
"21-xenia",
"22-walpurgia_besenstiel",
"23-mania_flippinger",
"24-erzaehler"
"24-erzaehler",
"scheniiW"
];
console.log(dayMap);
for(let i=1; i<=24; i++) {
@@ -192,7 +213,7 @@
let imageUrl = "src/images/bibi/"+imageName+".png";
parent.find("span").css("background-image", "url(" + imageUrl + ")");
parent.find("span").html(n);
parent.find("h3").html("Tür "+n);
parent.find("h3").html(""+n);
parent.find("a").attr("href","?tab=tuer&nr="+n);
}

23
tab/tuer.php
View File

@@ -949,6 +949,28 @@ echo('
</div>
</div>');
break;
case 26:
echo('
<div class="packa">
<img id="SRechts" src="inc/bg/schneeiRechts.png"</img>
<div id="txt"><h3>Von Schneei</h3>
<p>
<u>Erzähler:</u>
<br>
Achja bevor ich das vergesse, Schneei hat ja auch was für dich.
<p>
<u>Schneei:</u>
<br>
Hallo Mama Melly, danke das du immer für mich da bist und mich so sehr Liebst.
<p>
Für die beste Mama, gibt es natürlich auch was von mir. Ich hoffe das du damit Ganz viel Spaß hast und das es dir Gefällt.
<p>
Habe dich ganz doll lieb.
</p>
<img src="src/images/bibi/introBibi.png"</img>
</div>
</div>');
break;
default:
echo('<div id="txt"><h3>Falscher Tag</h3><p id="false">
@@ -956,6 +978,7 @@ echo('<div id="txt"><h3>Falscher Tag</h3><p id="false">
<img src="src/images/bibi/introBibi.png"</img>
</div>');
break;
}
?>