Merge pull request #1347 from henrywhitaker3/monitorr-bugfixes

Montiorr homepage item bugfix

api/functions/homepage-connect-functions.php

@@ -2528,7 +2528,7 @@ function getMonitorr()
 				// This section grabs the names of all services by regex
 				$services = [];
 				$servicesMatch = [];
-				$servicePattern = '/<div id="servicetitle"><div>(.*)<\/div><\/div><div class="btnonline">Online<\/div><\/a><\/div><\/div>|<div id="servicetitleoffline" style="cursor: default"><div>(.*)<\/div><\/div><div class="btnoffline" style="cursor: default">Offline<\/div><\/div><\/div>/';
+				$servicePattern = '/<div id="servicetitle"><div>(.*)<\/div><\/div><div class="btnonline">Online<\/div><\/a><\/div><\/div>|<div id="servicetitleoffline".*><div>(.*)<\/div><\/div><div class="btnoffline".*>Offline<\/div><\/div><\/div>/';
 				preg_match_all($servicePattern, $html, $servicesMatch);
 				unset($servicesMatch[0]);
 				$servicesMatch = array_values($servicesMatch);
@@ -2543,7 +2543,7 @@ function getMonitorr()
 				// This section then grabs the status and image of that service with regex
 				$statuses = [];
 				foreach($services as $service) {
-					$statusPattern = '/' . $service . '<\/div><\/div><div class="btnonline">(Online)<\/div><\/a><\/div><\/div>|' . $service . '<\/div><\/div><div class="btnoffline" style="cursor: default">(Offline)<\/div><\/div><\/div>/';
+					$statusPattern = '/' . $service . '<\/div><\/div><div class="btnonline">(Online)<\/div><\/a><\/div><\/div>|' . $service . '<\/div><\/div><div class="btnoffline".*>(Offline)<\/div><\/div><\/div>/';
 					$status = [];
 					preg_match($statusPattern, $html, $status);
 					$statuses[$service] = $status;
@@ -2561,7 +2561,7 @@ function getMonitorr()
 
 					$imageMatch = [];
 
-					$imgPattern = '/assets\/img\/..\/img\/(.*)" class="serviceimg" alt=.*><\/div><\/div><div id="servicetitle"><div>' . $service . '|assets\/img\/\.\.\/img\/(.*)" class="serviceimg imgoffline" alt=.*><\/div><\/div><div id="servicetitleoffline" style="cursor: default"><div>' . $service . '/';
+					$imgPattern = '/assets\/img\/\.\.(.*)" class="serviceimg" alt=.*><\/div><\/div><div id="servicetitle"><div>'.$service.'|assets\/img\/\.\.(.*)" class="serviceimg imgoffline" alt=.*><\/div><\/div><div id="servicetitleoffline".*><div>'.$service.'/';
 
 					preg_match($imgPattern, $html, $imageMatch);
 					unset($imageMatch[0]);
@@ -2572,7 +2572,7 @@ function getMonitorr()
 							$image = $match;
 						}
 					}
-					$statuses[$service]['image'] = $url . '/assets/img/' . $image;
+					$statuses[$service]['image'] = $url . '/assets' . $image;
 				}
 
 				ksort($statuses);

js/functions.js

@@ -6431,6 +6431,7 @@ function buildTautulliItem(array){
     .homepage-tautulli-card ol.pl-2 li,
     .library-card ol li {
         margin-top: 2px;
+        text-align-last: left;
     }
 
     .library-card ol::-webkit-scrollbar-track {
@@ -6482,6 +6483,15 @@ function buildTautulliItem(array){
         background-color: #7b7b7b2e;
     }
 
+    .homepage-tautulli-card .card-body h4 {
+        text-align-last: left;
+    }
+
+    .homepage-tautulli-card .card-body span.pull-left {
+        line-height: 22px;
+        font-size: 18px;
+    }
+
     .platform-android-rgba { background-color: rgba(164, 202, 57, 0.40); }
     .platform-atv-rgba { background-color: rgba(133, 132, 135, 0.40); }
     .platform-chrome-rgba { background-color: rgba(237, 94, 80, 0.40); }
@@ -6606,7 +6616,7 @@ function buildTautulliItem(array){
                         }
                 card += `
                         <div class="card-body">
-                            <div class="row" style="display: flex;">
+                            <div class="row h-100" style="display: flex;">
                                 <div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 align-self-center" style="overflow: hidden;">`;
                                 if(stat == 'top_users') {
                                     card += `<img src="`+e['rows'][0]['user_thumb']+`" class="poster avatar" alt="user avatar">`;
@@ -6627,7 +6637,7 @@ function buildTautulliItem(array){
                                 var cardTitle = (addExtraField) ? '<span class="pull-left">'+e['stat_title']+'</span><span class="pull-right">'+extraField+'</span><div class="clearfix"></div>' : '<h4>'+e['stat_title']+'</h4>';
                 card += `
                                 </div>
-                                <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12" style="overflow: hidden;">
+                                <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 align-self-center" style="overflow: hidden;">
                                     `+cardTitle+`
                                     <hr class="my-2">
                                     <ol class="pl-2">`;