Merge pull request #269 from Badgerati/develop

v0.7.1

Author: Badgerati

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) [2020-2021] [Matthew Kelly (Badgerati)]
+Copyright (c) [2020-2022] [Matthew Kelly (Badgerati)]
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

docs/release-notes.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## v0.7.1
+
+```plain
+### Bugs
+* #254: Fix the colour of IconOnly buttons in the Light theme
+* #267: Fix icon positioning when used in table headers
+* #268: Fix the hover value of buttons to be the DisplayName
+
+### Packaging
+* #257: Bump highlightjs to 11.4.0
+* #262: Bump monaco-editor to 0.32.1
+* #204: Bump jquery-ui to 1.13.1
+* #198: Bump chart.js to 3.7.1
+```
+
 ## v0.7.0
 
 ```plain

package.json

@@ -6,14 +6,14 @@
   "license": "MIT",
   "dependencies": {
     "jquery": "3.6.0",
-    "jquery-ui-dist": "1.12.1",
+    "jquery-ui-dist": "1.13.1",
     "popper.js": "1.16.1",
     "bootstrap": "4.6.1",
     "bs-stepper": "1.7.0",
     "@mdi/font": "6.5.95",
-    "chart.js": "3.6.2",
-    "@highlightjs/cdn-assets": "11.3.1",
-    "monaco-editor": "0.30.1",
+    "chart.js": "3.7.1",
+    "@highlightjs/cdn-assets": "11.4.0",
+    "monaco-editor": "0.32.1",
     "moment": "2.29.1"
   }
 }

src/Pode.Web.psd1

@@ -11,7 +11,7 @@
     RootModule = 'Pode.Web.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.7.0'
+    ModuleVersion = '0.7.1'
 
     # ID used to uniquely identify this module
     GUID = '5c6cae5a-8e62-48a4-c2e5-7511ffe2d439'
@@ -20,7 +20,7 @@
     Author = 'Matthew Kelly (Badgerati)'
 
     # Copyright statement for this module
-    Copyright = 'Copyright (c) 2020-2021 Matthew Kelly (Badgerati), licensed under the MIT License.'
+    Copyright = 'Copyright (c) 2020-2022 Matthew Kelly (Badgerati), licensed under the MIT License.'
 
     # Description of the functionality provided by this module
     Description = 'Web template framework for the Pode PowerShell web server'

src/Templates/Public/scripts/default.js

@@ -2236,7 +2236,7 @@ function buildTableHeader(column, direction) {
     value += `'>`;
 
     if (column.Icon) {
-        value += `<span class='mdi mdi-${column.Icon.toLowerCase()} mRight02'></span>`;
+        value += `<span class='mdi mdi-${column.Icon.toLowerCase()} mRight04'></span>`;
     }
 
     value += `${column.Name}</th>`;
@@ -3600,12 +3600,12 @@ function buildButton(element) {
     }
 
     if (element.IconOnly) {
-        return `<button type='button' class='btn btn-icon-only pode-button' id='${element.ID}' pode-data-value='${element.DataValue}' title='${element.Name}' data-toggle='tooltip' pode-object='${element.ObjectType}'>${icon}</button>`;
+        return `<button type='button' class='btn btn-icon-only pode-button' id='${element.ID}' pode-data-value='${element.DataValue}' title='${element.DisplayName}' data-toggle='tooltip' pode-object='${element.ObjectType}'>${icon}</button>`;
     }
 
     return `<button type='button' class='btn btn-${element.ColourType} pode-button' id='${element.ID}' pode-data-value='${element.DataValue}' pode-object='${element.ObjectType}'>
         <span class='spinner-border spinner-border-sm' role='status' aria-hidden='true' style='display: none'></span>
-        ${icon}${element.Name}
+        ${icon}${element.DisplayName}
     </button>`;
 }
 

src/Templates/Public/styles/default-light.css

@@ -34,7 +34,11 @@ body, main[role="main"], body#login-page, body#normal-page {
 }
 
 .btn-icon-only {
-    color: #f5f5f5 !important;
+    color: #777 !important;
+}
+
+.btn-icon-only:hover {
+    color: #333 !important;
 }
 
 .card {

src/Templates/Public/styles/default.css

@@ -831,6 +831,10 @@ iframe {
     line-height: 14px;
 }
 
+th .mdi::before {
+    vertical-align: sub;
+}
+
 .btn:not(.btn-icon-only, .btn-no-text, .btn-block) .mdi::before {
     position: relative;
     top: 4px;

src/Templates/Views/elements/button.pode

@@ -16,12 +16,12 @@
 
         if ($data.IconOnly) {
             if ($data.IsDynamic) {
-                "<button type='button' class='btn btn-icon-only pode-button $($data.CssClasses)' style='$($data.CssStyles)' id='$($data.ID)' pode-object='$($data.ObjectType)' pode-data-value='$($data.DataValue)' title='$($data.Name)' data-toggle='tooltip'>
+                "<button type='button' class='btn btn-icon-only pode-button $($data.CssClasses)' style='$($data.CssStyles)' id='$($data.ID)' pode-object='$($data.ObjectType)' pode-data-value='$($data.DataValue)' title='$($data.DisplayName)' data-toggle='tooltip'>
                     $($icon)
                 </button>"
             }
             else {
-                "<a id='$($data.ID)' class='btn btn-icon-only pode-link-button $($data.CssClasses)' style='$($data.CssStyles)' pode-object='$($data.ObjectType)' href='$($data.Url)' target='$($target)' role='button' title='$($data.Name)' data-toggle='tooltip'>
+                "<a id='$($data.ID)' class='btn btn-icon-only pode-link-button $($data.CssClasses)' style='$($data.CssStyles)' pode-object='$($data.ObjectType)' href='$($data.Url)' target='$($target)' role='button' title='$($data.DisplayName)' data-toggle='tooltip'>
                     $($icon)
                 </a>"
             }