From 94b873458710b37836886a1e7b4bf191bbebf5ad Mon Sep 17 00:00:00 2001 From: Chandan Deep Date: Mon, 16 Aug 2021 21:46:22 +0530 Subject: [PATCH] v1.3.3 released --- component.php | 8 +- error.php | 3 + html/com_config/config/default.php | 66 ------ html/com_config/config/default_metadata.php | 28 --- html/com_config/config/default_seo.php | 28 --- html/com_config/config/default_site.php | 28 --- html/com_config/modules/default.php | 201 ------------------ html/com_config/modules/default_options.php | 59 ----- html/com_config/modules/default_positions.php | 31 --- html/com_config/templates/default.php | 66 ------ html/com_config/templates/default_options.php | 51 ----- html/com_content/article/default.php | 4 + html/com_content/category/blog.php | 10 +- html/com_content/featured/default.php | 5 + html/layouts/joomla/content/full_image.php | 8 +- html/layouts/joomla/content/info_block.php | 4 +- html/layouts/joomla/content/readmore.php | 2 +- html/mod_login/card_logout.php | 43 ++++ scss/one/_frontend-edit.scss | 136 +++++++++++- scss/one/frontend-edit.scss | 102 --------- templateDetails.xml | 6 +- 21 files changed, 207 insertions(+), 682 deletions(-) delete mode 100644 html/com_config/config/default.php delete mode 100644 html/com_config/config/default_metadata.php delete mode 100644 html/com_config/config/default_seo.php delete mode 100644 html/com_config/config/default_site.php delete mode 100644 html/com_config/modules/default.php delete mode 100644 html/com_config/modules/default_options.php delete mode 100644 html/com_config/modules/default_positions.php delete mode 100644 html/com_config/templates/default.php delete mode 100644 html/com_config/templates/default_options.php create mode 100644 html/mod_login/card_logout.php delete mode 100644 scss/one/frontend-edit.scss diff --git a/component.php b/component.php index bee7205..0d6e452 100644 --- a/component.php +++ b/component.php @@ -65,10 +65,14 @@ if($addtemplatejs){ JHtml::_('script', juri::root().'media/jui/js/bootstrap.min.js', array('version' => 'auto', 'relative' => true)); - JHtml::_('script', 'isis.js', array('version' => 'auto', 'relative' => true)); + if (ASTROID_JOOMLA_VERSION < 4) { + JHtml::_('script', 'isis.js', array('version' => 'auto', 'relative' => true)); + } } -JHtml::_('stylesheet', 'isis/isis.css', array('version' => 'auto', 'relative' => true)); +if (ASTROID_JOOMLA_VERSION < 4) { + JHtml::_('stylesheet', 'isis/isis.css', array('version' => 'auto', 'relative' => true)); +} // Add html5 shiv JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9')); diff --git a/error.php b/error.php index 2d14e0f..23b615c 100644 --- a/error.php +++ b/error.php @@ -21,6 +21,7 @@ $params = Astroid\Framework::getTemplate()->getParams(); // Astroid Params Astroid\Helper\Head::meta(); // site meta +Astroid\Component\Utility::custom(); // custom code Astroid\Helper\Head::scripts(); // site scripts Astroid\Helper\Head::favicon(); // site favicon Astroid\Component\Utility::error(); // error page styling @@ -50,6 +51,8 @@ echo Astroid\Helper\Head::styles(); echo $document->renderLinks(); echo $document->getStylesheets(); + echo $document->getScripts('head'); + echo $document->getCustomTags('head'); ?> diff --git a/html/com_config/config/default.php b/html/com_config/config/default.php deleted file mode 100644 index 2154e95..0000000 --- a/html/com_config/config/default.php +++ /dev/null @@ -1,66 +0,0 @@ -addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('application-form'))) { - Joomla.submitform(task, document.getElementById('application-form')); - } - } -"); -?> - -
- -
- - - - -
- -
-
- loadTemplate('site'); ?> - loadTemplate('metadata'); ?> - loadTemplate('seo'); ?> -
-
- - - - - -
- -
diff --git a/html/com_config/config/default_metadata.php b/html/com_config/config/default_metadata.php deleted file mode 100644 index 6521b01..0000000 --- a/html/com_config/config/default_metadata.php +++ /dev/null @@ -1,28 +0,0 @@ - -
- - form->getFieldset('metadata') as $field) : - ?> -
-
label; ?>
-
input; ?>
-
- -
\ No newline at end of file diff --git a/html/com_config/config/default_seo.php b/html/com_config/config/default_seo.php deleted file mode 100644 index b4e7290..0000000 --- a/html/com_config/config/default_seo.php +++ /dev/null @@ -1,28 +0,0 @@ - -
- - form->getFieldset('seo') as $field) : - ?> -
-
label; ?>
-
input; ?>
-
- -
\ No newline at end of file diff --git a/html/com_config/config/default_site.php b/html/com_config/config/default_site.php deleted file mode 100644 index 3201fbf..0000000 --- a/html/com_config/config/default_site.php +++ /dev/null @@ -1,28 +0,0 @@ - -
- - form->getFieldset('site') as $field) : - ?> -
-
label; ?>
-
input; ?>
-
- -
\ No newline at end of file diff --git a/html/com_config/modules/default.php b/html/com_config/modules/default.php deleted file mode 100644 index 21b04d1..0000000 --- a/html/com_config/modules/default.php +++ /dev/null @@ -1,201 +0,0 @@ -item['module']) || $this->item['module'] === 'custom' || $this->item['module'] === 'mod_custom'; - -// If multi-language site, make language read-only -if (Multilanguage::isEnabled()) { - $this->form->setFieldAttribute('language', 'readonly', 'true'); -} - -Factory::getDocument()->addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task == 'config.cancel.modules' || document.formvalidator.isValid(document.getElementById('modules-form'))) - { - Joomla.submitform(task, document.getElementById('modules-form')); - } - } -"); -?> - -
- -
- - -
- - - -
- - - -
- - item['title']; ?> -    - - item['module']; ?> -
-
- -
-
-
-
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
-
-
- form->getLabel('showtitle'); ?> -
-
- form->getInput('showtitle'); ?> -
-
-
-
- form->getLabel('position'); ?> -
-
- loadTemplate('positions'); ?> -
-
- -
- - authorise('core.edit.state', 'com_modules.module.' . $this->item['id'])) : ?> -
-
- form->getLabel('published'); ?> -
-
- form->getInput('published'); ?> -
-
- - -
-
- form->getLabel('publish_up'); ?> -
-
- form->getInput('publish_up'); ?> -
-
-
-
- form->getLabel('publish_down'); ?> -
-
- form->getInput('publish_down'); ?> -
-
- -
-
- form->getLabel('access'); ?> -
-
- form->getInput('access'); ?> -
-
-
-
- form->getLabel('ordering'); ?> -
-
- form->getInput('ordering'); ?> -
-
- -
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
-
-
-
- form->getLabel('note'); ?> -
-
- form->getInput('note'); ?> -
-
- -
- -
- loadTemplate('options'); ?> -
- - -
- form->getInput('content'); ?> -
- -
-
- - - - - - -
- -
- -
- -
\ No newline at end of file diff --git a/html/com_config/modules/default_options.php b/html/com_config/modules/default_options.php deleted file mode 100644 index c5e8c50..0000000 --- a/html/com_config/modules/default_options.php +++ /dev/null @@ -1,59 +0,0 @@ -form->getFieldsets('params'); - -echo HTMLHelper::_('bootstrap.startAccordion', 'collapseTypes'); -$i = 0; - -foreach ($fieldSets as $name => $fieldSet) : - - $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MODULES_' . $name . '_FIELDSET_LABEL'; - $class = isset($fieldSet->class) && !empty($fieldSet->class) ? $fieldSet->class : ''; - - - if (isset($fieldSet->description) && trim($fieldSet->description)) : - echo '

' . $this->escape(Text::_($fieldSet->description)) . '

'; - endif; -?> - - - - - - - \ No newline at end of file diff --git a/html/com_config/modules/default_positions.php b/html/com_config/modules/default_positions.php deleted file mode 100644 index 90d38b0..0000000 --- a/html/com_config/modules/default_positions.php +++ /dev/null @@ -1,31 +0,0 @@ -model->getPositions(); - -// Add custom position to options -$customGroupText = Text::_('COM_MODULES_CUSTOM_POSITION'); - -// Build field -$attr = array( - 'id' => 'jform_position', - 'list.select' => $this->item['position'], - 'list.attr' => 'class="chzn-custom-value" ' - . 'data-custom_group_text="' . $customGroupText . '" ' - . 'data-no_results_text="' . Text::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" ' - . 'data-placeholder="' . Text::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" ' -); - -echo HTMLHelper::_('select.groupedlist', $positions, 'jform[position]', $attr); diff --git a/html/com_config/templates/default.php b/html/com_config/templates/default.php deleted file mode 100644 index a286af4..0000000 --- a/html/com_config/templates/default.php +++ /dev/null @@ -1,66 +0,0 @@ -addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('templates-form'))) - { - Joomla.submitform(task, document.getElementById('templates-form')); - } - } -"); -?> - -
- -
- - - - -
- -
-
- loadTemplate('options'); ?> -
-
- - - - - -
- -
\ No newline at end of file diff --git a/html/com_config/templates/default_options.php b/html/com_config/templates/default_options.php deleted file mode 100644 index c06d5a1..0000000 --- a/html/com_config/templates/default_options.php +++ /dev/null @@ -1,51 +0,0 @@ - -form->getFieldsets('params'); -?> - - - - - -
- form->renderFieldset('com_config'); ?> -
- - $fieldSet) : - $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CONFIG_' . $name . '_FIELDSET_LABEL'; - - if (isset($fieldSet->description) && trim($fieldSet->description)) : - echo '

' . $this->escape(Text::_($fieldSet->description)) . '

'; - endif; - ?> - -
- form->renderFieldset($name); ?> -
-item); diff --git a/html/com_content/category/blog.php b/html/com_content/category/blog.php index ce5e9c4..fed527e 100644 --- a/html/com_content/category/blog.php +++ b/html/com_content/category/blog.php @@ -13,6 +13,10 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Layout\FileLayout; +if (ASTROID_JOOMLA_VERSION < 4) { + JHtml::_('behavior.caption'); +} + $app = Factory::getApplication(); $this->category->text = $this->category->description; @@ -72,7 +76,7 @@ lead_items)) : ?>
lead_items as &$item) : ?> -
+
intro_items)); $counter = 0; - $columns = ASTROID_JOOMLA_VERSION > 3 ? 1 : $this->columns; + $columns = ASTROID_JOOMLA_VERSION > 3 ? $this->params->get('num_columns', 1) : $this->columns; ?> intro_items)) : ?> @@ -101,7 +105,7 @@
-
+
diff --git a/html/layouts/joomla/content/full_image.php b/html/layouts/joomla/content/full_image.php index 985cfa9..4ea870f 100644 --- a/html/layouts/joomla/content/full_image.php +++ b/html/layouts/joomla/content/full_image.php @@ -21,9 +21,13 @@ image_fulltext) && !empty($images->image_fulltext))) { ?> float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?> -
image_fulltext_caption): echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"'; endif; ?> - src="" alt="image_fulltext_alt); ?>" itemprop="image" class="img-fluid"/>
+ src="" alt="image_fulltext_alt); ?>" itemprop="image" class="img-fluid"/> + 3 && $images->image_fulltext_caption !== '') : ?> +
image_fulltext_caption, ENT_COMPAT, 'UTF-8'); ?>
+ + diff --git a/html/layouts/joomla/content/info_block.php b/html/layouts/joomla/content/info_block.php index 298974d..516e64b 100644 --- a/html/layouts/joomla/content/info_block.php +++ b/html/layouts/joomla/content/info_block.php @@ -35,12 +35,12 @@ sublayout('associations', $displayData); ?> + renderReadTime(); ?> + get('show_publish_date')) : ?> sublayout('publish_date', $displayData); ?> - renderReadTime(); ?> - get('show_readmore_title', 0) == 0) : ?>
+ +
+ + + + + +
+
\ No newline at end of file diff --git a/scss/one/_frontend-edit.scss b/scss/one/_frontend-edit.scss index d6660d6..b5d6d05 100644 --- a/scss/one/_frontend-edit.scss +++ b/scss/one/_frontend-edit.scss @@ -1,10 +1,15 @@ #adminForm { + [class^="icon-"], [class*=" icon-"] { height: auto; width: auto; line-height: 1; } + + fieldset { + margin-bottom: 20px + } .controls { @@ -48,6 +53,7 @@ +label { @extend .form-check-label; margin-right: 10px; + color: #495057; } } @@ -62,14 +68,6 @@ @extend .form-group } - .btn { - - [class^="icon-"], - [class*=" icon-"] { - margin-right: 10px; - } - } - .btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) { @extend .btn-outline-secondary; } @@ -99,4 +97,124 @@ width: auto; } } -} \ No newline at end of file +} + +.choices__button_joomla { + position: relative; + padding: 0 10px; + color: inherit; + text-indent: -9999px; + cursor: pointer; + background: none; + border: 0; + opacity: .5; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; +} + +.choices__button_joomla:before { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + display: block; + text-align: center; + text-indent: 0; + content: "×"; +} + +.sr-only, +.visually-hidden, +.visually-hidden-focusable:not(:focus):not(:focus-within) { + position: absolute !important; + width: 1px !important; + height: 1px !important; + padding: 0 !important; + margin: -1px !important; + overflow: hidden !important; + clip: rect(0, 0, 0, 0) !important; + white-space: nowrap !important; + border: 0 !important +} + + +element.style { +} +.options-form, .options-form>legend { + color: #495057; + background-color: #fff; +} +.options-form { + width: 100%; + padding: 1vw 2vw; + margin-bottom: 1rem; + border: 1px solid #b2bfcd; +} + +.options-form>legend { + float: none; + width: auto; + padding: 0 .5rem; + font-weight: 700; +} + +.float-end { + float: right !important +} + +.hidden { + display: none; + visibility: hidden; +} + +.field-media-wrapper { + display: block; + width: 100%; + max-width: calc(50vw - 5rem); +} + +.field-media-wrapper .field-media-preview { + width: 100%; + max-width: none; +} + +.btn-close { + box-sizing: content-box; + width: 1em; + height: 1em; + padding: .25em; + color: #000; + background: transparent url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/%3E%3C/svg%3E") 50%/1em auto no-repeat; + border: 0; + border-radius: .25rem; + opacity: .5 +} + +.btn-close:hover { + color: #000; + text-decoration: none; + opacity: .75 +} + +.btn-close:focus { + outline: 0; + box-shadow: 0 0 0 .25rem rgba(var(--cassiopeia-color-primary), .25); + opacity: 1 +} + +.btn-close.disabled, +.btn-close:disabled { + pointer-events: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + opacity: .25 +} + +.btn-close-white { + -webkit-filter: invert(1) grayscale(100%) brightness(200%); + filter: invert(1) grayscale(100%) brightness(200%) +} diff --git a/scss/one/frontend-edit.scss b/scss/one/frontend-edit.scss deleted file mode 100644 index d6660d6..0000000 --- a/scss/one/frontend-edit.scss +++ /dev/null @@ -1,102 +0,0 @@ -#adminForm { - [class^="icon-"], - [class*=" icon-"] { - height: auto; - width: auto; - line-height: 1; - } - - .controls { - - >textarea, - >select, - >input[type="text"], - >input[type="password"], - >input[type="datetime"], - >input[type="datetime-local"], - >input[type="date"], - >input[type="month"], - >input[type="time"], - >input[type="week"], - >input[type="number"], - >input[type="email"], - >input[type="url"], - >input[type="search"], - >input[type="tel"], - >input[type="color"], - >.uneditable-input { - @extend .form-control; - } - - .field-calendar { - input[type="text"] { - @extend .form-control; - } - } - - .field-media-input { - @extend .form-control; - } - } - - input[type="checkbox"], - input[type="radio"] { - @extend .form-check; - margin-right: 5px; - display: inline-block; - - +label { - @extend .form-check-label; - margin-right: 10px; - } - } - - input[type="date"], - input[type="time"], - input[type="datetime-local"], - input[type="month"] { - appearance: none; - } - - .controls { - @extend .form-group - } - - .btn { - - [class^="icon-"], - [class*=" icon-"] { - margin-right: 10px; - } - } - - .btn:not(.btn-primary):not(.btn-secondary):not(.btn-success):not(.btn-danger) { - @extend .btn-outline-secondary; - } - - .btn-toolbar { - .btn-group:not(:last-child) { - margin-right: 10px; - } - } -} - -.layout-edit { - .tip-wrap { - box-shadow: 2px 2px 9px rgb(0 0 0 / 6%); - border: 1px solid #fdfdfd; - padding: 10px; - background-color: #fff; - } - - .input-prepend.input-append { - display: flex; - justify-content: center; - align-items: center; - gap: 10px; - - .btn { - width: auto; - } - } -} \ No newline at end of file diff --git a/templateDetails.xml b/templateDetails.xml index 43c4bdb..f307fb6 100644 --- a/templateDetails.xml +++ b/templateDetails.xml @@ -1,13 +1,13 @@ astroid_template_one - Oct 2020 + Aug 2021 JoomDev info@joomdev.com https://www.joomdev.com - Copyright (C) 2019 Joomdev, Inc. All rights reserved. + Copyright (C) 2021 Joomdev, Inc. All rights reserved. GNU General Public License bn 2 or later; see LICENSE.txt - 1.3.2 + 1.3.3 TPL_ASTROID_XML_DESCRIPTION https://cdn.joomdev.com/updates/astroid_template_one.xml