Calendar changes

api/functions/homepage-connect-functions.php

@@ -780,13 +780,13 @@ function getSonarrCalendar($array,$number){
         $episodeAirDate = date("Y-m-d H:i:s", $episodeAirDate);
         if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
         $downloaded = $child['hasFile'];
-        if($downloaded == "0" && isset($unaired) && $episodePremier == "true"){ $downloaded = "bg-primary"; }elseif($downloaded == "0" && isset($unaired)){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success"; }else{ $downloaded = "bg-danger"; }
+        if($downloaded == "0" && isset($unaired) && $episodePremier == "true"){ $downloaded = "text-primary"; }elseif($downloaded == "0" && isset($unaired)){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success"; }else{ $downloaded = "text-danger"; }
 		array_push($gotCalendar, array(
 			"id" => "Sonarr-".$number."-".$i,
 			"title" => $seriesName,
 			"start" => $child['airDateUtc'],
-			"className" => $downloaded." tvID--".$episodeID,
-			"imagetype" => "tv",
+			"className" => "bg-calendar tvID--".$episodeID,
+			"imagetype" => "tv ".$downloaded,
 		));
     }
     if ($i != 0){ return $gotCalendar; }
@@ -806,13 +806,13 @@ function getRadarrCalendar($array,$number){
 			$physicalRelease = date("Y-m-d", $physicalRelease);
 			if (new DateTime() < new DateTime($physicalRelease)) { $notReleased = "true"; }else{ $notReleased = "false"; }
 			$downloaded = $child['hasFile'];
-			if($downloaded == "0" && $notReleased == "true"){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success"; }else{ $downloaded = "bg-danger"; }
+			if($downloaded == "0" && $notReleased == "true"){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success"; }else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "Radarr-".$number."-".$i,
 				"title" => $movieName,
 				"start" => $child['physicalRelease'],
-				"className" => $downloaded." movieID--".$movieID,
-				"imagetype" => "film",
+				"className" => "bg-calendar movieID--".$movieID,
+				"imagetype" => "film ".$downloaded,
 			));
         }
     }
@@ -835,13 +835,13 @@ function getCouchCalendar($array,$number){
 			$physicalRelease = date("Y-m-d", $physicalRelease);
 			if (new DateTime() < new DateTime($physicalRelease)) { $notReleased = "true"; }else{ $notReleased = "false"; }
 			$downloaded = ($child['status'] == "active") ? "0" : "1";
-			if($downloaded == "0" && $notReleased == "true"){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success"; }else{ $downloaded = "bg-danger"; }
+			if($downloaded == "0" && $notReleased == "true"){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success"; }else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "CouchPotato-".$number."-".$i,
 				"title" => $movieName,
 				"start" => $physicalRelease,
-				"className" => $downloaded." movieID--".$movieID,
-				"imagetype" => "film",
+				"className" => "bg-calendar movieID--".$movieID,
+				"imagetype" => "film ".$downloaded,
 			));
 		}
 	}
@@ -862,13 +862,13 @@ function getSickrageCalendarWanted($array,$number){
             $episodeAirDate = date("Y-m-d H:i:s", $episodeAirDate);
             if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
             $downloaded = "0";
-            if($downloaded == "0" && isset($unaired)){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success";}else{ $downloaded = "bg-danger"; }
+            if($downloaded == "0" && isset($unaired)){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success";}else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "Sick-".$number."-Miss-".$i,
 				"title" => $seriesName,
 				"start" => $episodeAirDate,
-				"className" => $downloaded." tvID--".$episodeID,
-				"imagetype" => "tv",
+				"className" => "bg-calendar tvID--".$episodeID,
+				"imagetype" => "tv ".$downloaded,
 			));
     }
     foreach($array['data']['today'] AS $child) {
@@ -882,13 +882,13 @@ function getSickrageCalendarWanted($array,$number){
             $episodeAirDate = date("Y-m-d H:i:s", $episodeAirDate);
             if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
             $downloaded = "0";
-            if($downloaded == "0" && isset($unaired)){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success";}else{ $downloaded = "bg-danger"; }
+            if($downloaded == "0" && isset($unaired)){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success";}else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "Sick-".$number."-Today-".$i,
 				"title" => $seriesName,
 				"start" => $episodeAirDate,
-				"className" => $downloaded." tvID--".$episodeID,
-				"imagetype" => "tv",
+				"className" => "bg-calendar tvID--".$episodeID,
+				"imagetype" => "tv ".$downloaded,
 			));
     }
     foreach($array['data']['soon'] AS $child) {
@@ -902,13 +902,13 @@ function getSickrageCalendarWanted($array,$number){
             $episodeAirDate = date("Y-m-d H:i:s", $episodeAirDate);
             if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
             $downloaded = "0";
-            if($downloaded == "0" && isset($unaired)){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success";}else{ $downloaded = "bg-danger"; }
+            if($downloaded == "0" && isset($unaired)){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success";}else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "Sick-".$number."-Soon-".$i,
 				"title" => $seriesName,
 				"start" => $episodeAirDate,
-				"className" => $downloaded." tvID--".$episodeID,
-				"imagetype" => "tv",
+				"className" => "bg-calendar tvID--".$episodeID,
+				"imagetype" => "tv ".$downloaded,
 			));
     }
     foreach($array['data']['later'] AS $child) {
@@ -922,13 +922,13 @@ function getSickrageCalendarWanted($array,$number){
             $episodeAirDate = date("Y-m-d H:i:s", $episodeAirDate);
             if (new DateTime() < new DateTime($episodeAirDate)) { $unaired = true; }
             $downloaded = "0";
-            if($downloaded == "0" && isset($unaired)){ $downloaded = "bg-info"; }elseif($downloaded == "1"){ $downloaded = "bg-success";}else{ $downloaded = "bg-danger"; }
+            if($downloaded == "0" && isset($unaired)){ $downloaded = "text-info"; }elseif($downloaded == "1"){ $downloaded = "text-success";}else{ $downloaded = "text-danger"; }
 			array_push($gotCalendar, array(
 				"id" => "Sick-".$number."-Later-".$i,
 				"title" => $seriesName,
 				"start" => $episodeAirDate,
-				"className" => $downloaded." tvID--".$episodeID,
-				"imagetype" => "tv",
+				"className" => "bg-calendar tvID--".$episodeID,
+				"imagetype" => "tv ".$downloaded,
 			));
     }
     if ($i != 0){ return $gotCalendar; }
@@ -942,13 +942,13 @@ function getSickrageCalendarHistory($array,$number){
             $seriesName = $child['show_name'];
             $episodeID = $child['tvdbid'];
             $episodeAirDate = $child['date'];
-            $downloaded = "bg-success";
+            $downloaded = "text-success";
 			array_push($gotCalendar, array(
 				"id" => "Sick-".$number."-History-".$i,
 				"title" => $seriesName,
 				"start" => $episodeAirDate,
-				"className" => $downloaded." tvID--".$episodeID,
-				"imagetype" => "tv",
+				"className" => "bg-calendar tvID--".$episodeID,
+				"imagetype" => "tv ".$downloaded,
 			));
     }
     if ($i != 0){ return $gotCalendar; }

api/pages/homepage.php

@@ -30,7 +30,7 @@ $pageHomepage = '
             timeFormat: "'.$GLOBALS['calendarTimeFormat'].'",
             handleWindowResize: true,
             header: {
-                left: "prev,next today",
+                left: "prev,next",
                 center: "title",
                 right: "month,basicDay,basicWeek"
             },

css/organizr.css

@@ -246,3 +246,11 @@ padding: 5px;
 text-align: left;
 background: #2cabe3;
 }
+.bg-calendar {
+	background: transparent;
+  color:inherit;
+}
+.fc-toolbar {
+  margin: 0;
+  padding: 19px 20px 11px 20px;
+}

css/themes/Organizr.css

@@ -123,7 +123,6 @@ body {
 }
 /*Extra css*/
 .bg-theme,
-.fc-toolbar,
 .fc th.fc-sun,
 .fc th.fc-tue,
 .fc th.fc-thu,
@@ -268,11 +267,11 @@ a.mytooltip {
   background: #1f1f1f;
   padding: 20px 30px;
   text-align: left;
-  max-width: 90%;
+  max-width: 75%;
   margin: 40px auto;
   position: relative;
-  border: 1px solid #2cabe4;
-  border-radius: 10px;
+  /*border: 1px solid #2cabe4;
+  border-radius: 10px;*/
 }
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
   background-color: #333;

plugins/bower_components/calendar/dist/fullcalendar.js

@@ -6656,7 +6656,7 @@ DayGrid.mixin({
 		if (seg.isStart) {
 			timeText = this.getEventTimeText(event);
 			if (timeText) {
-				timeHtml = '<span class="fc-time">' + htmlEscape(timeText) + '</span><br/>';
+				timeHtml = '<span class="fc-time '+(htmlEscape(event.imagetype || '') || '&nbsp;')+'">' + htmlEscape(timeText) + '</span><br/>';
 			}else{
        timeHtml = '<br/>';
    }