aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:56:47 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-29 11:56:47 +0100
commit519862115c143cf3f645a172f39e5a0b4dc9d5bb (patch)
tree63ea16a7629d5cfad059fa581c0fac3048f26fe4 /view/tpl
parent4d97ea106cf45f9dd191358dc6bde3a7fab438c1 (diff)
parentd3aa50c9c3d530af8b0384267c5db5a05f9ff49a (diff)
downloadvolse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.tar.gz
volse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.tar.bz2
volse-hubzilla-519862115c143cf3f645a172f39e5a0b4dc9d5bb.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/event_item_content.tpl6
-rwxr-xr-xview/tpl/event_item_header.tpl10
2 files changed, 8 insertions, 8 deletions
diff --git a/view/tpl/event_item_content.tpl b/view/tpl/event_item_content.tpl
index 868e5ad27..76e0f4616 100644
--- a/view/tpl/event_item_content.tpl
+++ b/view/tpl/event_item_content.tpl
@@ -1,10 +1,10 @@
{{if $description}}
-<div class="event-description">
+<div class="event-item-description">
{{$description}}
</div>
{{/if}}
{{if $location}}
-<div class="event-location">
- <span class="event-label">{{$location_label}}</span>&nbsp;<span class="event_location">{{$location}}</span>
+<div class="event-item-location">
+ <span class="event-item-label">{{$location_label}}</span>&nbsp;<span class="event-item-location">{{$location}}</span>
</div>
{{/if}}
diff --git a/view/tpl/event_item_header.tpl b/view/tpl/event_item_header.tpl
index 70ddfd808..9547676e9 100755
--- a/view/tpl/event_item_header.tpl
+++ b/view/tpl/event_item_header.tpl
@@ -1,11 +1,11 @@
-<div class="event-title">
+<div class="event-item-title">
<h3><i class="icon-calendar"></i>&nbsp;{{$title}}</h3>
</div>
-<div class="event-start">
- <span class="event-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
+<div class="event-item-start">
+ <span class="event-item-label">{{$dtstart_label}}</span>&nbsp;<span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
</div>
{{if $finish}}
-<div class="event-start">
- <span class="event-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
+<div class="event-item-start">
+ <span class="event-item-label">{{$dtend_label}}</span>&nbsp;<span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
</div>
{{/if}}