From 383845f0ae3c43bf3c039021e6b455a05c7dea8f Mon Sep 17 00:00:00 2001 From: brian teeman Date: Sat, 4 Jul 2020 19:45:08 +0100 Subject: [PATCH 1/2] [4.0] Media Action plugins This PR does the following 1. removes unused strings 2. changes labelclass="d-none" to hiddenLabel in the xml 3. adds missing labels (even if they are not visible) ToDo in a later PR change the radio buttons in rotate to real buttons in a button group. The current code breaks accessibility but thats for another PR --- administrator/language/en-GB/plg_media-action_crop.ini | 1 + administrator/language/en-GB/plg_media-action_resize.ini | 4 ++-- administrator/language/en-GB/plg_media-action_rotate.ini | 4 +--- plugins/media-action/crop/form/crop.xml | 1 + plugins/media-action/resize/form/resize.xml | 8 ++++---- plugins/media-action/rotate/form/rotate.xml | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/administrator/language/en-GB/plg_media-action_crop.ini b/administrator/language/en-GB/plg_media-action_crop.ini index 71cbe7dbebf15..b137848a17323 100644 --- a/administrator/language/en-GB/plg_media-action_crop.ini +++ b/administrator/language/en-GB/plg_media-action_crop.ini @@ -5,6 +5,7 @@ PLG_MEDIA-ACTION_CROP="Media Action - Crop" PLG_MEDIA-ACTION_CROP_LABEL="Crop" +PLG_MEDIA-ACTION_CROP_PARAM_ASPECT="Aspect Ratio" PLG_MEDIA-ACTION_CROP_PARAM_DEFAULT_RATIO="Default aspect ratio" PLG_MEDIA-ACTION_CROP_PARAM_HEIGHT="Height" PLG_MEDIA-ACTION_CROP_PARAM_LANDSCAPE="Landscape" diff --git a/administrator/language/en-GB/plg_media-action_resize.ini b/administrator/language/en-GB/plg_media-action_resize.ini index 9f56d641105f1..11a54830b8fb9 100644 --- a/administrator/language/en-GB/plg_media-action_resize.ini +++ b/administrator/language/en-GB/plg_media-action_resize.ini @@ -6,12 +6,12 @@ PLG_MEDIA-ACTION_RESIZE="Media Action - Resize" PLG_MEDIA-ACTION_RESIZE_BATCH_DESC="Settings for server side actions when images are created." PLG_MEDIA-ACTION_RESIZE_BATCH_LABEL="Batch Settings" -PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_HEIGHT_DESC="The maximum height of an image to resize. When empty, no resizing is performed." PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_HEIGHT_LABEL="Image Max Height" -PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_WIDTH_DESC="The maximum width of an image to resize. When empty, no resizing is performed." PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_WIDTH_LABEL="Image Max Width" PLG_MEDIA-ACTION_RESIZE_LABEL="Resize" PLG_MEDIA-ACTION_RESIZE_PARAM_HEIGHT="Height" +PLG_MEDIA-ACTION_RESIZE_PARAM_HEIGHT_SLIDER="Height Slider" PLG_MEDIA-ACTION_RESIZE_PARAM_WIDTH="Width" +PLG_MEDIA-ACTION_RESIZE_PARAM_WIDTH_SLIDER="Width Slider" PLG_MEDIA-ACTION_RESIZE_QUALITY="Quality" PLG_MEDIA-ACTION_RESIZE_XML_DESCRIPTION="Resize functionality for images." diff --git a/administrator/language/en-GB/plg_media-action_rotate.ini b/administrator/language/en-GB/plg_media-action_rotate.ini index 7e969a1c95678..d8a3cc8a6f733 100644 --- a/administrator/language/en-GB/plg_media-action_rotate.ini +++ b/administrator/language/en-GB/plg_media-action_rotate.ini @@ -6,8 +6,6 @@ PLG_MEDIA-ACTION_ROTATE="Media Action - Rotate" PLG_MEDIA-ACTION_ROTATE_LABEL="Rotate" PLG_MEDIA-ACTION_ROTATE_PARAM_ANGLE="Angle" -PLG_MEDIA-ACTION_ROTATE_PARAM_DIRECTION="Direction" -PLG_MEDIA-ACTION_ROTATE_PARAM_DIRECTION_LEFT="Left" -PLG_MEDIA-ACTION_ROTATE_PARAM_DIRECTION_RIGHT="Right" +PLG_MEDIA-ACTION_ROTATE_PARAM_BUTTONS="Angle Buttons" PLG_MEDIA-ACTION_ROTATE_QUALITY="Quality" PLG_MEDIA-ACTION_ROTATE_XML_DESCRIPTION="Adds rotate functionality for images." diff --git a/plugins/media-action/crop/form/crop.xml b/plugins/media-action/crop/form/crop.xml index 3d12f78fae1bc..f9c92fd50aada 100644 --- a/plugins/media-action/crop/form/crop.xml +++ b/plugins/media-action/crop/form/crop.xml @@ -60,6 +60,7 @@ diff --git a/plugins/media-action/rotate/form/rotate.xml b/plugins/media-action/rotate/form/rotate.xml index 7b3356636711f..0868cdb0c348e 100644 --- a/plugins/media-action/rotate/form/rotate.xml +++ b/plugins/media-action/rotate/form/rotate.xml @@ -30,8 +30,8 @@ From 0a7ea69c62f5270fbe08003f3d2979befd4a77b0 Mon Sep 17 00:00:00 2001 From: brian teeman Date: Sat, 4 Jul 2020 20:42:31 +0100 Subject: [PATCH 2/2] xml --- plugins/media-action/resize/resize.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/media-action/resize/resize.xml b/plugins/media-action/resize/resize.xml index 3bfb4fa2daa65..be2761487aa90 100644 --- a/plugins/media-action/resize/resize.xml +++ b/plugins/media-action/resize/resize.xml @@ -19,7 +19,7 @@ -
@@ -37,7 +36,6 @@ name="batch_height" type="text" label="PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_HEIGHT_LABEL" - descripton="PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_HEIGHT_DESC" addonAfter="px" filter="integer" />