Merge branch 'master' into locale-2.8.3-fr

ChurchCRM · Jul 4, 2017 · d5a4872 · d5a4872
2 parents 41e98ad + eedc4a7
commit d5a4872
Showing 1 changed file with 45 additions and 34 deletions.
diff --git a/src/calendar.php b/src/calendar.php
@@ -11,57 +11,68 @@
 require 'Include/Header.php'; ?>
 
 <style>
-  @media print {
-    a[href]:after {
-      content: none !important;
+    @media print {
+        a[href]:after {
+            content: none !important;
+        }
+    }
+    .fc-other-month .fc-day-number {
+      display:none;
     }
-  }
 </style>
 <div class="col">
-  <div class="box box-primary">
-    <div class="box-body">
-      <?php foreach ($calenderService->getEventTypes() as $type) {
+    <div class="box box-primary">
+        <div class="box-body">
+            <?php foreach ($calenderService->getEventTypes() as $type) {
     ?>
-        <div class="col-xs-3 fc-event-container fc-day-grid-event" style="background-color:<?= $type['backgroundColor']?>;border-color:<?= $type['backgroundColor']?>;color: white; ">
-          <div class="fc-title"><?= gettext($type['Name'])?></div>
-      </div>
-      <?php
-}?>
+                <div class="col-xs-3 fc-event-container fc-day-grid-event"
+                     style="background-color:<?= $type['backgroundColor'] ?>;border-color:<?= $type['backgroundColor'] ?>;color: white; ">
+                    <div class="fc-title"><?= gettext($type['Name']) ?></div>
+                </div>
+                <?php
+} ?>
+        </div>
     </div>
-  </div>
 </div>
 
 <div class="col">
-  <div class="box box-info">
-    <div class="box-body no-padding">
-      <!-- THE CALENDAR -->
-      <div id="calendar"></div>
+    <div class="box box-info">
+        <div class="box-body no-padding">
+            <!-- THE CALENDAR -->
+            <div id="calendar"></div>
+        </div>
+        <!-- /.box-body -->
     </div>
-    <!-- /.box-body -->
-  </div>
-  <!-- /. box -->
+    <!-- /. box -->
 </div>
 <!-- /.col -->
 
 &nbsp;
 
 <!-- fullCalendar 2.2.5 -->
-<script src="<?= SystemURLs::getRootPath()  ?>/skin/fullcalendar/fullcalendar.min.js"></script>
+<script src="<?= SystemURLs::getRootPath() ?>/skin/fullcalendar/fullcalendar.min.js"></script>
 <script>
-  $(function () {
-    /* initialize the calendar
-     -----------------------------------------------------------------*/
-    $('#calendar').fullCalendar({
-      header: {
-        left: 'prev,next today',
-        center: 'title',
-        right: 'month,basicDay,listMonth'
-      },
-      height: 500,
-      locale: '<?= $localeInfo->getLanguageCode() ?>',
-      events: window.CRM.root + '/api/calendar/events'
+    $(function () {
+        /* initialize the calendar
+         -----------------------------------------------------------------*/
+        $('#calendar').fullCalendar({
+            header: {
+                left: 'prev,next today',
+                center: 'title',
+                right: 'month,basicDay,listMonth'
+            },
+            height: 500,
+            locale: '<?= $localeInfo->getLanguageCode() ?>',
+            events: window.CRM.root + '/api/calendar/events',
+            eventRender: function (event, element, view) {
+                var evStart = moment(view.intervalStart).subtract(1, 'days');
+                var evEnd = moment(view.intervalEnd).subtract(1, 'days');
+                if (!event.start.isAfter(evStart) || event.start.isAfter(evEnd)) {
+                    return false;
+                }
+            }
+        });
     });
- });
 </script>
 
 <?php require 'Include/Footer.php'; ?>