Browse Source

Merge branch 'v2-develop' of https://github.com/causefx/Organizr into v2-develop

causefx 8 years ago
parent
commit
c5efe8a16e

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

@@ -130,6 +130,20 @@ function resolveEmbyItem($itemDetails) {
             $embyItem['nowPlayingTitle'] = @$item['Name'];
             $embyItem['nowPlayingBottom'] = @$item['ProductionYear'];
             break;
+        case 'Video':
+            $embyItem['type'] = 'video';
+            $embyItem['title'] = $item['Name'];
+            $embyItem['summary'] = '';
+            $embyItem['ratingKey'] = $item['Id'];
+            $embyItem['thumb'] = $item['Id'];
+            $embyItem['key'] = $item['Id'] . "-list";
+            $embyItem['nowPlayingThumb'] = $item['Id'];
+            $embyItem['nowPlayingKey'] = $item['Id'] . "-np";
+            $embyItem['metadataKey'] = $item['Id'];
+            $embyItem['nowPlayingImageType'] = isset($item['ImageTags']['Thumb']) ? "Thumb" : (isset($item['BackdropImageTags']) ? "Backdrop" : false);
+            $embyItem['nowPlayingTitle'] = @$item['Name'];
+            $embyItem['nowPlayingBottom'] = @$item['ProductionYear'];
+            break;
         default:
             return false;
 	}

+ 7 - 0
js/functions.js

@@ -1831,6 +1831,9 @@ function buildStreamItem(array,source){
 			case 'tv':
 				icon = 'icon-screen-desktop';
 				break;
+			case 'video':
+				icon = 'icon-screen-film';
+				break;
 			default:
 
 		}
@@ -1923,6 +1926,9 @@ function buildRecentItem(array, type){
 			case 'tv':
 				className = 'recent-poster recent-item recent-tv';
 				break;
+			case 'video':
+				className = 'recent-poster recent-item recent-video';
+				break;
 			default:
 
 		}
@@ -1975,6 +1981,7 @@ function buildRecent(array, type){
 							<li class="divider"></li>
 	                        <li><a data-filter="recent-movie" href="javascript:void(0);">Movies</a></li>
 	                        <li><a data-filter="recent-tv" href="javascript:void(0);">Shows</a></li>
+	                        <li><a data-filter="recent-video" href="javascript:void(0);">Shows</a></li>
 	                        <!--<li><a data-filter="recent-music" href="javascript:void(0);">Music</a></li>-->
 	                    </ul>
 	                </div>

+ 2 - 0
js/langpack/en.json

@@ -1,5 +1,7 @@
 {
 	"token": {
+		"Recently Added to Emby": "Recently Added to Emby",
+		"Active Emby Stream(s):": "Active Emby Stream(s)",
 		"Navigation":"Navigation",
 		"Date":"Date",
 		"Type":"Type",

BIN
plugins/images/tabs/statuscake.png