Merge branch 'release/3.1.3'

Author: Damian

CHANGELOG renamed to CHANGELOG.txt

@@ -1,3 +1,6 @@
+3.1.3
+Fix display flex ; change add date function to compatible with PHP 5.2
+
 3.1.2
 IE8 fix ; You don't have to create backup with settings improvment
 

LICENSE renamed to LICENSE.txt

@@ -54,9 +54,6 @@ public function on_page_view()
             $this->set('blockIdentifier',rand(12,512));
         }
 
-
-
-
     }
 
     function save($data)

blocks/event_calendar/controller.php

@@ -0,0 +1,5 @@
+.ds-event-modal {
+  &.ie8.active {
+    display: block;
+  }
+}

blocks/event_calendar/css/style.css

@@ -1,5 +1,6 @@
 //@import "reset";
 @import "compass/css3/border-radius";
+@import "compass/css3/flexbox";
 
 @mixin size($width, $height: nil) {
   @if ($height == nil) {
@@ -81,7 +82,7 @@ $blue-dark: darken($blue, 5%);
   align-items: center;
   background-color: rgba(0,0,0,0.5);
   &.active {
-    display: flex;
+    @include display-flex();
   }
 
   .container {
@@ -116,4 +117,6 @@ $blue-dark: darken($blue, 5%);
       padding: $space/4;
     }
   }
-}
+}
+
+@import "iehacks";

blocks/event_calendar/sass/_iehacks.scss

@@ -17,7 +17,11 @@
 <?php endif ?>
 
     <div id="dsEventCalendar<?php echo $blockIdentifier; ?>">
-        <div class="ds-event-modal" id="dsEventModal<?php echo $blockIdentifier; ?>">
+        <!--[if lte IE 9]>
+        <div class="ds-event-modal ie8 ie9" id="dsEventModal<?php echo $blockIdentifier; ?>"><![endif]-->
+        <!--[if !IE]><!-->
+        <div class="ds-event-modal" id="dsEventModal<?php echo $blockIdentifier; ?>"><!--<![endif]-->
+
             <div class="container">
                 <div class="header">
                     <div class="title"></div>

blocks/event_calendar/sass/style.scss

@@ -7,7 +7,7 @@ class dsEventCalendarPackage extends Package
 
     protected $pkgHandle = 'dsEventCalendar';
     protected $appVersionRequired = '5.5.0';
-    protected $pkgVersion = '3.1.2';
+    protected $pkgVersion = '3.1.3';
 
     public function getPackageDescription()
     {

blocks/event_calendar/view.php

@@ -40,7 +40,9 @@ public function view()
                 $startDate = date_format(date_create($_POST['event_start_date']),"Y-m-d");
                 $startTime = $this->post('event_start_time');
                 $date = date_create($_POST['event_end_date']);
-                $date_end = date_format(date_add($date, date_interval_create_from_date_string('1 day')),"Y-m-d");
+                date_modify($date, '+1 day');
+                $date_end = date_format($date,'Y-m-d');
+
                 if(!empty($startTime))
                 {
                     $isAllDay = 0;