forked from UsrSpace-Internal/website
Merge pull request 'Relative Links und unnötige Leerzeichen am Zeilenende' (#15) from pludi/website:master into master
Reviewed-on: https://gitea.usrspace.at/UsrSpace-Internal/website/pulls/15
This commit is contained in:
commit
55b5f05603
|
@ -11,4 +11,4 @@
|
|||
<h2>weitere Termine</h2>
|
||||
</header>
|
||||
<@NextYear@>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -17,4 +17,4 @@
|
|||
|
||||
});
|
||||
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
</article>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<header class="major">
|
||||
<h2>Unterstützer</h2>
|
||||
|
@ -76,4 +76,4 @@
|
|||
<div class="4u$ 6u(medium) 12u$(xsmall)"><a href="http://www.somag.at/"><span class="image fit"><img src="images/muehlgasse8-final.gif" alt="SOMAG Warenhandelsges.m.b.H." /></span></a></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
</article>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<!-- Section -->
|
||||
<section>
|
||||
<header class="major">
|
||||
|
@ -64,4 +64,4 @@
|
|||
<!-- <div class="4u$ 6u(medium) 12u$(xsmall)"><a href="http://www.somag.at/"><span class="image fit"><img src="images/muehlgasse8-final.gif" alt="SOMAG Warenhandelsges.m.b.H." /></span></a></div> -->
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
</article>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
<section>
|
||||
<header class="major">
|
||||
<h2>Unterstützer</h2>
|
||||
|
@ -69,4 +69,4 @@
|
|||
<div class="4u$ 6u(medium) 12u$(xsmall)"><a href="http://www.somag.at/"><span class="image fit"><img src="images/muehlgasse8-final.gif" alt="SOMAG Warenhandelsges.m.b.H." /></span></a></div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -23,4 +23,4 @@
|
|||
|
||||
</div>
|
||||
</form>
|
||||
</section>
|
||||
</section>
|
||||
|
|
|
@ -40,7 +40,7 @@
|
|||
<li><a href="https://www.facebook.com/usrspace.at" class="icon fa-facebook" target="_blank"><span class="label">Facebook</span></a></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Content -->
|
||||
<@Content@>
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
<li><a href="https://www.facebook.com/usrspace.at" class="icon fa-facebook" target="_blank"><span class="label">Facebook</span></a></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Content -->
|
||||
<@Content@>
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
<li><a href="https://www.facebook.com/usrspace.at" class="icon fa-facebook" target="_blank"><span class="label">Facebook</span></a></li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
|
||||
<!-- Content -->
|
||||
<@Content@>
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<!-- Section -->
|
||||
<section style="border-bottom:0; margin:0; padding:0;">
|
||||
<span class="image logo">
|
||||
<img src="https://www.usrspace.at/images/1_MainLogo_2021.svg" alt="Logo">
|
||||
<img src="/images/1_MainLogo_2021.svg" alt="Logo">
|
||||
</span>
|
||||
</section>
|
||||
|
||||
|
@ -12,11 +12,11 @@
|
|||
<h2>Menu</h2>
|
||||
</header>
|
||||
<ul>
|
||||
<li><a href="https://www.usrspace.at/index.php">Start</a></li>
|
||||
<li><a href="https://www.usrspace.at/stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="https://www.usrspace.at/mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="https://wiki.usrspace.at">Wiki</a></li>
|
||||
<li><a href="https://gitea.usrspace.at/explore/repos">Gitea</a></li>
|
||||
<li><a href="/index.php">Start</a></li>
|
||||
<li><a href="/stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="/mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="https://wiki.usrspace.at">Wiki</a></li>
|
||||
<li><a href="https://gitea.usrspace.at/explore/repos">Gitea</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
|
@ -30,7 +30,7 @@
|
|||
<li class="fa-twitter"><a href="https://www.twitter.com/usrspace_at" target="_blank">@usrspace_at</a></li>
|
||||
<li class="fa-facebook"><a href="https://www.facebook.com/usrspace.at" target="_blank">facebook.com/usrspace.at</a></li>
|
||||
<li class="fa-hashtag"><a href="https://matrix.to/#/#usrspace:matrix.usrspace.at" target="_blank">#usrspace:matrix.usrspace.at</a></li>
|
||||
<li class="fa-users"><a href="https://www.usrspace.at/stammtisch.php">Stammtisch</a></li>
|
||||
<li class="fa-users"><a href="/stammtisch.php">Stammtisch</a></li>
|
||||
</ul>
|
||||
</section>
|
||||
|
||||
|
@ -42,8 +42,8 @@
|
|||
Design: <a href="https://html5up.net/license" target="_blank">HTML5 UP</a>
|
||||
</p>
|
||||
<p class="copyright">
|
||||
<a href="https://www.usrspace.at/impressum.php">Impressum</a><br />
|
||||
<a href="https://www.usrspace.at/datenschutz.php">Datenschutzerklärung</a>
|
||||
<a href="/impressum.php">Impressum</a><br />
|
||||
<a href="/datenschutz.php">Datenschutzerklärung</a>
|
||||
</p>
|
||||
<p class="copyright">© /usr/space - <a href="https://creativecommons.org/licenses/by-sa/3.0/at/">CC BY-SA 3.0 AT</a></p>
|
||||
</footer>
|
||||
|
|
|
@ -13,9 +13,9 @@
|
|||
<ul>
|
||||
<li><a href="index.php">Start</a></li>
|
||||
<li><a href="about.php">Über uns</a></li>
|
||||
<li><a href="stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="w/index.php">Wiki</a></li>
|
||||
<li><a href="stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="w/index.php">Wiki</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
|
@ -25,22 +25,22 @@
|
|||
<h2>nächste Termine</h2>
|
||||
</header>
|
||||
<div class="mini-posts">
|
||||
<div id="cal">
|
||||
<div id="cal">
|
||||
<h4 class="align-center"><@CalendarRange@></h4>
|
||||
<table id="days">
|
||||
<table id="days">
|
||||
<thead><tr>
|
||||
<th>Mo</th>
|
||||
<th>Di</th>
|
||||
<th>Mi</th>
|
||||
<th>Do</th>
|
||||
<th>Fr</th>
|
||||
<th>Sa</th>
|
||||
<th>Mo</th>
|
||||
<th>Di</th>
|
||||
<th>Mi</th>
|
||||
<th>Do</th>
|
||||
<th>Fr</th>
|
||||
<th>Sa</th>
|
||||
<th>So</th>
|
||||
</tr></thead>
|
||||
<tbody>
|
||||
<tbody>
|
||||
<@CalendarContent@>
|
||||
</tbody>
|
||||
</table>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
</header>
|
||||
<ul>
|
||||
<li><a href="https://usrspace.at/index.php">Start</a></li>
|
||||
<li><a href="https://usrspace.at/stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="https://usrspace.at/mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="https://usrspace.at/w/index.php">Wiki</a></li>
|
||||
<li><a href="https://gitlab.usrspace.at/explore/projects">Gitlab</a></li>
|
||||
<li><a href="https://usrspace.at/stammtisch.php">Stammtisch</a></li>
|
||||
<li><a href="https://usrspace.at/mitgliedschaft.php">Mitgliedschaft</a></li>
|
||||
<li><a href="https://usrspace.at/w/index.php">Wiki</a></li>
|
||||
<li><a href="https://gitlab.usrspace.at/explore/projects">Gitlab</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
|
@ -18,22 +18,22 @@
|
|||
<h2>nächste Termine</h2>
|
||||
</header>
|
||||
<div class="mini-posts">
|
||||
<div id="cal">
|
||||
<div id="cal">
|
||||
<h4 class="align-center"><@CalendarRange@></h4>
|
||||
<table id="days" class="calendar">
|
||||
<table id="days" class="calendar">
|
||||
<thead><tr>
|
||||
<th>Mo</th>
|
||||
<th>Di</th>
|
||||
<th>Mi</th>
|
||||
<th>Do</th>
|
||||
<th>Fr</th>
|
||||
<th>Sa</th>
|
||||
<th>Mo</th>
|
||||
<th>Di</th>
|
||||
<th>Mi</th>
|
||||
<th>Do</th>
|
||||
<th>Fr</th>
|
||||
<th>Sa</th>
|
||||
<th>So</th>
|
||||
</tr></thead>
|
||||
<tbody>
|
||||
<tbody>
|
||||
<@CalendarContent@>
|
||||
</tbody>
|
||||
</table>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
});
|
||||
var mapsGroup = {
|
||||
"Luftbild" : basemapOrtho,
|
||||
"Strasse" : basemapAT
|
||||
};
|
||||
"Strasse" : basemapAT
|
||||
};
|
||||
L.control.layers(mapsGroup).addTo(map);
|
||||
var space = L.marker([47.92300, 16.21185]).addTo(map);
|
||||
space.bindPopup("<b>/usr/space</b><br />Mühlgasse 8<br />2544 Leobersdorf").openPopup();
|
||||
var space = L.marker([47.92300, 16.21185]).addTo(map);
|
||||
space.bindPopup("<b>/usr/space</b><br />Mühlgasse 8<br />2544 Leobersdorf").openPopup();
|
||||
L.control.scale({imperial:false}).addTo(map);
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
@ -13,4 +13,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>','',$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
12
calendar.php
12
calendar.php
|
@ -45,7 +45,7 @@ if (isset($_GET['o']) and ($_GET['o'] === 'json')) {
|
|||
}
|
||||
}
|
||||
header("Content-Type: application/json; charset=UTF-8");
|
||||
echo json_encode($result, JSON_UNESCAPED_UNICODE);
|
||||
echo json_encode($result, JSON_UNESCAPED_UNICODE);
|
||||
} else if (isset($_GET['o']) and ($_GET['o'] === 'sidebar')) {
|
||||
header("Content-Type: text/plain; charset=UTF-8");
|
||||
|
||||
|
@ -56,9 +56,9 @@ if (isset($_GET['o']) and ($_GET['o'] === 'json')) {
|
|||
$last_day = strtotime("+3 weeks") + ((60*60*24)*(7-$today)) ; // letzter Sonntag
|
||||
$output = "";
|
||||
$day = $first_day;
|
||||
|
||||
|
||||
$events = $ical->eventsFromRange(date('Y-m-d 00:00:00', $first_day), date('Y-m-d 23:59:59', $last_day));
|
||||
|
||||
|
||||
for ($w = 0; $w < 5; $w++) {
|
||||
$output .= "<tr>";
|
||||
for ($d = 0; $d < 7; $d++) {
|
||||
|
@ -100,7 +100,7 @@ if (isset($_GET['o']) and ($_GET['o'] === 'json')) {
|
|||
$NewEvent = str_replace('<@Name@>',$event->summary,$Entry);
|
||||
$dtstart = $ical->iCalDateToDateTime($event->dtstart_array[3], $forceTimeZone);
|
||||
$dtend = $ical->iCalDateToDateTime($event->dtend_array[3], $forceTimeZone);
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
$NewEvent = str_replace('<@Date@>',$dtstart->format('d.m.Y') . ' - ' . $dtend->format('d.m.Y'),$NewEvent);
|
||||
$NewEvent = str_replace('<@Time@>','--',$NewEvent);
|
||||
} else {
|
||||
|
@ -136,7 +136,7 @@ if (isset($_GET['o']) and ($_GET['o'] === 'json')) {
|
|||
$NewEvent = str_replace('<@Name@>',$event->summary,$Entry);
|
||||
$dtstart = $ical->iCalDateToDateTime($event->dtstart_array[3], $forceTimeZone);
|
||||
$dtend = $ical->iCalDateToDateTime($event->dtend_array[3], $forceTimeZone);
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
$NewEvent = str_replace('<@Date@>',$dtstart->format('d.m.Y') . ' - ' . $dtend->format('d.m.Y'),$NewEvent);
|
||||
$NewEvent = str_replace('<@Time@>','ganztägig',$NewEvent);
|
||||
} else {
|
||||
|
@ -172,7 +172,7 @@ if (isset($_GET['o']) and ($_GET['o'] === 'json')) {
|
|||
$NewEvent = str_replace('<@Name@>',$event->summary,$Entry);
|
||||
$dtstart = $ical->iCalDateToDateTime($event->dtstart_array[3], $forceTimeZone);
|
||||
$dtend = $ical->iCalDateToDateTime($event->dtend_array[3], $forceTimeZone);
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
if ($dtstart->format('d.m.Y') != $dtend->format('d.m.Y')) {
|
||||
$NewEvent = str_replace('<@Date@>',$dtstart->format('d.m.Y') . ' - ' . $dtend->format('d.m.Y'),$NewEvent);
|
||||
$NewEvent = str_replace('<@Time@>','--',$NewEvent);
|
||||
} else {
|
||||
|
|
|
@ -28,4 +28,4 @@ if(defined("PROJ_DEBUGMODE") and PROJ_DEBUGMODE) {
|
|||
error_reporting(0);
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -13,4 +13,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>','',$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -13,4 +13,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>','',$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -19,4 +19,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>','',$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -16,4 +16,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>',$Scripts,$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -13,4 +13,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>','',$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -15,4 +15,4 @@ $project = str_replace($_SERVER['DOCUMENT_ROOT'], "", str_replace("\\", "/",dirn
|
|||
//Projektpfad (für HTML)
|
||||
define("PROJ_HTTP_ROOT", $protocol . $_SERVER['HTTP_HOST'] . $project);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -10,7 +10,7 @@ $st_mi = mktime(22,50,50,3,14,2018);
|
|||
$st_do = mktime(22,50,50,3,22,2018);
|
||||
|
||||
while ($st_mi < time()) {
|
||||
$st_mi = $st_mi + (60 * 60 * 24 * 14); // +2 Wochen, ToDo: ich weis nicht ob das mit Schaltsekunden über die nächsten 1000 Jahre usw. auch funktioniert
|
||||
$st_mi = $st_mi + (60 * 60 * 24 * 14); // +2 Wochen, ToDo: ich weis nicht ob das mit Schaltsekunden über die nächsten 1000 Jahre usw. auch funktioniert
|
||||
}
|
||||
|
||||
while ($st_do < time()) {
|
||||
|
@ -41,4 +41,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>',$Scripts,$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
|
@ -10,7 +10,7 @@ $st_mi = mktime(22,50,50,3,14,2018);
|
|||
$st_do = mktime(22,50,50,3,22,2018);
|
||||
|
||||
while ($st_mi < time()) {
|
||||
$st_mi = $st_mi + (60 * 60 * 24 * 14); // +2 Wochen, ToDo: ich weis nicht ob das mit Schaltsekunden über die nächsten 1000 Jahre usw. auch funktioniert
|
||||
$st_mi = $st_mi + (60 * 60 * 24 * 14); // +2 Wochen, ToDo: ich weis nicht ob das mit Schaltsekunden über die nächsten 1000 Jahre usw. auch funktioniert
|
||||
}
|
||||
|
||||
while ($st_do < time()) {
|
||||
|
@ -39,4 +39,4 @@ $template = str_replace('<@Content@>',$Content,$template);
|
|||
$template = str_replace('<@Scripts@>',$Scripts,$template);
|
||||
print_template($template);
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
Loading…
Reference in a new issue