antiflicker attempt #542

diff --git a/models/front/events/list.php b/models/front/events/list.php
index cdee114..f3fd72c 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -638,8 +638,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 
         if ( $override_default_view === 'yes' ){
             $calendar_view = "agenda";
-        }else if  ( $calendar_view[0]['calendar_view'] === "" || empty($calendar_view[0]['calendar_view'] ) ){
-               $calendar_view = "agenda";
+        } else if  ( $calendar_view[0]['calendar_view'] === "" || empty($calendar_view[0]['calendar_view'] ) ){
+            $calendar_view = "agenda";
         } else {
             $calendar_view = $calendar_view[0]['calendar_view'];
         }

diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 1bedfdf..d1a6882 100644 (file)
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -4,8 +4,18 @@
     </div>
     <div id="glm-event-agenda-view" class="row">
         <div class="small-12 columns">
+            <script type="text/javascript">
+                
+                var view_select         = jQuery("#glm-event-view-select");
+                var view                = '{$cal_view}';
+                view_select.val('{$cal_view}');
+                if( sessionStorage.view ){
+                    view = sessionStorage.view;
+                }
+            </script>
+            <h2>This calendar is using {$cal_view} view</h2>
             {foreach $eventsByDate as $date => $key}
-                <div class="row glm-event-day-row">
+                <div class="row glm-event-day-row" {if $cal_view === "calendar"} style="display: none;"{/if}>
                     <div class="small-12 medium-2 columns">
                         <div class="glm-event-cal">
                             <div class="glm-event-cal-month">{$date|date_format:"%b"}</div>
@@ -28,11 +38,10 @@
                                             {foreach $event.recurrences.0.day_of_week.names as $day}
                                             {if $day == "Thursday"}
                                                 <span class="agenda-event-weekday"> {$day|substr:0:4} </span>
-                                             {else}
+                                            {else}
                                                 <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
-                                             {/if}
-                                             {/foreach}
-                                            
+                                            {/if}
+                                            {/foreach}
                                         </span>
                                         {/if}
                                          )
@@ -64,7 +73,14 @@
         </div>
     </div>
     <!-- Calendar -->
-    <div id="eventCalendar"></div>
+    <div id="eventCalendar" class="{$cal_view}-view-active"
+        {if $cal_view === "calendar"}
+            style="display: block;"
+        {elseif $cal_view ==="agenda"}
+            style="display: none;"
+        {/if}
+    >
+    </div>
 </div>
 
 
@@ -85,9 +101,6 @@
         var main_content        = $("#main-content");
         var view                = '{$cal_view}';
 
-        if( sessionStorage.view ){
-            view = sessionStorage.view;
-        }
         // AJAX FUNCTION ************************************************
         // Get calendar month via AJAX
         function eventsCalMonthAJAX(month) {
@@ -189,18 +202,18 @@
 
         if(view === "calendar"){
             eventsCalMonthAJAX(month_obj);
-            main_content.removeClass("small-8").addClass("small-12");
-            calendar.show();
-            rows.hide();
+//            main_content.removeClass("small-8").addClass("small-12");
+//            calendar.show();
+//            rows.hide();
             view_select.val('calendar');
 
         } else if ( view === "agenda"){
-            calendar.hide();
-            rows.show();
+//            calendar.hide();
+//            rows.show();
             view_select.val('agenda');
         }
         $("#glm-event-view-select").on("change", function (){
-            console.log($(this).attr("value"));
+            
             sessionStorage.setItem("view", $(this).attr("value"));
             if($("#glm-event-view-select option:selected").val() === "calendar"){
                 eventsCalMonthAJAX(month_obj);