From 6c5e52da5825002924e9997039bb7af25a5a06bc Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 16 Nov 2017 15:57:33 -0500 Subject: [PATCH] Update list view and the calendar Set time format for calendar and get rid of some padding in list view. --- css/front.css | 2 +- js/frontRegApp.js | 2 +- js/views/front/regClass.js | 2 +- views/front/registrations/list.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/css/front.css b/css/front.css index 59c3718..498916a 100644 --- a/css/front.css +++ b/css/front.css @@ -29,7 +29,7 @@ } .glm-reg-event-item { border: 1px solid black; - padding: 10px; + /* padding: 10px; */ margin: 1rem 0; } .glm-reg-event-item h2 { diff --git a/js/frontRegApp.js b/js/frontRegApp.js index e6a9ee1..35d7c27 100644 --- a/js/frontRegApp.js +++ b/js/frontRegApp.js @@ -616,7 +616,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ callback( events ); }, defaultDate: startTime, - timeFormat: 'h:mma', + timeFormat: 'h(:mm)a', fixedWeekCount: false, height: 'auto', eventClick: function( calEvent, jsEvent, view ){ diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js index 0fda453..36079d2 100644 --- a/js/views/front/regClass.js +++ b/js/views/front/regClass.js @@ -135,7 +135,7 @@ app.Views.Front.RegClass = Backbone.View.extend({ callback( events ); }, defaultDate: startTime, - timeFormat: 'h:mma', + timeFormat: 'h(:mm)a', fixedWeekCount: false, height: 'auto', eventClick: function( calEvent, jsEvent, view ){ diff --git a/views/front/registrations/list.html b/views/front/registrations/list.html index 3dab24a..59e0a0a 100644 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@ -11,13 +11,13 @@ {foreach $regEvents as $event}

{$event.event_name}

- {if $event.image} {/if} + {if $event.image} {/if}

{$event.intro}

Dates/Times:
-
+
{$lastDate = ''} {foreach $event.recurrences as $rec} -- 2.17.1