Skip to content

Commit

Permalink
v2.11.6 Community Updates
Browse files Browse the repository at this point in the history
Enhancement: Images to the bottom of Now Showing for resolution, sound format, and aspect ratio (Issue MattsShack#74)
- Add padding to information icons so they don't sit up against each other.
- Adjust sizing of info icons to be a little smaller
- Update 'TV-' icons to more match film colors and make a bit easier to read.
- Add TV-G icon
- Update icon logic to eliminate empty icon if not available.

Updates and Bug Fixes:
- Update missed information in ChangeLog for 2.11.5
  • Loading branch information
ZeroCoolGOS committed Apr 3, 2021
1 parent de70a1e commit 7e98c59
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 12 deletions.
2 changes: 1 addition & 1 deletion GitVersion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ignore:
sha: []
merge-message-formats: {}
mode: ContinuousDelivery
next-version: 2.11.5
next-version: 2.11.6
26 changes: 20 additions & 6 deletions assets/plexmovieposter/PMPDLib.php
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,10 @@ function PMPD_DisplayMediaInfo() {
break;
}

if ($contentRatingProfile != "") {
$contentRatingProfile = "<img src=\"$contentRatingProfile\">";
}

switch ($mediaVideoResolution) {
case "sd":
$videoResolutionProfile = "$iconPath/Res-SD.png?$iconChangeID";
Expand All @@ -372,6 +376,10 @@ function PMPD_DisplayMediaInfo() {
$videoResolutionProfile = "";
break;
}

if ($videoResolutionProfile != "") {
$videoResolutionProfile = "<img src=\"$videoResolutionProfile\">";
}

switch ($mediaVideoCodec) {
case "h264":
Expand All @@ -388,6 +396,10 @@ function PMPD_DisplayMediaInfo() {
break;
}

if ($videoCodecProfile != "") {
$videoCodecProfile = "<img src=\"$videoCodecProfile\">";
}

switch ($mediaAudioCodec) {
case "aac":
$audioCodecProfile = "";
Expand All @@ -414,6 +426,10 @@ function PMPD_DisplayMediaInfo() {
$audioCodecProfile = "";
break;
}

if ($audioCodecProfile != "") {
$audioCodecProfile = "<img src=\"$audioCodecProfile\">";
}

switch ($mediaAudioChannelLayout) {
case "mono":
Expand All @@ -433,16 +449,14 @@ function PMPD_DisplayMediaInfo() {
$audioCodecProfile = "";
break;
}

if ($audioChannelLayoutProfile != "") {
$audioChannelLayoutProfile = "<img src=\"$audioChannelLayoutProfile\">";
}

$profileHeader = "";
$titleProfile = "<div class=\"showMetadata\" style=\"font-size:${bottomSize}px\">$title<p><p>";

$contentRatingProfile = "<img src=\"$contentRatingProfile\">";
$videoResolutionProfile = "<img src=\"$videoResolutionProfile\">";
$videoCodecProfile = "<img src=\"$videoCodecProfile\">";
$audioCodecProfile = "<img src=\"$audioCodecProfile\">";
$audioChannelLayoutProfile = "<img src=\"$audioChannelLayoutProfile\">";

$profileFooter = "</div>";

$mediaProfiles = $videoResolutionProfile . $videoCodecProfile . $audioChannelLayoutProfile . $contentRatingProfile;
Expand Down
13 changes: 11 additions & 2 deletions assets/plexmovieposter/css/DisplayStyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,24 @@
font-size: 10px;
}

.showMetadata img {
padding-left: 2px;
padding-right: 2px;
}

@media screen and (orientation: landscape) {
.showMetadata img {
width: 20%;
width: 15%;
/* padding-left: 2px; */
/* padding-right: 2px; */
}
}

@media screen and (orientation: portrait) {
.showMetadata img {
width: 40%;
width: 30%;
/* padding-left: 2px; */
/* padding-right: 2px; */
}
}

Expand Down
Binary file modified assets/plexmovieposter/images/icons/mediaInfo/Rated-TV14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/plexmovieposter/images/icons/mediaInfo/Rated-TVMA.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/plexmovieposter/images/icons/mediaInfo/Rated-TVPG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
2 changes: 1 addition & 1 deletion build/DockerSetup.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ portexternal = 80
portinternal = 80
osplatform = linux
imagenameroot = plexmovieposterdisplay
tag = 2.11.5
tag = 2.11.6
dockerfileroot = ../.
imagetype =
networktype =
Expand Down
2 changes: 1 addition & 1 deletion build/UpdateVersion.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def UpdatePHP(DisplayMSG=False,ConfigSegment="DEFAULT",ConfigKey="version",Confi
# there for there might be trailing data we need to truncate away.

DisplayMSG = False
SetVersion = "2.11.5"
SetVersion = "2.11.6"

PYScriptRoot = os.path.abspath(os.path.dirname(__file__))

Expand Down
14 changes: 14 additions & 0 deletions docs/ChangeLogs.md
Original file line number Diff line number Diff line change
Expand Up @@ -419,3 +419,17 @@ Enhancement: Plex Function Isolation (Issue #64)
- Isolate PLEX read from using 'clients' variable and converted to PLEX object. Full conversion still in progress.
- Clean up duplicated variables for 'logName' to use as part of PLEX object.
- Move away from reading media session information xml to direct media information for much richer metadata. Media session information still required to get direct media library ID for direct read.

Updates and Bug Fixes:
- Update test for logging to allow read of logs directly from the browser.

**v2.11.6 Community Updates**\
Enhancement: Images to the bottom of Now Showing for resolution, sound format, and aspect ratio (Issue #74)
- Add padding to information icons so they don't sit up against each other.
- Adjust sizing of info icons to be a little smaller
- Update 'TV-' icons to more match film colors and make a bit easier to read.
- Add TV-G icon
- Update icon logic to eliminate empty icon if not available.

Updates and Bug Fixes:
- Update missed information in ChangeLog for 2.11.5
2 changes: 1 addition & 1 deletion settings/PMPInfo.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

// Release Information
$version = "2.11.5";
$version = "2.11.6";

?>

0 comments on commit 7e98c59

Please sign in to comment.