Merge pull request #858 from rob1998/v2-develop

Calendar Work

api/pages/homepage.php

@@ -5,7 +5,7 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
 !function($) {
     "use strict";
     var CalendarApp = function() {
-        this.$body = $("body")
+        this.$body = $("body");
         this.$calendar = $("#calendar"),
         this.$event = ("#calendar-events div.calendar-events"),
         this.$categoryForm = $("#add-new-event form"),
@@ -31,19 +31,19 @@ if (file_exists('config' . DIRECTORY_SEPARATOR . 'config.php')) {
             timeFormat: "' . $GLOBALS['calendarTimeFormat'] . '",
             handleWindowResize: true,
             header: {
-               left: "prev,next",
+               left: "prev,next,today",
                center: "title",
                right: (activeInfo.mobile) ? "" : "today,month,basicWeek,basicDay,list",
             },
             views: {
-               basicDay: { buttonText: window.lang.translate("Day"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
-               basicWeek: { buttonText: window.lang.translate("Week"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
-               month: { buttonText: window.lang.translate("Month"), eventLimit: ' . $GLOBALS['calendarLimit'] . ' },
-               today: { buttonText: window.lang.translate("Today") },
-               list: { buttonText: window.lang.translate("List"), duration: {months: 1} },
+               basicDay: { buttonText: window.lang.translate("Day"), eventLimit: '.$GLOBALS['calendarLimit'].' },
+               basicWeek: { buttonText: window.lang.translate("Week"), eventLimit: '.$GLOBALS['calendarLimit'].' },
+               month: { buttonText: window.lang.translate("Month"), eventLimit: '.$GLOBALS['calendarLimit'].' },
+               list: { buttonText: window.lang.translate("List"), duration: {days: 15} },
             },
             timezone: "local",
             editable: false,
+            navLinks: true, // can click day/week names to navigate views
             droppable: false, // this allows things to be dropped onto the calendar !!!
             selectable: false,
             height: "auto",

css/organizr.css

@@ -800,6 +800,8 @@ input.has-success {
     border-bottom: 1px solid;
     border-color: rgba(120,130,140,.13);
 }
+.fc-state-disabled {
+    display: none;
 .resultBox-outside {
     max-height: 96vh;
 }