Prepare for merge

This commit is contained in:
2018-02-24 16:53:17 +01:00
43 changed files with 711 additions and 460 deletions

View File

@@ -1,11 +1,7 @@
<!DOCTYPE html>
<?php
date_default_timezone_set('Europe/Oslo');
setlocale(LC_ALL, 'no_NO');
require __DIR__ . '/../../inc/navbar.php';
require __DIR__ . '/../../src/_autoload.php';
require __DIR__ . '/../../sql_config.php';
require_once dirname(dirname(__DIR__)) . implode(DIRECTORY_SEPARATOR, ['', 'inc', 'include.php']);
?>
<!DOCTYPE html>
<html lang="no">
<head>
@@ -14,7 +10,6 @@ require __DIR__ . '/../../sql_config.php';
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<link rel="stylesheet" href="../css/normalize.css">
<link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/nav.css">
<link rel="stylesheet" href="../css/events.css">
</head>
@@ -24,7 +19,6 @@ require __DIR__ . '/../../sql_config.php';
<?php echo loginbar(); ?>
</nav>
<main>
<h2>Kommunikasjon</h2>
<p>
@@ -40,4 +34,4 @@ require __DIR__ . '/../../sql_config.php';
Det er også mulig å ta i bruk analog kontakt ved å møte opp <a href="https://use.mazemap.com/?v=1&left=10.4032&right=10.4044&top=63.4178&bottom=63.4172&campusid=1&zlevel=2&sharepoitype=point&sharepoi=10.40355%2C63.41755%2C2&utm_medium=longurl">på stripa</a>.
</p>
</main>
</body>
</body>