Merge pull request jellyfin#2442 from jellyfin/plugin-tweaks

minor improvements to plugin pages
iwalton3 · Mar 6, 2021 · d149430 · d149430
2 parents 8d01ed5 + 90d48d8
commit d149430
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/controllers/dashboard/plugins/add/index.js b/src/controllers/dashboard/plugins/add/index.js
@@ -22,6 +22,10 @@ function populateHistory(packageInfo, page) {
 function populateVersions(packageInfo, page, installedPlugin) {
     let html = '';
 
+    packageInfo.versions.sort((a, b) => {
+        return b.timestamp < a.timestamp ? -1 : 1;
+    });
+
     for (let i = 0; i < packageInfo.versions.length; i++) {
         const version = packageInfo.versions[i];
         html += '<option value="' + version.version + '">' + globalize.translate('PluginFromRepo', version.version, version.repositoryName) + '</option>';

diff --git 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,15 +159,15 @@ function showPluginMenu(page, elem) {
             menuItems.push({
                 name: globalize.translate('EnablePlugin'),
                 id: 'enable',
-                icon: 'mode_enable'
+                icon: 'check_circle_outline'
             });
         }
 
         if (status === 'Active') {
             menuItems.push({
                 name: globalize.translate('DisablePlugin'),
                 id: 'disable',
-                icon: 'mode_disable'
+                icon: 'do_not_disturb'
             });
         }
 

diff --git 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
@@ -180,8 +180,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",