From 13eeabf2674d5d2a84bcca98925178cc6be885cc Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 24 Feb 2021 00:06:53 +0900
Subject: [PATCH] minor improvements to plugin pages

---
 src/controllers/dashboard/plugins/add/index.js     |  2 +-
 .../dashboard/plugins/installed/index.js           | 14 ++++++--------
 src/scripts/clientUtils.js                         |  2 +-
 src/strings/en-gb.json                             |  4 ++--
 src/strings/en-us.json                             |  4 ++--
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js
index 89bd499f49..787b193861 100644
--- a/src/controllers/dashboard/plugins/add/index.js
+++ b/src/controllers/dashboard/plugins/add/index.js
@@ -33,7 +33,7 @@ function populateVersions(packageInfo, page, installedPlugin) {
         $('#pCurrentVersion', page).hide().html('');
     }
 
-    const packageVersion = packageInfo.versions[0];
+    const packageVersion = packageInfo.versions.sort().pop();
     if (packageVersion) {
         selectmenu.val(packageVersion.version);
     }
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index 654ae4c29e..04deb2e85a 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -66,7 +66,7 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
     if (configPageUrl) {
         html += `<a class="cardImageContainer" is="emby-linkbutton" style="margin:0;padding:0" href="${configPageUrl}">`;
     } else {
-        html += '<div class="cardImageContainer noConfigPluginCard noHoverEffect emby-button">';
+        html += '<div class="cardImageContainer noConfigPluginCard noHoverEffect emby-button" style="margin:0;padding:0">';
     }
 
     if (plugin.HasImage) {
@@ -87,12 +87,10 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
         html += '</div>';
     }
 
-    html += "<div class='cardText'>";
-    html += configPage && configPage.DisplayName ? configPage.DisplayName : plugin.Name;
-    html += `<br/>${globalize.translate('LabelStatus')} ${plugin.Status}</div>`;
-    html += "<div class='cardText cardText-secondary'>";
-    html += plugin.Version;
+    html += '<div class="cardText">'
+    html += `${plugin.Name}<span class='cardText cardText-secondary'>${plugin.Version}</span>`;
     html += '</div>';
+    html += `<div class="cardText">${globalize.translate('LabelStatus')} ${plugin.Status}</div>`;
     html += '</div>';
     html += '</div>';
     html += '</div>';
@@ -161,7 +159,7 @@ function showPluginMenu(page, elem) {
             menuItems.push({
                 name: globalize.translate('EnablePlugin'),
                 id: 'enable',
-                icon: 'mode_enable'
+                icon: 'check_circle_outline'
             });
         }
 
@@ -169,7 +167,7 @@ function showPluginMenu(page, elem) {
             menuItems.push({
                 name: globalize.translate('DisablePlugin'),
                 id: 'disable',
-                icon: 'mode_disable'
+                icon: 'do_not_disturb'
             });
         }
 
diff --git a/src/scripts/clientUtils.js b/src/scripts/clientUtils.js
index 291202b2e0..a7941d88c6 100644
--- a/src/scripts/clientUtils.js
+++ b/src/scripts/clientUtils.js
@@ -65,7 +65,7 @@ export async function serverAddress() {
         }));
     }).then(configs => {
         const selection = configs.find(obj => !obj.config.StartupWizardCompleted) || configs[0];
-        return Promise.resolve(selection.url);
+        return Promise.resolve(selection?.url);
     }).catch(error => {
         console.log(error);
         return Promise.resolve();
diff --git a/src/strings/en-gb.json b/src/strings/en-gb.json
index a863660bc1..6118921df3 100644
--- a/src/strings/en-gb.json
+++ b/src/strings/en-gb.json
@@ -1457,8 +1457,8 @@
     "LabelEnableIP4Help": "Enables IPv4 functionality.",
     "LabelEnableIP4": "Enable IPv4:",
     "HeaderNetworking": "IP Protocols",
-    "EnablePlugin": "Enable Plugin",
-    "DisablePlugin": "Disable Plugin",
+    "EnablePlugin": "Enable",
+    "DisablePlugin": "Disable",
     "YoutubeDenied": "Requested video is not allowed to be played in embedded players.",
     "YoutubeNotFound": "Video not found.",
     "YoutubePlaybackError": "Requested video cannot be played.",
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 3941622491..b23b261c14 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -179,8 +179,8 @@
     "DirectStreamHelp1": "The video stream is compatible with the device, but has an incompatible audio format (DTS, TRUEHD, etc) or number of audio channels. The video stream will be repackaged losslessly on the fly before being sent to the device. Only the audio stream will be transcoded.",
     "DirectStreamHelp2": "Power consumed by direct streaming usually depends on the audio profile. Only the video stream is lossless.",
     "DirectStreaming": "Direct streaming",
-    "EnablePlugin": "Enable Plugin",
-    "DisablePlugin": "Disable Plugin",
+    "EnablePlugin": "Enable",
+    "DisablePlugin": "Disable",
     "Disc": "Disc",
     "Disconnect": "Disconnect",
     "Display": "Display",