Events output changes

Update so image is on the left.
Make the event default to list view like in cityofmi site

diff --git a/Toolkit/Events/views/eventList.html b/Toolkit/Events/views/eventList.html
index 85a008f..d38250f 100755 (executable)
--- 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}<span class="event-list-Frequency">Ongoing Event</span>{end:}
           {if:event.recurr}<span class="event-list-Frequency">Repeating Event</span>{end:}
           </div><!-- /.event-right -->
-          {if:event.image}
-            <a href="{event.href}"><img class="event-list-thumb"
-                src="{imgBaseUrl:h}eventListThumb/{event.image}"
-                width="100"></a>
-          {end:}
+
           <div class="event-list-Intro">
+              {if:event.image}
+                <a href="{event.href}"><img class="event-list-thumb"
+                    src="{imgBaseUrl:h}eventListThumb/{event.image}"
+                    width="100"></a>
+              {end:}
               {event.intro:h}
           </div>
         </div><!-- /.event-list -->

diff --git a/static/16.phtml b/static/16.phtml
index 787519e..701a477 100755 (executable)
--- a/static/16.phtml
+++ b/static/16.phtml
@@ -1,5 +1,31 @@
 <?php
 if (defined('COMMON_EVENTS') && COMMON_EVENTS) {
+    $calendarDateArray = filter_var_array(
+        $_REQUEST,
+        array(
+            'day'   => 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/');