Преглед на файлове

Added Bazarr logo
Edit calendar backend
Fix help text variable

causefx преди 7 години
родител
ревизия
a51ab041e1
променени са 5 файла, в които са добавени 23 реда и са изтрити 3 реда
  1. 9 0
      api/functions/homepage-connect-functions.php
  2. 11 0
      css/organizr.css
  3. 0 0
      css/organizr.min.css
  4. 1 1
      js/functions.js
  5. 2 2
      plugins/bower_components/calendar/dist/fullcalendar.js

+ 9 - 0
api/functions/homepage-connect-functions.php

@@ -1108,6 +1108,7 @@ function getSonarrCalendar($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details
 		));
 	}
@@ -1171,6 +1172,7 @@ function getLidarrCalendar($array, $number)
 			"imagetype" => "music " . $downloaded,
 			"imagetypeFilter" => "music",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details
 		));
 	}
@@ -1262,6 +1264,7 @@ function getRadarrCalendar($array, $number, $url)
 				"imagetype" => "film " . $downloaded,
 				"imagetypeFilter" => "film",
 				"downloadFilter" => $downloaded,
+				"bgColor" => str_replace('text', 'bg', $downloaded),
 				"details" => $details
 			));
 		}
@@ -1344,6 +1347,7 @@ function getCouchCalendar($array, $number)
 				"imagetype" => "film " . $downloaded,
 				"imagetypeFilter" => "film",
 				"downloadFilter" => $downloaded,
+				"bgColor" => str_replace('text', 'bg', $downloaded),
 				"details" => $details
 			));
 		}
@@ -1412,6 +1416,7 @@ function getSickrageCalendarWanted($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details,
 		));
 	}
@@ -1468,6 +1473,7 @@ function getSickrageCalendarWanted($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details,
 		));
 	}
@@ -1524,6 +1530,7 @@ function getSickrageCalendarWanted($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details,
 		));
 	}
@@ -1580,6 +1587,7 @@ function getSickrageCalendarWanted($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details,
 		));
 	}
@@ -1633,6 +1641,7 @@ function getSickrageCalendarHistory($array, $number)
 			"imagetype" => "tv " . $downloaded,
 			"imagetypeFilter" => "tv",
 			"downloadFilter" => $downloaded,
+			"bgColor" => str_replace('text', 'bg', $downloaded),
 			"details" => $details,
 		));
 	}

+ 11 - 0
css/organizr.css

@@ -1157,4 +1157,15 @@ img.img-chooser {
     margin-left: auto;
     margin-right: auto;
     width: 50%;
+}
+.fc-status {
+    width: 0px;
+    height: 100%;
+    display: block;
+    position: absolute;
+    border-radius: 5px;
+}
+span.fc-image,
+span.fc-title {
+    margin-left: 5px;
 }

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
css/organizr.min.css


+ 1 - 1
js/functions.js

@@ -628,7 +628,7 @@ function buildFormItem(item){
 	var pwd2 = createRandomString(6);
 	var pwd3 = createRandomString(6);
 	var helpInfo = (item.help) ? '<div class="collapse" id="help-info-'+item.name+'"><blockquote>'+item.help+'</blockquote></div>' : '';
-    var smallLabel = (item.smallLabel) ? '<label><span lang="en">'+item.smallLabel+'</span>`+helpTip+`</label>'+helpInfo : ''+helpInfo;
+    var smallLabel = (item.smallLabel) ? '<label><span lang="en">'+item.smallLabel+'</span></label>'+helpInfo : ''+helpInfo;
 	var pwgMgr = `
 	<input name="disable-pwd-mgr-`+pwd1+`" type="password" id="disable-pwd-mgr-`+pwd1+`" style="display: none;" value="disable-pwd-mgr-`+pwd1+`" />
 	<input name="disable-pwd-mgr-`+pwd2+`" type="password" id="disable-pwd-mgr-`+pwd2+`" style="display: none;" value="disable-pwd-mgr-`+pwd2+`" />

+ 2 - 2
plugins/bower_components/calendar/dist/fullcalendar.js

@@ -6671,7 +6671,7 @@ DayGrid.mixin({
 				(htmlEscape(event.title || '') || '&nbsp;') + // we always want one line of height
 			'</span>';
         imageHtml =
-			'<span class="fc-image"><i class="fa fa-' +
+			'<span class="fc-status '+ event.bgColor +'"></span><span class="fc-image"><i class="fa fa-' +
 				(htmlEscape(event.imagetype || '') || '&nbsp;') + // we always want one line of height
 			'"></i></span>';
 
@@ -14546,7 +14546,7 @@ var ListViewGrid = Grid.extend({
 				(htmlEscape(event.title || '') || '&nbsp;') + // we always want one line of height
 			'</span>';
         imageHtml =
-			'<span class="fc-image"><i class="fa fa-' +
+			'<span class="fc-status '+ event.bgColor +'"></span><span class="fc-image"><i class="fa fa-' +
 				(htmlEscape(event.imagetype || '') || '&nbsp;') + // we always want one line of height
 			'"></i></span>';
 

Някои файлове не бяха показани, защото твърде много файлове са промени