fix #3812 - some brocken parts in the display of events (default template)

diff --git a/include/event.php b/include/event.php
index 88e559a7f30b37038333c5dca5b598ca4e972b39..229aa8cd460f52e9c1373a6518bb248dfbecc661 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -959,9 +959,11 @@ function format_event_item($item) {
 
        // Format the event location.
        $evloc = event_location2array($item['event-location']);
-       $location = array(
-               'name' => prepare_text($evloc['name'])
-       );
+       $location = array();
+
+       if (isset($evloc['name'])) {
+               $location['name'] = prepare_text($evloc['name']);
+       }
        // Construct the map HTML.
        if (isset($evloc['address'])) {
                $location['map'] = '<div class="map">' . generate_named_map($evloc['address']) . '</div>';

diff --git a/view/templates/event_stream_item.tpl b/view/templates/event_stream_item.tpl
index 16d122167d1a36a948e346f484470d0bf8bffdad..15975c5d5155aa0edf7891c8e11a28d3da67f133 100644 (file)
--- a/view/templates/event_stream_item.tpl
+++ b/view/templates/event_stream_item.tpl
@@ -4,23 +4,25 @@
 
        <div class="event-start">
                <span class="event-label">{{$dtstart_label}}</span>&nbsp;
-               <span class="dtstart" title="$dtstart_title">{{$dtstart_dt}}</span>
+               <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
        </div>
 
        {{if $finish}}
        <div class="event-end">
-               <span class="event-label">{{$dtstart_label}}</span>&nbsp;
-               <span class="dend" title="$dtend_title">{{$dtend_dt}}</span>
+               <span class="event-label">{{$dtend_label}}</span>&nbsp;
+               <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
        </div>
        {{/if}}
 
+       {{if $description}}
        <div class="description event-description">{{$description}}</div>
+       {{/if}}
 
        {{if $location}}
        <div class="event-location">
                <span class="event-label">{{$location_label}}</span>&nbsp;
                {{if $location.name}}
-               <span class="event-location">{{$location.name}}</span>
+               <span class="location">{{$location.name}}</span>
                {{/if}}
                {{if $location.map}}{{$location.map}}{{/if}}
                

diff --git a/view/theme/frio/templates/event_stream_item.tpl b/view/theme/frio/templates/event_stream_item.tpl
index 79a7739df2d194d649dcdb5163046d608ea2abfa..87c2e70caddf84c27a2a172c67c8ab5d4ba36a0a 100644 (file)
--- a/view/theme/frio/templates/event_stream_item.tpl
+++ b/view/theme/frio/templates/event_stream_item.tpl
@@ -2,7 +2,9 @@
 <div class="vevent event-card">
        <div class="vevent-header">
                <div class="event-card-details">
+                       {{* The part with the event data (start, end, location, title *}}
                        <div class="event-card-header">
+                               {{* On the left we will present the date in short form (e.g. Oct 15) *}}
                                <div class="event-card-left-date">
                                        <span class="event-date-wrapper medium">
                                                <span class="event-card-short-month">{{$month_short}}</span>
@@ -11,6 +13,7 @@
                                </div>
                                <div class="event-card-content media-body">
                                        <div class="event-title event-card-title summary event-summary">{{$title}}</div>
+                                       {{* If there is a map, we insert a button for showing/hiding the map *}}
                                        {{if $location.map}}<button id="event-map-btn-{{$id}}" class="event-map-btn btn-link fakelink nav nav-pills preferences" data-map-id="event-location-map-{{$id}}" data-show-label="{{$show_map_label}}" data-hide-label="{{$hide_map_label}}">{{$map_btn_label}}</button>{{/if}}
                                        <div class="event-property">
                                                <span class="event-date">
@@ -35,6 +38,7 @@
        </div>
        <div class="clearfix"></div>
 
+       {{* The content of the event description *}}
        {{if $description}}
        <div class="description event-description">
                {{$description}}