From 45b9e33466fe535056f2cdb6669c2f6d255e0926 Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 10 Aug 2021 15:15:18 +0200 Subject: [PATCH 1/4] fix save in frontend --- src/components/com_weblinks/forms/weblink.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/com_weblinks/forms/weblink.xml b/src/components/com_weblinks/forms/weblink.xml index aae32f6..391cd8f 100644 --- a/src/components/com_weblinks/forms/weblink.xml +++ b/src/components/com_weblinks/forms/weblink.xml @@ -6,7 +6,6 @@ type="hidden" label="WEBLINK_ID_LABEL" readonly="true" - required="true" default="0" /> From eafb0239f5ef80abfe35c8e1424642866c8f95c2 Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 10 Aug 2021 15:25:09 +0200 Subject: [PATCH 2/4] badge background --- src/components/com_weblinks/tmpl/category/default_items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php index ca973b9..53a1ca6 100644 --- a/src/components/com_weblinks/tmpl/category/default_items.php +++ b/src/components/com_weblinks/tmpl/category/default_items.php @@ -80,7 +80,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); params->get('show_link_hits', 1)) : ?> - + hits); ?> @@ -112,7 +112,7 @@ $listDirn = $this->escape($this->state->get('list.direction')); state == 0) : ?> - + Date: Tue, 10 Aug 2021 15:41:50 +0200 Subject: [PATCH 3/4] Add image-alt-empty to images in backend --- .../components/com_weblinks/forms/weblink.xml | 20 +++++++++++++------ .../language/en-GB/com_weblinks.ini | 5 ++--- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/administrator/components/com_weblinks/forms/weblink.xml b/src/administrator/components/com_weblinks/forms/weblink.xml index 1c197f0..2239251 100644 --- a/src/administrator/components/com_weblinks/forms/weblink.xml +++ b/src/administrator/components/com_weblinks/forms/weblink.xml @@ -291,7 +291,6 @@ name="float_first" type="list" label="COM_WEBLINKS_FLOAT_FIRST_LABEL" - description="COM_WEBLINKS_FLOAT_FIRST_DESC" useglobal="true" > @@ -303,14 +302,19 @@ name="image_first_alt" type="text" label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL" - description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC" + /> + + + + diff --git a/src/administrator/language/en-GB/com_weblinks.ini b/src/administrator/language/en-GB/com_weblinks.ini index ce60b93..921db14 100644 --- a/src/administrator/language/en-GB/com_weblinks.ini +++ b/src/administrator/language/en-GB/com_weblinks.ini @@ -49,11 +49,10 @@ COM_WEBLINKS_FIELD_ICON_LABEL="Text/Icon/Web Link Only" COM_WEBLINKS_FIELD_ICON_OPTION_ICON="Icon" COM_WEBLINKS_FIELD_ICON_OPTION_TEXT="Text" COM_WEBLINKS_FIELD_ICON_OPTION_WEBLINK="Web Link Only" -COM_WEBLINKS_FIELD_IMAGE_ALT_DESC="Alternative text used for visitors without access to images. Replaced with caption text if it is present." +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required" +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description" COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text" -COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC="Caption attached to the image." COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption" - COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this web link." COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified." COM_WEBLINKS_FIELD_SECOND_DESC="The second image to be displayed." From 6bcda2fa50731bf92b19241f4b6c5df877d9dde4 Mon Sep 17 00:00:00 2001 From: chmst Date: Tue, 10 Aug 2021 16:05:04 +0200 Subject: [PATCH 4/4] Add images to the frontend edit view --- .../components/com_weblinks/forms/weblink.xml | 1 - src/components/com_weblinks/forms/weblink.xml | 87 +++++++++++++++++++ .../com_weblinks/tmpl/form/edit.php | 15 +++- src/language/en-GB/com_weblinks.ini | 12 +++ 4 files changed, 111 insertions(+), 4 deletions(-) diff --git a/src/administrator/components/com_weblinks/forms/weblink.xml b/src/administrator/components/com_weblinks/forms/weblink.xml index 2239251..4f07580 100644 --- a/src/administrator/components/com_weblinks/forms/weblink.xml +++ b/src/administrator/components/com_weblinks/forms/weblink.xml @@ -284,7 +284,6 @@ name="image_first" type="media" label="COM_WEBLINKS_FIELD_FIRST_LABEL" - description="COM_WEBLINKS_FIELD_FIRST_DESC" /> + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
state->get('params'); form->renderField('language'); ?> form->renderField('description'); ?> - -
- + + form->renderField('image_first', 'images'); ?> + form->renderField('float_first', 'images'); ?> + form->renderField('image_first_alt', 'images'); ?> + form->renderField('float_first_alt_empty', 'images'); ?> + + form->renderField('image_second', 'images'); ?> + form->renderField('float_second', 'images'); ?> + form->renderField('image_second_alt', 'images'); ?> + form->renderField('float_second_alt_empty', 'images'); ?> + +
form->renderField('captcha'); ?> diff --git a/src/language/en-GB/com_weblinks.ini b/src/language/en-GB/com_weblinks.ini index 3843d83..f8550bc 100644 --- a/src/language/en-GB/com_weblinks.ini +++ b/src/language/en-GB/com_weblinks.ini @@ -18,11 +18,23 @@ COM_WEBLINKS_ERROR_WEBLINK_NOT_FOUND="Web Link not found." COM_WEBLINKS_ERROR_WEBLINK_URL_INVALID="Invalid Web link URL." COM_WEBLINKS_FIELD_CATEGORY_DESC="You must select a Category." COM_WEBLINKS_FIELD_DESCRIPTION_DESC="Enter a description for your Web link." +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required" +COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description" +COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL="Alt Text" +COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL="Caption" +COM_WEBLINKS_FIELD_LANGUAGE_DESC="Assign a language to this web link." +COM_WEBLINKS_FIELD_MODIFIED_DESC="The date and time the link was last modified." +COM_WEBLINKS_FIELD_SECOND_DESC="The second image to be displayed." +COM_WEBLINKS_FIELD_SECOND_LABEL="Second Image" COM_WEBLINKS_FILTER_LABEL="Filter Field" COM_WEBLINKS_FILTER_SEARCH_DESC="Web Links filter search" COM_WEBLINKS_FIELD_TITLE_DESC="Your Web Link must have a Title." COM_WEBLINKS_FIELD_URL_DESC="You must enter a URL." COM_WEBLINKS_FIELD_URL_LABEL="URL" +COM_WEBLINKS_FLOAT_FIRST_DESC="Controls placement of the first image." +COM_WEBLINKS_FLOAT_FIRST_LABEL="First Image Float" +COM_WEBLINKS_FLOAT_SECOND_DESC="Controls placement of the second image." +COM_WEBLINKS_FLOAT_SECOND_LABEL="Second Image Float" COM_WEBLINKS_FORM_CREATE_WEBLINK="Submit a Web Link" COM_WEBLINKS_GRID_TITLE="Title" COM_WEBLINKS_LINK="Web Link"