Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Commit

Permalink
v1.2.14
Browse files Browse the repository at this point in the history
  • Loading branch information
AlekVolsk committed Apr 15, 2020
1 parent 7788028 commit b7570a4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[![Documentation](https://img.shields.io/badge/-documentation-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/documentation)
[![Suppurt](https://img.shields.io/badge/-support-28A5F5.svg?style=for-the-badge)](https://master3.alekvolsk.info/support)

![Last Update](https://img.shields.io/badge/last_update-2020.40.11-28A5F5.svg?style=for-the-badge)
![Version](https://img.shields.io/badge/version-1.2.13-28A5F5.svg?style=for-the-badge)
![Last Update](https://img.shields.io/badge/last_update-2020.04.15-28A5F5.svg?style=for-the-badge)
![Version](https://img.shields.io/badge/version-1.2.14-28A5F5.svg?style=for-the-badge)
![UIkit](https://img.shields.io/badge/UIkit-3.4.0-1e87f0.svg?style=for-the-badge)

![Joomla](https://img.shields.io/badge/joomla-3.9+-1A3867.svg?style=for-the-badge)
Expand Down
7 changes: 4 additions & 3 deletions html/layouts/joomla/content/full_image.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@

if (isset($images->image_fulltext) && !empty($images->image_fulltext)) {
$imgfloat = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext;
$alt = $images->image_fulltext_alt ?: $displayData->title;
?>
<div class="uk-align-<?php echo htmlspecialchars($imgfloat); ?> item-image">
<div class="uk-align-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
<img <?php if ($images->image_fulltext_caption) {
echo 'class="caption" title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
} ?> src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>" itemprop="image"/>
echo 'class="caption" title="' . htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8') . '"';
} ?> src="<?php echo htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="image"/>
</div>
<?php
}
5 changes: 3 additions & 2 deletions html/layouts/joomla/content/intro_image.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@

if (isset($images->image_intro) && !empty($images->image_intro)) {
$imgfloat = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro;
$alt = $images->image_intro_alt ?: $displayData->title;
?>
<div class="uk-align-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image">
<?php if ($params->get('link_titles') && $params->get('access-view')) { ?>
<a href="<?php echo Route::_(ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language)); ?>">
<img <?php if ($images->image_intro_caption) {
echo 'class="caption" title="' . htmlspecialchars($images->image_intro_caption) . '"';
} ?> src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/></a>
} ?> src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/></a>
<?php } else { ?>
<img <?php if ($images->image_intro_caption) {
echo 'class="caption" title="' . htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8') . '"';
} ?> src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/>
} ?> src="<?php echo htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8'); ?>" alt="<?php echo htmlspecialchars($alt, ENT_COMPAT, 'UTF-8'); ?>" itemprop="thumbnailUrl"/>
<?php } ?>
</div>
<?php
Expand Down
4 changes: 2 additions & 2 deletions templateDetails.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension version="3.9" type="template" client="site" method="upgrade">
<name>Master3</name>
<version>1.2.13</version>
<version>1.2.14</version>
<creationDate>April 2020</creationDate>
<author>Aleksey A. Morozov</author>
<authorEmail>alekvolsk@yandex.ru</authorEmail>
Expand All @@ -11,7 +11,7 @@
<description><![CDATA[
<span style="display:inline-flex;align-items:center;margin:30px 0;color:#1E87F0;text-decoration:none;"><svg height="50" viewBox="0 0 122 141" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M61 0L84.6129 13.6266L61 27.2631L37.3871 13.6266L61 0ZM97.4032 21.0155L73.7805 34.6421L98.3871 48.8492V77.2634L122 63.6368V35.2127L97.4032 21.0155ZM36.3934 99.4005V126.664L61 140.871L84.6129 127.244L36.3934 99.4005ZM73.7805 106.229C73.7805 106.229 65.0339 101.181 97.3934 119.855H97.4032L122 105.658V78.385L73.7805 106.229ZM0 105.658V48.8689L23.6129 62.5053V119.285L0 105.658Z" fill="#1E87F0"/></svg><span style="margin-left:20px;font-weight:400;"><span style="display:block;font-size:20px;line-height:20px;margin-bottom:10px;"><strong>Master3</strong></span><span style="display:block;font-size:15px;line-height:20px;"><strong>The Joomla! 3 site template based on UIkit 3.</strong></span></span></span>
<span style="display:block;margin-bottom:20px;">
<img src="https://img.shields.io/badge/VERSION-1.2.13-28A5F5.svg?style=for-the-badge" alt="Master3 version" style="margin-right:10px">
<img src="https://img.shields.io/badge/VERSION-1.2.14-28A5F5.svg?style=for-the-badge" alt="Master3 version" style="margin-right:10px">
<a href="https://master3.alekvolsk.info/" target="_blank" style="margin-right:10px"><img src="https://img.shields.io/badge/-official_page-28A5F5.svg?style=for-the-badge" alt="Official page"></a>
<a href="https://master3.alekvolsk.info/documentation" target="_blank" style="margin-right:10px"><img src="https://img.shields.io/badge/-documentation-28A5F5.svg?style=for-the-badge" alt="Documentation"></a>
<a href="https://master3.alekvolsk.info/positions" target="_blank"><img src="https://img.shields.io/badge/-positions-28A5F5.svg?style=for-the-badge" alt="Positions"></a>
Expand Down

0 comments on commit b7570a4

Please sign in to comment.