Merge branch 'master' of github.com:Programvareverkstedet/nettsiden

This commit is contained in:
John Chen 2017-10-07 19:42:18 +02:00
commit 3d2f07418d
7 changed files with 14 additions and 12 deletions

View File

@ -1,9 +1,6 @@
<?php //declare(strict_types=1);
namespace pvv\side;
use \pvv\side\social\NerdepitsaActivity;
use \pvv\side\social\AnimekveldActivity;
use \DateTimeImmutable;
use \DateInterval;
@ -74,7 +71,9 @@ class Agenda {
function($a) use ($startDate){
return $a->getNextEventFrom($startDate);
}, $this->activities
), function($a){return $a;});
), function($a){
return isset($a);
});
usort($result, function($a, $b) {
return ($a->getStart()->getTimeStamp() < $b->getStart()->getTimeStamp())
? -1

View File

@ -20,7 +20,7 @@ class BrettspillEvent extends Event {
}
public function getOrganiser() /* : User */ {
return "PVV";
return "Robert Maikher";
}
public function getURL() /* : string */ {

View File

@ -12,6 +12,7 @@ img.float-right {
.calendar-events ul .date {
color: rgba(0,0,0,.5);
font-size: 0.8em;
margin-top: .2em;
}
.calendar-events > li > p {
border-bottom: .1em solid rgba(0,0,0,.2);
@ -30,8 +31,8 @@ img.float-right {
text-decoration: underline;
}
.calendar-events ul .time {
float: left;
width: 4em;
color: rgba(0,0,0,.5);
float: right;
}
.calendar-events ul .icon, .calendar-events ul .date {
float: right;

View File

@ -54,13 +54,13 @@ include '../inc/ticker.php';
<li>
<a href="<?= htmlspecialchars($event->getURL()) ?>"><?= $event->getName(); ?></a>
<?php /* <a class="icon subscribe">+</a> */ ?>
<?php if ($period) {
<?php if ($period !== \pvv\side\Agenda::TODAY) {
echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
if (\pvv\side\Agenda::isThisWeek($event->getStart()) || $event->getStart()->sub(new DateInterval('P3D'))->getTimestamp() < time()) {
echo '<span class="time">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
echo '<span class="date">' . strftime('%a', $event->getStart()->getTimestamp()) . '</span>';
} else {
echo '<span class="time">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
echo '<span class="date">' . strftime('%e. %b', $event->getStart()->getTimestamp()) . '</span>';
}
echo '<span class="date">' . $event->getStart()->format('H:i') . '</span>';
} else {
echo '<span class="time">' . $event->getStart()->format('H:i') . '</span>';
}
@ -77,7 +77,9 @@ include '../inc/ticker.php';
<p>
Alle med tilknytning til NTNU kan bli medlem hos oss
og benytte seg av våre ressurser.
<!--For å bli med i våre prosjekter og komitéer du søke.-->
<!--
For å bli med i våre prosjekter og komitéer du søke.
-->
</p>
<p>
<a class="btn" href="paamelding/">Bli medlem</a>

View File

Before

Width:  |  Height:  |  Size: 923 KiB

After

Width:  |  Height:  |  Size: 923 KiB

View File

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB

View File

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB