From a78fb41186f37749f20ae8c7e366d7aff4cc2679 Mon Sep 17 00:00:00 2001 From: "sven.finner" Date: Fri, 2 Aug 2024 11:01:40 +0200 Subject: [PATCH 1/6] [FEATURE] #103529 - Introduce hotkey for "Save and Close" res: https://github.com/TYPO3-Documentation/Changelog-To-Doc/issues/887 Releases: main --- .../HelpInside/KeyboardCommands/Index.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Documentation/HelpInside/KeyboardCommands/Index.rst b/Documentation/HelpInside/KeyboardCommands/Index.rst index 645a594..3bcc519 100644 --- a/Documentation/HelpInside/KeyboardCommands/Index.rst +++ b/Documentation/HelpInside/KeyboardCommands/Index.rst @@ -23,6 +23,20 @@ the guidelines set out in `WAI-ARIA Authoring Practices 1.1. Date: Sat, 3 Aug 2024 14:04:57 +0200 Subject: [PATCH 2/6] [TASK] Add tips with reference to Keyboard commands in several Content Element Docs. releases: main, 12.4 --- Documentation/ContentElements/Content/Index.rst | 6 ++++++ Documentation/ContentElements/CreatingContent/Index.rst | 6 ++++++ Documentation/ContentElements/EditingContent/Index.rst | 6 ++++++ Documentation/ContentElements/Images/Index.rst | 6 ++++++ Documentation/ContentElements/Media/Index.rst | 6 ++++++ Documentation/ContentElements/RichTextEditor/Index.rst | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/Documentation/ContentElements/Content/Index.rst b/Documentation/ContentElements/Content/Index.rst index 9112929..e0c6370 100644 --- a/Documentation/ContentElements/Content/Index.rst +++ b/Documentation/ContentElements/Content/Index.rst @@ -65,3 +65,9 @@ Highlighted areas will then show you where you can drop it. You can move a content element from one page to another in the :guilabel:`Web > List` module using cut and paste. Refer to the :ref:`clipboard chapter ` for information about using the clipboard in the :guilabel:`List` module. + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. diff --git a/Documentation/ContentElements/CreatingContent/Index.rst b/Documentation/ContentElements/CreatingContent/Index.rst index e388943..d4357e5 100644 --- a/Documentation/ContentElements/CreatingContent/Index.rst +++ b/Documentation/ContentElements/CreatingContent/Index.rst @@ -143,3 +143,9 @@ Add new content to a page :class: with-shadow The new content element appears in the Page module + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. diff --git a/Documentation/ContentElements/EditingContent/Index.rst b/Documentation/ContentElements/EditingContent/Index.rst index ad9951d..8cb2a25 100644 --- a/Documentation/ContentElements/EditingContent/Index.rst +++ b/Documentation/ContentElements/EditingContent/Index.rst @@ -26,3 +26,9 @@ display different input fields. This action does not delete content. It is saved in the background and will be restored if you select the applicable content element type again. + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. diff --git a/Documentation/ContentElements/Images/Index.rst b/Documentation/ContentElements/Images/Index.rst index b363013..7036b85 100644 --- a/Documentation/ContentElements/Images/Index.rst +++ b/Documentation/ContentElements/Images/Index.rst @@ -91,3 +91,9 @@ Behavior -------- Use the :guilabel:`Enlarge on Click` setting to enable a lightbox display for the image. + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. diff --git a/Documentation/ContentElements/Media/Index.rst b/Documentation/ContentElements/Media/Index.rst index e0a8012..f71916c 100644 --- a/Documentation/ContentElements/Media/Index.rst +++ b/Documentation/ContentElements/Media/Index.rst @@ -44,3 +44,9 @@ start playing as soon as the page loads. You can configure various settings for media files (for example, adding a border, setting page position and behavior) just as you would to :ref:`configure an image`. + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. diff --git a/Documentation/ContentElements/RichTextEditor/Index.rst b/Documentation/ContentElements/RichTextEditor/Index.rst index fd3d46f..577c8a1 100644 --- a/Documentation/ContentElements/RichTextEditor/Index.rst +++ b/Documentation/ContentElements/RichTextEditor/Index.rst @@ -72,3 +72,9 @@ Removing a link To remove a link from text, put your cursor anywhere in the linked text then click the :guilabel:`Unlink` icon on the toolbar. + +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the Backend Editor. From bdbb8f10e6dae215bfb6a60eb3b47ab001bc6f4e Mon Sep 17 00:00:00 2001 From: Sven Finner Date: Sat, 3 Aug 2024 14:16:19 +0200 Subject: [PATCH 3/6] [FIX] Renaming the headline to not irritate users (could think of RTE shortcuts) releases: main --- Documentation/HelpInside/KeyboardCommands/Index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/HelpInside/KeyboardCommands/Index.rst b/Documentation/HelpInside/KeyboardCommands/Index.rst index 3bcc519..90d4ef9 100644 --- a/Documentation/HelpInside/KeyboardCommands/Index.rst +++ b/Documentation/HelpInside/KeyboardCommands/Index.rst @@ -23,7 +23,7 @@ the guidelines set out in `WAI-ARIA Authoring Practices 1.1. Date: Mon, 5 Aug 2024 09:42:29 +0200 Subject: [PATCH 4/6] [FIX] Outsource tip into include File, renaming to backend forms in the tip similar to the headline in Keyboard Commands Page. --- Documentation/ContentElements/Content/Index.rst | 6 +----- Documentation/ContentElements/CreatingContent/Index.rst | 6 +----- Documentation/ContentElements/EditingContent/Index.rst | 6 +----- Documentation/ContentElements/Images/Index.rst | 6 +----- Documentation/ContentElements/Media/Index.rst | 6 +----- Documentation/ContentElements/RichTextEditor/Index.rst | 6 +----- Documentation/ContentElements/TipKeyboardCommands.rst | 5 +++++ 7 files changed, 11 insertions(+), 30 deletions(-) create mode 100644 Documentation/ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/Content/Index.rst b/Documentation/ContentElements/Content/Index.rst index e0c6370..742fab2 100644 --- a/Documentation/ContentElements/Content/Index.rst +++ b/Documentation/ContentElements/Content/Index.rst @@ -66,8 +66,4 @@ Highlighted areas will then show you where you can drop it. You can move a content element from one page to another in the :guilabel:`Web > List` module using cut and paste. Refer to the :ref:`clipboard chapter ` for information about using the clipboard in the :guilabel:`List` module. -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/CreatingContent/Index.rst b/Documentation/ContentElements/CreatingContent/Index.rst index d4357e5..02a755b 100644 --- a/Documentation/ContentElements/CreatingContent/Index.rst +++ b/Documentation/ContentElements/CreatingContent/Index.rst @@ -144,8 +144,4 @@ Add new content to a page The new content element appears in the Page module -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/EditingContent/Index.rst b/Documentation/ContentElements/EditingContent/Index.rst index 8cb2a25..8abd759 100644 --- a/Documentation/ContentElements/EditingContent/Index.rst +++ b/Documentation/ContentElements/EditingContent/Index.rst @@ -27,8 +27,4 @@ display different input fields. This action does not delete content. It is saved in the background and will be restored if you select the applicable content element type again. -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/Images/Index.rst b/Documentation/ContentElements/Images/Index.rst index 7036b85..60a23af 100644 --- a/Documentation/ContentElements/Images/Index.rst +++ b/Documentation/ContentElements/Images/Index.rst @@ -92,8 +92,4 @@ Behavior Use the :guilabel:`Enlarge on Click` setting to enable a lightbox display for the image. -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/Media/Index.rst b/Documentation/ContentElements/Media/Index.rst index f71916c..6874e78 100644 --- a/Documentation/ContentElements/Media/Index.rst +++ b/Documentation/ContentElements/Media/Index.rst @@ -45,8 +45,4 @@ You can configure various settings for media files (for example, adding a border, setting page position and behavior) just as you would to :ref:`configure an image`. -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/RichTextEditor/Index.rst b/Documentation/ContentElements/RichTextEditor/Index.rst index 577c8a1..7f41fc7 100644 --- a/Documentation/ContentElements/RichTextEditor/Index.rst +++ b/Documentation/ContentElements/RichTextEditor/Index.rst @@ -73,8 +73,4 @@ Removing a link To remove a link from text, put your cursor anywhere in the linked text then click the :guilabel:`Unlink` icon on the toolbar. -.. tip:: - - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the Backend Editor. +.. include:: /ContentElements/TipKeyboardCommands.rst diff --git a/Documentation/ContentElements/TipKeyboardCommands.rst b/Documentation/ContentElements/TipKeyboardCommands.rst new file mode 100644 index 0000000..5094905 --- /dev/null +++ b/Documentation/ContentElements/TipKeyboardCommands.rst @@ -0,0 +1,5 @@ +.. tip:: + + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the backend forms. From 5474b944e52fecae5e11f524b3306e19a1ced63e Mon Sep 17 00:00:00 2001 From: Sven Finner Date: Mon, 5 Aug 2024 12:54:33 +0200 Subject: [PATCH 5/6] [FIX] Rename include file due to check fail --- Documentation/ContentElements/Content/Index.rst | 2 +- Documentation/ContentElements/CreatingContent/Index.rst | 2 +- Documentation/ContentElements/EditingContent/Index.rst | 2 +- Documentation/ContentElements/Images/Index.rst | 2 +- Documentation/ContentElements/Media/Index.rst | 2 +- Documentation/ContentElements/RichTextEditor/Index.rst | 2 +- .../{TipKeyboardCommands.rst => TipKeyboardCommands.rst.txt} | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename Documentation/ContentElements/{TipKeyboardCommands.rst => TipKeyboardCommands.rst.txt} (59%) diff --git a/Documentation/ContentElements/Content/Index.rst b/Documentation/ContentElements/Content/Index.rst index 742fab2..2d7fec1 100644 --- a/Documentation/ContentElements/Content/Index.rst +++ b/Documentation/ContentElements/Content/Index.rst @@ -66,4 +66,4 @@ Highlighted areas will then show you where you can drop it. You can move a content element from one page to another in the :guilabel:`Web > List` module using cut and paste. Refer to the :ref:`clipboard chapter ` for information about using the clipboard in the :guilabel:`List` module. -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/CreatingContent/Index.rst b/Documentation/ContentElements/CreatingContent/Index.rst index 02a755b..b50b3e7 100644 --- a/Documentation/ContentElements/CreatingContent/Index.rst +++ b/Documentation/ContentElements/CreatingContent/Index.rst @@ -144,4 +144,4 @@ Add new content to a page The new content element appears in the Page module -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/EditingContent/Index.rst b/Documentation/ContentElements/EditingContent/Index.rst index 8abd759..8c86f6d 100644 --- a/Documentation/ContentElements/EditingContent/Index.rst +++ b/Documentation/ContentElements/EditingContent/Index.rst @@ -27,4 +27,4 @@ display different input fields. This action does not delete content. It is saved in the background and will be restored if you select the applicable content element type again. -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/Images/Index.rst b/Documentation/ContentElements/Images/Index.rst index 60a23af..5cd1b81 100644 --- a/Documentation/ContentElements/Images/Index.rst +++ b/Documentation/ContentElements/Images/Index.rst @@ -92,4 +92,4 @@ Behavior Use the :guilabel:`Enlarge on Click` setting to enable a lightbox display for the image. -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/Media/Index.rst b/Documentation/ContentElements/Media/Index.rst index 6874e78..83e543c 100644 --- a/Documentation/ContentElements/Media/Index.rst +++ b/Documentation/ContentElements/Media/Index.rst @@ -45,4 +45,4 @@ You can configure various settings for media files (for example, adding a border, setting page position and behavior) just as you would to :ref:`configure an image`. -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/RichTextEditor/Index.rst b/Documentation/ContentElements/RichTextEditor/Index.rst index 7f41fc7..9ac4d4a 100644 --- a/Documentation/ContentElements/RichTextEditor/Index.rst +++ b/Documentation/ContentElements/RichTextEditor/Index.rst @@ -73,4 +73,4 @@ Removing a link To remove a link from text, put your cursor anywhere in the linked text then click the :guilabel:`Unlink` icon on the toolbar. -.. include:: /ContentElements/TipKeyboardCommands.rst +.. include:: /ContentElements/TipKeyboardCommands.rst.txt diff --git a/Documentation/ContentElements/TipKeyboardCommands.rst b/Documentation/ContentElements/TipKeyboardCommands.rst.txt similarity index 59% rename from Documentation/ContentElements/TipKeyboardCommands.rst rename to Documentation/ContentElements/TipKeyboardCommands.rst.txt index 5094905..ca3240c 100644 --- a/Documentation/ContentElements/TipKeyboardCommands.rst +++ b/Documentation/ContentElements/TipKeyboardCommands.rst.txt @@ -1,5 +1,5 @@ .. tip:: If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in + :ref:`keyboard commands ` you can use in the backend forms. From ac5388b1948e7738f368018156b5efd54e14232f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Fr=C3=B6mken?= Date: Mon, 5 Aug 2024 14:44:04 +0200 Subject: [PATCH 6/6] Apply suggestions from code review --- Documentation/ContentElements/TipKeyboardCommands.rst.txt | 8 ++++---- Documentation/HelpInside/KeyboardCommands/Index.rst | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/ContentElements/TipKeyboardCommands.rst.txt b/Documentation/ContentElements/TipKeyboardCommands.rst.txt index ca3240c..c564b66 100644 --- a/Documentation/ContentElements/TipKeyboardCommands.rst.txt +++ b/Documentation/ContentElements/TipKeyboardCommands.rst.txt @@ -1,5 +1,5 @@ -.. tip:: +.. tip:: - If you are more comfortable using shortcuts, there are different kinds of - :ref:`keyboard commands ` you can use in - the backend forms. + If you are more comfortable using shortcuts, there are different kinds of + :ref:`keyboard commands ` you can use in + the backend forms. diff --git a/Documentation/HelpInside/KeyboardCommands/Index.rst b/Documentation/HelpInside/KeyboardCommands/Index.rst index 90d4ef9..8199720 100644 --- a/Documentation/HelpInside/KeyboardCommands/Index.rst +++ b/Documentation/HelpInside/KeyboardCommands/Index.rst @@ -30,13 +30,13 @@ Actions in backend forms .. group-tab:: Windows / Linux - * :kbd:`ctrl` + :kbd:`s` = Save - * :kbd:`ctrl` + :kbd:`shift` + :kbd:`s` = Save and close + * :kbd:`ctrl` + :kbd:`s` = Save + * :kbd:`ctrl` + :kbd:`shift` + :kbd:`s` = Save and close .. group-tab:: macOs - * :kbd:`cmd (⌘)` + :kbd:`s` = Save - * :kbd:`cmd (⌘)` + :kbd:`shift` + :kbd:`s` = Save and close + * :kbd:`cmd (⌘)` + :kbd:`s` = Save + * :kbd:`cmd (⌘)` + :kbd:`shift` + :kbd:`s` = Save and close Editing text in the Rich Text Editor (RTE) ==========================================