joomla
/
weblinks
mirror of https://github.com/joomla-extensions/weblinks.git
30
1
Fork 0
Code Issues Releases Activity

Merge pull request #4 from chmst/40-compatible-layouts2 

40 compatible layouts2
This commit is contained in:
Tuan Pham Ngoc 2021-08-10 22:58:55 +07:00 committed by GitHub
parent fcf6986194 6bcda2fa50
commit 0fb8a4be86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 129 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/administrator/components/com_weblinks/forms/weblink.xml
View File

@ -284,14 +284,12 @@
name="image_first"
type="media"
label="COM_WEBLINKS_FIELD_FIRST_LABEL"
description="COM_WEBLINKS_FIELD_FIRST_DESC"
/>
<field
name="float_first"
type="list"
label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
description="COM_WEBLINKS_FLOAT_FIRST_DESC"
useglobal="true"
>
<option value="right">COM_WEBLINKS_RIGHT</option>
@ -303,14 +301,19 @@
name="image_first_alt"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
/>
<field
name="image_first_alt_empty"
type="checkbox"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
/>
<field
name="image_first_caption"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
/>
<field
@ -323,7 +326,6 @@
name="image_second"
type="media"
label="COM_WEBLINKS_FIELD_SECOND_LABEL"
description="COM_WEBLINKS_FIELD_SECOND_DESC"
/>
<field
@ -341,14 +343,19 @@
name="image_second_alt"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_DESC"
/>
<field
name="image_second_alt_empty"
type="checkbox"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
/>
<field
name="image_second_caption"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_CAPTION_DESC"
/>
</fieldset>
</fields>

5
src/administrator/language/en-GB/com_weblinks.ini
View File

@ -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."

88
src/components/com_weblinks/forms/weblink.xml
View File

@ -6,7 +6,6 @@
type="hidden"
label="WEBLINK_ID_LABEL"
readonly="true"
required="true"
default="0"
/>
@ -103,6 +102,93 @@
/>
</fieldset>
<fields
name="images"
>
<fieldset
name="images"
label="JGLOBAL_FIELDSET_IMAGE_OPTIONS"
>
<field
name="image_first"
type="media"
label="COM_WEBLINKS_FIELD_FIRST_LABEL"
/>
<field
name="float_first"
type="list"
label="COM_WEBLINKS_FLOAT_FIRST_LABEL"
useglobal="true"
>
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
<option value="none">COM_WEBLINKS_NONE</option>
</field>
<field
name="image_first_alt"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
/>
<field
name="image_first_alt_empty"
type="checkbox"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
/>
<field
name="image_first_caption"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
/>
<field
name="spacer1"
type="spacer"
hr="true"
/>
<field
name="image_second"
type="media"
label="COM_WEBLINKS_FIELD_SECOND_LABEL"
/>
<field
name="float_second"
type="list"
label="COM_WEBLINKS_FLOAT_SECOND_LABEL"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="right">COM_WEBLINKS_RIGHT</option>
<option value="left">COM_WEBLINKS_LEFT</option>
<option value="none">COM_WEBLINKS_NONE</option>
</field>
<field
name="image_second_alt"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_LABEL"
/>
<field
name="image_second_alt_empty"
type="checkbox"
label="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_LABEL"
description="COM_WEBLINKS_FIELD_IMAGE_ALT_EMPTY_DESC"
/>
<field
name="image_second_caption"
type="text"
label="COM_WEBLINKS_FIELD_IMAGE_CAPTION_LABEL"
/>
</fieldset>
</fields>
<fields name="metadata">
<fieldset
name="jmetadata"

4
src/components/com_weblinks/tmpl/category/default_items.php
View File

@ -80,7 +80,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php endif; ?>
<?php if ($this->params->get('show_link_hits', 1)) : ?>
<span class="list-hits badge badge-info float-end">
<span class="list-hits badge bg-info float-end">
<?php echo Text::sprintf('JGLOBAL_HITS_COUNT', $item->hits); ?>
</span>
<?php endif; ?>
@ -112,7 +112,7 @@ $listDirn = $this->escape($this->state->get('list.direction'));
<?php endif; ?>
<?php if ($item->state == 0) : ?>
<span class="label label-warning"><?php echo Text::_('JUNPUBLISHED'); ?></span>
<span class="badge bg-warning"><?php echo Text::_('JUNPUBLISHED'); ?></span>
<?php endif; ?>
<?php

15
src/components/com_weblinks/tmpl/form/edit.php
View File

@ -58,9 +58,18 @@ $params = $this->state->get('params');
<?php endif; ?>
<?php echo $this->form->renderField('language'); ?>
<?php echo $this->form->renderField('description'); ?>
<hr class="hr-condensed" />
<?php echo $this->form->renderField('image_first', 'images'); ?>
<?php echo $this->form->renderField('float_first', 'images'); ?>
<?php echo $this->form->renderField('image_first_alt', 'images'); ?>
<?php echo $this->form->renderField('float_first_alt_empty', 'images'); ?>
<?php echo $this->form->renderField('image_second', 'images'); ?>
<?php echo $this->form->renderField('float_second', 'images'); ?>
<?php echo $this->form->renderField('image_second_alt', 'images'); ?>
<?php echo $this->form->renderField('float_second_alt_empty', 'images'); ?>
<?php if ($captchaEnabled) : ?>
<div class="btn-group">
<?php echo $this->form->renderField('captcha'); ?>

12
src/language/en-GB/com_weblinks.ini
View File

@ -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"