Update event list output

Setup to not group by date then category.

diff --git a/Toolkit/Events/css/event.css b/Toolkit/Events/css/event.css
index f21ad07..ac76e46 100755 (executable)
--- a/Toolkit/Events/css/event.css
+++ b/Toolkit/Events/css/event.css
@@ -388,41 +388,14 @@
 }
 .event-list {
     border-bottom: 1px solid #ccc;
-    height: 1%;
-    overflow: hidden;
-    padding: 6px 0;
+    padding-bottom: 15px;
 }
-.event-list-date {
-    width: 130px;
-    float: left;
-    padding: 3px 6px;
+.event-list-thumb {
+    border: 1px solid rgb(51, 102, 153);
+    border-radius: 8px;
     display: block;
-    margin: 0;
-    font-size: 12px;
-    /* font-size: 1.2rem; */
-    font-weight: bold;
-}
-.event-list h3 {
-    font-size: 12px;
-    /* font-size: 1.2rem; */
     float: left;
-    padding: 3px;
-    width: 280px;
-    background-image: none !important;
-    margin: 0;
-    line-height: 1.5em;
-}
-.event-list h3 a {
-    font-size: 13px;
-    /* font-size: 1.3rem; */
-}
-.event-list-Frequency {
-    float: right;
-    text-align: right;
-    width: 80px;
-    font-size: 11px;
-    /* font-size: 1.1rem; */
-    margin: 0;
+    margin: 0 4% 8px 5px;
 }
 .ulCr, .ulCr li, .ulCr ul {
     list-style-type: none;

diff --git a/Toolkit/Events/views/eventList.html b/Toolkit/Events/views/eventList.html
index baa737f..fa7a307 100755 (executable)
--- a/Toolkit/Events/views/eventList.html
+++ b/Toolkit/Events/views/eventList.html
@@ -1,94 +1,4 @@
-<style type="text/css">
-<!--
-/* Steve's Styles */
-#category, .listing {display: none;}
-.event-date-hdr h2 {margin: 0 !important;}
-.event-category-hdr {
-    width: 98%;
-    padding: 5px 2% 5px 0;
-    margin: 0;
-    color: #E4E4E4;
-    text-align: left;
-    border-bottom: 1px solid #E4E4E4;
-}
-.event-category-hdr h2 {
-    display: block;
-    padding: 0;
-    margin: 0;
-    font-weight: bold;
-    /*color: #666;*/
-    /*font-size: 14px;*/
-    }
-.event-cat {
-    margin: 0;
-    overflow: hidden;
-}
-.event-list {
-    margin: 0;
-    padding: 0 0 14px 14px;
-    border-bottom: 1px solid #E4E4E4;
-}
-.event-list-Intro {
-    display: block;
-    padding: 0 0 10px 0;
-       clear: left;
-}
-
-.event-list h3 {
-    display: block;
-    float: left;
-    margin: 0;
-    padding: 0;
-    width: 70%;
-}
-.event-list h3 a {
-    display: block;
-    font-size: 16px;
-    /* font-size: 1.6rem; */
-    font-weight: bold;
-    color: black;
-    }
-.event-list h3 a:hover {
-}
-.event-list-thumb  {
-    display: block;
-    float: left;
-    border: 1px solid rgb(51,102,153);
-    border-radius: 8px;
-    margin: 0 4% 8px 5px;
-    width: 26%;
-}
-.event-right {
-    float: right;
-    width: 30%;
-    min-height: 54px;
-}
-.event-right > a > img {
-    margin: 0 10px 10px 10px;
-}
-.event-list-Times {
-    display: block;
-    float: right;
-    clear: right;
-    color: #00456C;
-    width: 100%;
-    text-align: right;
-    margin: 0;
-    padding: 0 0 2px 0;
-    min-height: 20px;
-}
-.event-list-Frequency {
-    display: block;
-    float: right;
-    clear: right;
-    color: #00456C;
-    width: 100%;
-    text-align: right;
-    padding: 0 0 6px 0;
-}
--->
-</style>
-<div id="eventsList">
+<div id="eventsList" class="row">
 {if:search}
 <flexy:toJavascript
     flexy:prefix=""
@@ -103,38 +13,19 @@
     {end:}
 </p>
 {if:events}
-  {foreach:events,dateTime,date}
-  <div class="event-date-hdr"><h2 class="text-left">{dateTime}</h2></div>
-    {foreach:date,categoryName,category}
-      <div class="event-cat">
-
-        <div class="event-category-hdr" flexy:if="categoryName"><h3>{categoryName}</h3></div>
-        {foreach:category,event}
-          {if:event.spans}<div class="event-list ongoing">{end:}
-          {if:event.recurr}<div class="event-list reacur">{end:}
-          {if:event.normal}<div class="event-list">{end:}
-          <h3>
-            <a href="{event.href}">{event.header}</a>
-          </h3>
-          <div class="event-right">
-          <span class="event-list-Times">{event.getEventTimes()}</span>
-          {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 -->
+    {foreach:events,event}
+    <div class="small-12 columns event-list">
+        <h3><a href="{event.href}">{event.header}</a></h3>
+        <h3>{event.getDates()} {event.getEventTimes()}</h3>
 
-          <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 -->
-      {end:}
-    </div><!-- /.event-cat -->
+        {if:event.image}
+        <a href="{event.href}"><img class="right event-list-thumb"
+            src="{imgBaseUrl:h}eventListThumb/{event.image}"
+            width="100"></a>
+        {end:}
+        <p>{event.intro:h}</p>
+    </div>
     {end:}
-  {end:}
 {else:}
     <p>No events were found for your search. </p>
 {end:}

diff --git a/config/eventCalendar.ini b/config/eventCalendar.ini
index dd305d2..b8d5906 100644 (file)
--- a/config/eventCalendar.ini
+++ b/config/eventCalendar.ini
@@ -25,6 +25,8 @@ flexyOptions.templateDirOrder = "reverse"
 css.ignore.regex[] = "Common/EventCalendar_V0/css/events.css"
 css.ignore.regex[] = "response/V0/css/1140.css"
 css.replace[] = MEDIA_BASE_URL "Toolkit/Events/css/event.css"
+
+front.list.sortByCategory  = Off
 ; development server configuration inherits from production and
 ; overrides values as needed
 [development : production]