Skip to content

Commit

Permalink
Merge pull request #1875 from tomudding/feature/improved-activity-det…
Browse files Browse the repository at this point in the history 
…ails-panel

feat: move activity details to panel
  • Loading branch information
@tomudding
tomudding authored Jul 23, 2024
2 parents d2cf70c + e9edd59 commit 7df1ad1
Showing 1 changed file with 71 additions and 52 deletions.
123 changes: 71 additions & 52 deletions module/Activity/view/activity/activity/view.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,65 +68,84 @@ $this->headTitle($this->translate('Activities'));
<?= $this->flashMessenger()->render('info', ['alert', 'alert-dismissible', 'alert-info']) ?>
<?= $this->flashMessenger()->render('success', ['alert', 'alert-dismissible', 'alert-success']) ?>
<?= $this->flashMessenger()->render('warning', ['alert', 'alert-dismissible', 'alert-warning']) ?>
<div class="col-md-12">
<h1><?= $this->escapeHtml($this->localiseText($activity->getName())) ?></h1>
</div>
<div class="col-md-12">
<?php foreach ($activity->getCategories() as $category): ?>
<div class="chip chip-small chip-outlined">
<div class="col-md-8">
<div class="row">
<div class="col-md-12">
<h1><?= $this->escapeHtml($this->localiseText($activity->getName())) ?></h1>
</div>
<?php if (0 !== $activity->getCategories()->count()): ?>
<div class="col-md-12">
<?php foreach ($activity->getCategories() as $category): ?>
<div class="chip chip-small chip-outlined">
<span class="chip-label">
<?= $this->escapeHtml($this->localiseText($category->getName())) ?>
</span>
</div>
<?php endforeach; ?>
</div>
<div class="col-md-12">
<div class="row agenda-item">
<div class="col-md-9">
<div class="agenda-item-body markdown">
</div>
<?php endforeach; ?>
</div>
<?php endif; ?>
<div class="col-md-12">
<div class="markdown">
<?= $this->markdown($this->localiseText($activity->getDescription())) ?>
</div>
</div>
<div class="col-md-3">
<div class="agenda-item-details">
<dl>
<dt><?= $this->translate('Start') ?></dt>
<dd><?= $this->dateFormat($activity->getBeginTime(), IntlDateFormatter::FULL, IntlDateFormatter::SHORT); ?></dd>

<dt><?= $this->translate('End') ?></dt>
<dd><?= $this->dateFormat($activity->getEndTime(), IntlDateFormatter::FULL, IntlDateFormatter::SHORT); ?></dd>

<dt><?= $this->translate('Location') ?></dt>
<dd><?= $this->escapeHtml($this->localiseText($activity->getLocation())) ?></dd>

<dt><?= $this->translate('Costs') ?></dt>
<dd><?= $this->escapeHtml($this->localiseText($activity->getCosts())) ?></dd>
<?php if ($activity->getIsMyFuture()): ?>
<a href="https://myfuture.tue.nl/">
<img
class="img-responsive"
style="max-width: 125px;"
src="/img/myfuture.png"
/>
</a>
<?php endif ?>

<?php
$begin = $activity->getBeginTime()->format('Ymd\THis');
$end = $activity->getEndTime()->format('Ymd\THis');
$link = 'https://calendar.google.com/calendar/render?action=TEMPLATE&';
$link .= http_build_query([
'text' => $this->localiseText($activity->getName()),
'dates' => $begin . '/' . $end,
'location' => $this->localiseText($activity->getLocation()),
'details' => $this->url('activity/view', ['id' => $activity->getId()], ['force_canonical' => true]),
]);
?>

<a class="btn btn-default" target="_blank" href="<?php echo $link ?>"> Google
Calendar </a>
</dl>
</div>
</div>
<div class="col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3><?= $this->translate('Details') ?></h3>
</div>
<div class="list-group">
<div class="list-group-item">
<h4 class="list-group-item-heading"><?= $this->translate('Start') ?></h4>
<p class="list-group-item-text text-muted">
<?= $this->dateFormat($activity->getBeginTime(), IntlDateFormatter::FULL, IntlDateFormatter::SHORT) ?>
</p>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading"><?= $this->translate('End') ?></h4>
<p class="list-group-item-text text-muted">
<?= $this->dateFormat($activity->getEndTime(), IntlDateFormatter::FULL, IntlDateFormatter::SHORT) ?>
</p>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading"><?= $this->translate('Location') ?></h4>
<p class="list-group-item-text text-muted">
<?= $this->escapeHtml($this->localiseText($activity->getLocation())) ?>
</p>
</div>
<div class="list-group-item">
<h4 class="list-group-item-heading"><?= $this->translate('Costs') ?></h4>
<p class="list-group-item-text text-muted">
<?= $this->escapeHtml($this->localiseText($activity->getCosts())) ?>
</p>
</div>
<?php if ($activity->getIsMyFuture()): ?>
<a href="https://myfuture.tue.nl/" class="list-group-item">
<img
class="img-responsive"
style="max-width: 125px;"
src="/img/myfuture.png"
/>
</a>
<?php endif ?>
</div>
<div class="panel-footer">
<?php
$begin = $activity->getBeginTime()->format('Ymd\THis');
$end = $activity->getEndTime()->format('Ymd\THis');
$link = 'https://calendar.google.com/calendar/render?action=TEMPLATE&';
$link .= http_build_query([
'text' => $this->localiseText($activity->getName()),
'dates' => $begin . '/' . $end,
'location' => $this->localiseText($activity->getLocation()),
'details' => $this->url('activity/view', ['id' => $activity->getId()], ['force_canonical' => true]),
]);
?>
<a href="<?= $link ?>" class="panel-footer__link">
Google Calendar
</a>
</div>
</div>
</div>
Expand Down

0 comments on commit 7df1ad1

Please sign in to comment.