diff options
| author | VOC | 2015-11-13 19:48:45 +0100 |
|---|---|---|
| committer | VOC | 2015-11-13 19:48:45 +0100 |
| commit | 92f4fa13749566f6c4378f2c9e80774e8320b825 (patch) | |
| tree | f17c6da85da6edba9c7be10138687518ee534d50 /template/assemblies | |
| parent | 32fd126b3fa937389efd1457e9d05daff9f3b347 (diff) | |
| parent | 29af764323dc474c14e05985eeabd3a06ef19c86 (diff) | |
Merge branch 'mandators'
Diffstat (limited to 'template/assemblies')
| -rw-r--r-- | template/assemblies/header.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/upcoming.phtml | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml index f57054c..a213dd3 100644 --- a/template/assemblies/header.phtml +++ b/template/assemblies/header.phtml @@ -15,7 +15,7 @@ </a> <? endif ?> - <? if(!$conference->hasEnded() && $feedback->isEnabled()): ?> + <? if(!$conference->hasEnded() && isset($feedback) && $feedback->isEnabled()): ?> <a class="form-control btn btn-default" href="<?=h($feedback->getUrl())?>"> <span class="fa fa-bullhorn"></span> </a> diff --git a/template/assemblies/upcoming.phtml b/template/assemblies/upcoming.phtml new file mode 100644 index 0000000..7d9ffac --- /dev/null +++ b/template/assemblies/upcoming.phtml @@ -0,0 +1,21 @@ +<? foreach($events as $event): ?> + <div class="col-xs-10 col-xs-offset-1 col-md-6 col-md-offset-3"> + + <div class="panel panel-default"> + <div class="panel-heading"> + <? if($event['description']): ?> + <a href="<?=h($event['description'])?>"> + <?=h($event['name'])?> + </a> + <? else: ?> + <?=h($event['name'])?> + <? endif ?> + </div> + <div class="panel-body"> + <?=h($event['location'])?><br /> + <?=h($event['start_date'])?> – <?=h($event['end_date'])?> + </div> + </div> + + </div> +<? endforeach ?> |