Merge branch 'release/3.3.4'

CHANGELOG.txt

@@ -1,3 +1,6 @@
+3.3.4
+Add content height (calendar height) as option for block
+
 3.3.3
 Add ICS calendar ; To call calendar use link:
 http://DOMAIN/index.php/tools/packages/dsEventCalendar/event_calendar/ical.php?id=1

README.md

@@ -25,10 +25,13 @@ If you choose "One day with time" event you can resize event for more days.
 
 Version
 ----
-3.3.3
+3.3.4
 
 Changelog
 ----
+3.3.4
+Add content height (calendar height) as option for block
+
 3.3.3
 Add ICS calendar ; To call calendar use link:
 http://DOMAIN/index.php/tools/packages/dsEventCalendar/event_calendar/ical.php?id=1

blocks/event_calendar/add.php

@@ -6,6 +6,7 @@
         'langs' => $langs,
         'calendarID' => null,
         'lang' => null,
-        'types' => $types
+        'types' => $types,
+        'contentHeight' => null
     ));
 ?>

blocks/event_calendar/controller.php

@@ -69,6 +69,7 @@ function save($data)
         $args['calendarID'] = isset($data['calendarID']) ? intval($data['calendarID']) : 0;
         $args['typeID'] = isset($data['typeID']) ? intval($data['typeID']) : 0;
         $args['lang'] = isset($data['lang']) ? $data['lang'] : 'en-gb';
+        $args['contentHeight'] = isset($data['contentHeight']) ? $data['contentHeight'] : 'auto';
         parent::save($args);
     }
 
@@ -79,6 +80,7 @@ function add()
         $this->set('calendars', $calendars);
 
         $this->set('langs', $this->lang_list);
+        $this->set('lang','en-gb');
 
         $dsEventCalendar = new \dsEventCalendar\dsEventCalendar();
         $types = $dsEventCalendar->getEventTypesForBlock();
@@ -95,6 +97,7 @@ function edit()
 
         $this->set('langs', $this->lang_list);
         $this->set('lang',$this->lang);
+        $this->set('contentHeight',$this->contentHeight);
 
         $dsEventCalendar = new \dsEventCalendar\dsEventCalendar();
         $types = $dsEventCalendar->getEventTypesForBlock();

blocks/event_calendar/db.xml

@@ -13,5 +13,8 @@
         <field name="typeID" type="C" size="255">
             <default value="0"/>
         </field>
+        <field name="contentHeight" type="C" size="255">
+            <default value="0"/>
+        </field>
     </table>
 </schema>

blocks/event_calendar/edit.php

@@ -6,6 +6,7 @@
     'calendarID' => $calendarID,
     'lang' => $lang,
     'types' => $types,
-    'typeID' => $typeID
+    'typeID' => $typeID,
+    'contentHeight' => $contentHeight
 ));
 ?>

blocks/event_calendar/form_setup_html.php

@@ -7,7 +7,10 @@
         <?php echo t('No calendar exist. Add from one from dashboard.') ?>
     </div>
 <?php else: ?>
-    <div style="margin-top: 10px;">
+    <div>
+        <h3>
+            Block settings:
+        </h3>
         <fieldset>
             <label for="calendarID"><?php echo t('Select calendar') ?></label>
 
@@ -48,5 +51,22 @@
                 </select>
             </div>
         </fieldset>
+        <h3 style="margin-top: 10px;">
+            Calendar settings:
+        </h3>
+
+        <fieldset>
+            <label for="contentHeight"><?php echo t("Will make the calendar's content area a pixel height - default auto (empty)") ?></label>
+
+
+            <div style="margin-top: 10px;">
+                <input
+                    type="number"
+                    name="contentHeight"
+                    class="form-control"
+                    id="contentHeight"
+                    placeholder="auto"
+                    value="<?php echo $contentHeight ?>">
+            </div>
     </div>
 <?php endif; ?>

blocks/event_calendar/view.php

@@ -123,7 +123,8 @@
                 eventLimit: parseInt(settings.eventsInDay)+1,
                 events: events,
                 lang: '<?php echo $lang; ?>',
-                firstDay: settings.startFrom
+                firstDay: settings.startFrom,
+                contentHeight: <?php echo $contentHeight == 'auto' || $contentHeight == '' ? "'auto'" : $contentHeight; ?>
             });
 
             $(".ds-event-modal .btn-close").on('click',function(){

controller.php

@@ -12,7 +12,7 @@ class Controller extends Package {
 
     protected $pkgHandle = 'dsEventCalendar';
     protected $appVersionRequired = '5.7.0.4';
-    protected $pkgVersion = '3.3.3';
+    protected $pkgVersion = '3.3.4';
     protected $pkgAutoloaderRegistries = array(
         'src/dsEventCalendar' => '\dsEventCalendar'
     );