From 055ba460cb825e6bf8495a17ef76678a645c863e Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 15 Aug 2014 15:13:04 -0400 Subject: [PATCH] Events output changes Update so image is on the left. Make the event default to list view like in cityofmi site --- Toolkit/Events/views/eventList.html | 15 ++++++++------- static/16.phtml | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/Toolkit/Events/views/eventList.html b/Toolkit/Events/views/eventList.html index 85a008f..d38250f 100755 --- a/Toolkit/Events/views/eventList.html +++ b/Toolkit/Events/views/eventList.html @@ -68,10 +68,10 @@ } .event-list-thumb { display: block; - float: right; + float: left; border: 1px solid rgb(51,102,153); border-radius: 8px; - margin: 8px 4% 8px 5px; + margin: 0 4% 8px 5px; width: 26%; } .event-right { @@ -137,12 +137,13 @@ {if:event.spans}Ongoing Event{end:} {if:event.recurr}Repeating Event{end:} - {if:event.image} - - {end:} +
+ {if:event.image} + + {end:} {event.intro:h}
diff --git a/static/16.phtml b/static/16.phtml index 787519e..701a477 100755 --- a/static/16.phtml +++ b/static/16.phtml @@ -1,5 +1,31 @@ array('filter' => FILTER_VALIDATE_INT, 'options' => array('min_range' => 1, 'max_range' => 31)), + 'month' => array('filter' => FILTER_VALIDATE_INT, 'options' => array('min_range' => 1, 'max_range' => 12)), + 'year' => array('filter' => FILTER_VALIDATE_INT, 'options' => array('min_range' => date('Y'), 'max_range' => date('Y') + 2)), + ) + ); + if ($calendarDateArray['day'] && $calendarDateArray['month'] && $calendarDateArray['year']) { + $time = mktime( + 0, + 0, + 0, + $calendarDateArray['month'], + $calendarDateArray['day'], + $calendarDateArray['year'] + ); + $_REQUEST['search'] = 1; + $_REQUEST['startMonth'] = $_REQUEST['endMonth'] = date('m/d/Y', $time); + } + $search = filter_var($_REQUEST['search'], FILTER_VALIDATE_BOOLEAN); + $t = filter_var($_REQUEST['t']); + $eventId = filter_var($_REQUEST['eventid'], FILTER_VALIDATE_INT); + if (!$t && !$search && !$eventId) { + $_REQUEST['t'] = '30'; + } // set CommonApp define if not set if (!defined('COMMON_APP_BASE')) { define('COMMON_APP_BASE', '/var/www/server/CommonApps/'); -- 2.17.1