Projects/nettsiden
Projects
/
nettsiden
8
2
Fork 0
Code Issues 15 Pull Requests 2 Activity

New design #2

Merged
halworsen merged 26 commits from redesign into master 2018-02-24 17:15:32 +01:00
Conversation 0 Commits 26 Files Changed 32 +249 -252
6 changed files with 249 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b0707eafe - Show all commits

4
www/admin/aktiviteter/edit.php
View File

@ -91,10 +91,10 @@ if($new == 0){
<p class="subtitle">Sluttid (YYYY-MM-DD HH:MM:SS)</p> <p class="subtitle">Sluttid (YYYY-MM-DD HH:MM:SS)</p>
<?= '<input name="end" type="text" class="boxinput" value="' . $event->getStop()->format('Y-m-d H:00:00') . '"><br>' ?> <?= '<input name="end" type="text" class="boxinput" value="' . $event->getStop()->format('Y-m-d H:00:00') . '"><br>' ?>
<p class="subtitle">Organisert av</p> <p class="subtitle">Arrangør</p>
<?= '<input type="text" name="organiser" value="' . $event->getOrganiser(). '" class="boxinput">' ?><br> <?= '<input type="text" name="organiser" value="' . $event->getOrganiser(). '" class="boxinput">' ?><br>
<p class="subtitle">Hvor?</p> <p class="subtitle">Sted</p>
<?= '<input type="text" name="location" value="' . $event->getLocation(). '" class="boxinput">' ?><br> <?= '<input type="text" name="location" value="' . $event->getLocation(). '" class="boxinput">' ?><br>
</div> </div>

26
www/aktiviteter/index.php
View File

@ -27,6 +27,8 @@ $day = (isset($_GET['day']))
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="no"> <html lang="no">
<head>
<title>Aktivitetsverkstedet</title> <title>Aktivitetsverkstedet</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@ -34,11 +36,15 @@ $day = (isset($_GET['day']))
<link rel="stylesheet" href="../css/style.css"> <link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/nav.css"> <link rel="stylesheet" href="../css/nav.css">
<link rel="stylesheet" href="../css/events.css"> <link rel="stylesheet" href="../css/events.css">
</head>
<header>Aktivitets&shy;verk&shy;stedet</header> <body>
<nav>
<?php echo navbar(1, 'aktiviteter'); ?>
<?php echo loginbar(); ?>
</nav>
<main> <main>
<?php <?php
$events = ($day==-1) $events = ($day==-1)
? $agenda->getNextOfEach(new \DateTimeImmutable) ? $agenda->getNextOfEach(new \DateTimeImmutable)
@ -49,7 +55,7 @@ $events = ($day==-1)
$limit = 0; $limit = 0;
foreach($events as $event) { foreach($events as $event) {
?> ?>
<article> <div>
<h2> <h2>
<?php if ($event->getImageURL()) { ?> <?php if ($event->getImageURL()) { ?>
<img src="<?= $event->getImageURL() ?>"> <img src="<?= $event->getImageURL() ?>">
@ -64,22 +70,18 @@ foreach($events as $event) {
<?php } ?> <?php } ?>
</h2> </h2>
<ul class="subtext"> <ul class="subtext">
<li>Tid: <strong><?= Agenda::getFormattedDate($event->getStart()) ?></strong> <li>Tid: <strong><?= Agenda::getFormattedDate($event->getStart()) ?></strong></li>
<li>Sted: <strong><?= $event->getLocation() ?></strong> <li>Sted: <strong><?= $event->getLocation() ?></strong></li>
<li>Arrangør: <strong><?= $event->getOrganiser() ?></strong> <li>Arrangør: <strong><?= $event->getOrganiser() ?></strong></li>
</ul> </ul>
<?php $description = $event->getDescription(); ?> <?php $description = $event->getDescription(); ?>
<?php if ($limit) array_splice($description, $limit); ?> <?php if ($limit) array_splice($description, $limit); ?>
<?= implode($description, "</p>\n<p>") ?> <?= implode($description, "</p>\n<p>") ?>
</article> </div>
<?php if (!$limit || $limit > 4) {$limit = 4;} else $limit = 2; ?> <?php if (!$limit || $limit > 4) {$limit = 4;} else $limit = 2; ?>
<?php } ?> <?php } ?>
</main> </main>
<nav> </body>
<?= navbar(1, 'aktiviteter'); ?>
<?= loginbar(); ?>
</nav>

19
www/kalender/index.php
View File

@ -30,6 +30,8 @@ $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
?><!DOCTYPE html> ?><!DOCTYPE html>
<html lang="no"> <html lang="no">
<head>
<title>Kalenderverkstedet</title> <title>Kalenderverkstedet</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@ -38,12 +40,15 @@ $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
<link rel="stylesheet" href="../css/nav.css"> <link rel="stylesheet" href="../css/nav.css">
<link rel="stylesheet" href="../css/events.css"> <link rel="stylesheet" href="../css/events.css">
<link rel="stylesheet" href="../css/calendar.css"> <link rel="stylesheet" href="../css/calendar.css">
</head>
<header>Kalender&shy;verk&shy;stedet</header> <body>
<nav>
<?php echo navbar(1, 'kalender'); ?>
<?php echo loginbar(); ?>
</nav>
<main> <main>
<article>
<h2 style="text-align:center;">Aktiviteter for <?=$months_translations[$month-1]?> <?=$year?></h2> <h2 style="text-align:center;">Aktiviteter for <?=$months_translations[$month-1]?> <?=$year?></h2>
<p><?php <p><?php
@ -97,11 +102,5 @@ $days_in_month = date('t', mktime(0, 0, 0, $month, 1, $year));
</ul> </ul>
</figure> </figure>
</article>
</main> </main>
</body>
<nav>
<?= navbar(1, 'kalender'); ?>
<?= loginbar(); ?>
</nav>

21
www/kontakt/index.php
View File

@ -7,6 +7,8 @@ require __DIR__ . '/../../src/_autoload.php';
require __DIR__ . '/../../sql_config.php'; require __DIR__ . '/../../sql_config.php';
?> ?>
<html lang="no"> <html lang="no">
<head>
<title>Kommunikasjonsverkstedet</title> <title>Kommunikasjonsverkstedet</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@ -14,13 +16,16 @@ require __DIR__ . '/../../sql_config.php';
<link rel="stylesheet" href="../css/style.css"> <link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/nav.css"> <link rel="stylesheet" href="../css/nav.css">
<link rel="stylesheet" href="../css/events.css"> <link rel="stylesheet" href="../css/events.css">
</head>
<body>
<nav>
<?php echo navbar(1, 'kontakt'); ?>
<?php echo loginbar(); ?>
</nav>
<header>Kommunikasjons&shy;verk&shy;stedet</header>
<main> <main>
<article>
<h2>Kommunikasjon</h2> <h2>Kommunikasjon</h2>
<p> <p>
Det er ulike måter å kommunisere med PVV-medlemmer på. Det er ulike måter å kommunisere med PVV-medlemmer på.
@ -34,11 +39,5 @@ Vi har også en Discord-kanal. Denne kanalen er satt opp slik at man i Discord-k
<p> <p>
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>. 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> </p>
</article>
</main> </main>
</body>
<nav>
<?= navbar(1, 'kontakt'); ?>
<?= loginbar(); ?>
</nav>

22
www/paamelding/index.php
View File

@ -37,18 +37,22 @@ if (isset($_SESSION['userdata'])) { // if logged in with feide
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<title>PVV registrering</title>
<head>
<title>PVV registrering</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" href="../css/normalize.css"> <link rel="stylesheet" href="../css/normalize.css">
<link rel="stylesheet" href="../css/style.css"> <link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/nav.css"> <link rel="stylesheet" href="../css/nav.css">
</head>
<header>Registrerings&shy;verks&shy;stedet</header> <body>
<nav>
<?php echo navbar(1); ?>
<?php echo loginbar(); ?>
</nav>
<main> <main>
<article>
<h2>Registrer deg som bruker</h2> <h2>Registrer deg som bruker</h2>
<p> <p>
@ -60,7 +64,7 @@ if (isset($_SESSION['userdata'])) { // if logged in with feide
lokalene våre slik at vi kan få satt et passord. lokalene våre slik at vi kan få satt et passord.
</p> </p>
<h3>Meldingen som du kan sendes:</h3> <h3>Meldingen du kan sende:</h3>
<?php if($attrs) { //logged in with pvv account?> <?php if($attrs) { //logged in with pvv account?>
@ -81,11 +85,5 @@ if (isset($_SESSION['userdata'])) { // if logged in with feide
<a class="btn" href=".?login">æ kanj itj lææv uten dæ piær!</a> <a class="btn" href=".?login">æ kanj itj lææv uten dæ piær!</a>
<?php }?> <?php }?>
</article>
</main> </main>
</body>
<nav>
<?= navbar(1); ?>
<?= loginbar(); ?>
</nav>

19
www/prosjekt/index.php
View File

@ -11,8 +11,10 @@ $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$projectManager = new \pvv\side\ProjectManager($pdo); $projectManager = new \pvv\side\ProjectManager($pdo);
$projects = $projectManager->getAll(); $projects = $projectManager->getAll();
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="no"> <html lang="no">
<head>
<title>Prosjektverkstedet</title> <title>Prosjektverkstedet</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@ -20,12 +22,15 @@ $projects = $projectManager->getAll();
<link rel="stylesheet" href="../css/style.css"> <link rel="stylesheet" href="../css/style.css">
<link rel="stylesheet" href="../css/nav.css"> <link rel="stylesheet" href="../css/nav.css">
<link rel="stylesheet" href="../css/splash.css"> <link rel="stylesheet" href="../css/splash.css">
</head>
<header>Prosjekt&shy;verk&shy;stedet</header> <body>
<nav>
<?php echo navbar(1, 'prosjekt'); ?>
<?php echo loginbar(); ?>
</nav>
<main> <main>
<article class="threed">
<h2>Prosjekter</h2> <h2>Prosjekter</h2>
<?php <?php
if(count($projects) == 0){ if(count($projects) == 0){
@ -64,11 +69,5 @@ $projects = $projectManager->getAll();
<?php <?php
} }
?> ?>
</article>
</main> </main>
</body>
<nav>
<?= navbar(1, 'prosjekt'); ?>
<?= loginbar(); ?>
</nav>