Update keyboard shortcuts dialog & menu item to use 'keyboard' icon

Fixes #11767
wagtail · Mar 17, 2024 · dae51e1 · dae51e1
1 parent 51152eb
commit dae51e1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -18,7 +18,7 @@ Changelog
  * Implement new universal listings design for image listing view (Sage Abdullah)
  * Implement new universal listings design for document listing view (Sage Abdullah)
  * Implement new universal listings design for site and locale listing views (Sage Abdullah)
- * Add simple admin keyboard shortcuts overview dialog, available in the help sub-menu (Karthik Ayangar)
+ * Add simple admin keyboard shortcuts overview dialog, available in the help sub-menu (Karthik Ayangar, Rohit Sharma)
  * Fix: Fix typo in `__str__` for MySQL search index (Jake Howard)
  * Fix: Ensure that unit tests correctly check for migrations in all core Wagtail apps (Matt Westcott)
  * Fix: Correctly handle `date` objects on `human_readable_date` template tag (Jhonatan Lopes)

diff --git a/docs/releases/6.1.md b/docs/releases/6.1.md
@@ -28,7 +28,7 @@ depth: 1
  * Implement new universal listings design for document listing view (Sage Abdullah)
  * Implement new universal listings design for site and locale listing views (Sage Abdullah)
  * Added `AbstractGroupApprovalTask` to simplify [customizing behavior of custom `Task` models](../extending/custom_tasks) (John-Scott Atlakson)
- * Add simple admin keyboard shortcuts overview dialog, available in the help sub-menu (Karthik Ayangar)
+ * Add simple admin keyboard shortcuts overview dialog, available in the help sub-menu (Karthik Ayangar, Rohit Sharma)
 
 
 ### Bug fixes

diff --git a/wagtail/admin/templates/wagtailadmin/shared/keyboard_shortcuts_dialog.html b/wagtail/admin/templates/wagtailadmin/shared/keyboard_shortcuts_dialog.html
@@ -1,5 +1,5 @@
 {% load wagtailadmin_tags i18n %}
-{% dialog icon_name="regex" classname="w-keyboard-shortcuts" id="keyboard-shortcuts-dialog" title=_("Keyboard shortcuts") %}
+{% dialog icon_name="keyboard" classname="w-keyboard-shortcuts" id="keyboard-shortcuts-dialog" title=_("Keyboard shortcuts") %}
     <table class="w-w-full">
         <caption class="w-sr-only">
             {% trans "All keyboard shortcuts" %}

diff --git a/wagtail/admin/wagtail_hooks.py b/wagtail/admin/wagtail_hooks.py
@@ -1007,7 +1007,7 @@ def register_keyboard_shortcuts_menu_item():
 
     return MenuItem(
         _("Shortcuts"),
-        icon_name="regex",
+        icon_name="keyboard",
         order=1200,
         attrs={
             "role": "button",  # Ensure screen readers announce this as a button