diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-11-28 19:17:28 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-11-28 19:17:28 -0800 |
| commit | d3aa50c9c3d530af8b0384267c5db5a05f9ff49a (patch) | |
| tree | cd6733b078a27d3388b0da1d5032c80b063d93aa /view/tpl | |
| parent | 1708769d420f6a67a4f81bcb4878b7a066f62195 (diff) | |
| parent | 4e223f816a15c6faec14ddb4f3aa4e4f122167d9 (diff) | |
| download | volse-hubzilla-d3aa50c9c3d530af8b0384267c5db5a05f9ff49a.tar.gz volse-hubzilla-d3aa50c9c3d530af8b0384267c5db5a05f9ff49a.tar.bz2 volse-hubzilla-d3aa50c9c3d530af8b0384267c5db5a05f9ff49a.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/event_item_content.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/event_item_header.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 2 |
3 files changed, 9 insertions, 9 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> <span class="event_location">{{$location}}</span> +<div class="event-item-location"> + <span class="event-item-label">{{$location_label}}</span> <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> {{$title}}</h3> </div> -<div class="event-start"> - <span class="event-label">{{$dtstart_label}}</span> <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span> +<div class="event-item-start"> + <span class="event-item-label">{{$dtstart_label}}</span> <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span> </div> {{if $finish}} -<div class="event-start"> - <span class="event-label">{{$dtend_label}}</span> <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span> +<div class="event-item-start"> + <span class="event-item-label">{{$dtend_label}}</span> <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span> </div> {{/if}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 2c71c64fb..af5f222fe 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -159,12 +159,12 @@ {{/foreach}} </select> </div> + {{/if}} {{include file="field_checkbox.tpl" field=$cal_first_day}} <div class="settings-submit-wrapper" > <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> </div> - {{/if}} </div> </div> </div> |