Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #408

Merged
merged 49 commits into from
May 8, 2024
Merged

Dev #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2fda259
fix: template settings mobile & tab view issue
mi-prakash Dec 27, 2023
506811d
fix: template settings mobile & tab view issue
mi-prakash Dec 27, 2023
55d73c6
fix: user & password override updated
mi-prakash Mar 28, 2024
39f85ae
menu seperator issue
mi-prakash Apr 16, 2024
9657d6c
feat: time added on coming soon date countdown
mi-prakash Apr 16, 2024
a735ecd
feat: read time added
mi-prakash Apr 16, 2024
038073a
tab fix
mi-prakash Apr 17, 2024
04ca1c5
feat: module position disable feature added on both blog list and det…
mi-prakash Apr 18, 2024
359e967
comment removed
mi-prakash Apr 18, 2024
ba38a3e
area-hiddent removed from header style-1
mi-prakash Apr 22, 2024
6524dce
js code added on index for scroll event
mi-prakash Apr 22, 2024
f2ac41e
featured tag added on blog list
mi-prakash Apr 22, 2024
1ed1ae8
featued tag added on detail view
mi-prakash Apr 22, 2024
803844e
feat: masonry blog view added
mi-prakash Apr 25, 2024
0df4375
Merge pull request #400 from JoomShaper/feature-badge
mi-prakash Apr 26, 2024
4f53f2a
Merge pull request #399 from JoomShaper/hu-255
mi-prakash Apr 26, 2024
dee2954
Merge pull request #398 from JoomShaper/disable-position
mi-prakash Apr 26, 2024
c209080
Merge pull request #397 from JoomShaper/blog-readtime
mi-prakash Apr 26, 2024
b8f7ae4
Merge pull request #395 from JoomShaper/j3-fixes
mi-prakash Apr 26, 2024
115fc0f
Merge pull request #396 from JoomShaper/coming-soon-datetime
mi-prakash Apr 26, 2024
29251c0
feat: sticky position right & left
mi-prakash May 2, 2024
2781caa
feat: container max-width added
mi-prakash May 2, 2024
8369e0d
conflict fix from dev
mi-prakash May 2, 2024
a648083
feat: masonry css fix
mi-prakash May 3, 2024
1204318
updated field to number
mi-prakash May 3, 2024
1df29bd
#391 !important removed from offcancas active menu color
mi-prakash May 3, 2024
045bed3
admin settings top header responsive fix
mi-prakash May 6, 2024
d3e64b0
registration suffix added
mi-prakash May 6, 2024
b7f5d8d
Merge pull request #404 from JoomShaper/joomla-3
mi-prakash May 6, 2024
dfa2e51
Merge pull request #405 from JoomShaper/issue-391
mi-prakash May 6, 2024
f41cfc0
Merge pull request #403 from JoomShaper/max-container-width
mi-prakash May 6, 2024
687b0e1
Merge pull request #402 from JoomShaper/sticky-left-right
mi-prakash May 6, 2024
0f9fd67
comment removed
mi-prakash May 6, 2024
a2918e0
Merge branch 'dev' into masonry-blog
mi-prakash May 6, 2024
15f84ab
Merge pull request #401 from JoomShaper/masonry-blog
mi-prakash May 6, 2024
8fbed92
fix: dynamic property php 8.2 issue fix on masonry bloglist
mi-prakash May 6, 2024
9b1a9d4
blog read time settings enable disable added
mi-prakash May 6, 2024
7014af3
sticky position description added
mi-prakash May 6, 2024
6e19bfd
hu-image-upload-wrapper:not(.loading) height replaced with max-height
mi-prakash May 6, 2024
d97a916
offcanvas overlay opacity changed
mi-prakash May 6, 2024
ff1477f
login passkey style added
mi-prakash May 6, 2024
801bcd0
feedback fixed
mi-prakash May 7, 2024
3da5799
language string updated
mi-prakash May 7, 2024
7f6a274
Merge pull request #406 from JoomShaper/new-updates
mi-prakash May 7, 2024
c12aabf
update: version updated to 2.1.0
mi-prakash May 7, 2024
9c29e72
max-height added on hu-image-upload-wrapper
mi-prakash May 7, 2024
7cf1581
JFromFieldList issue fix, css fix
mi-prakash May 7, 2024
f0affd7
templace settings calendar issue fix
mi-prakash May 7, 2024
65fcffa
Merge pull request #407 from JoomShaper/2.1.0
mi-prakash May 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion administrator/language/en-GB/en-GB.plg_system_helixultimate.ini
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ HELIX_ULTIMATE_LOADER_CIRCLE_TWO="Two Circles"
HELIX_ULTIMATE_LOADER_CLOCK="Clock"
HELIX_ULTIMATE_LOADER_LOGO="Logo"
HELIX_ULTIMATE_ENABLE_BOXED_LAYOUT="Boxed Layout"
HELIX_ULTIMATE_CONTAINER_MAX_WIDTH="Container Max Width (px)"
HELIX_ULTIMATE_CONTAINER_MAX_WIDTH_DESC="Set the max width of the container. (Not applicable for Tablet & Mobile devices)<br><b>If you don't want to set the maximum width, leave the field blank</b>"
HELIX_ULTIMATE_BODY_BACKGROUND_IMAGE="Background Image"
HELIX_ULTIMATE_COPYRIGHT="Copyright"
HELIX_ULTIMATE_GO_TO_TOP="Go to Top"
Expand Down Expand Up @@ -145,6 +147,7 @@ HELIX_ULTIMATE_PAGE_TITLE_HEADING="Heading H1 or H2"
HELIX_ULTIMATE_PAGE_TITLE_HEADING_DESC="Set the page title to be either an &lt;h1&gt; or &lt;h2&gt; element."
HELIX_ULTIMATE_SELECT_OFFCANVAS="Select Off-canvas"
HELIX_ULTIMATE_SELECT_OFFCANVAS_DESC="Select an off-canvas for mobile menu."
HELIX_ULTIMATE_FEATURED="Featured"

;Page Title
HELIX_ULTIMATE_PAGE_TITLE="Page Title"
Expand Down Expand Up @@ -180,6 +183,22 @@ HELIX_ULTIMATE_BLOG_POST_FORMAT_VIDEO_DESCRIPTION="Add YouTube or Vimeo full URL
HELIX_ULTIMATE_IMAGE_LARGE_CROP_QUALITY="Quality"
HELIX_ULTIMATE_IMAGE_LARGE_CROP_QUALITY_DESC="Set image quality for better compressions. Applicable for JPG images only."
HELIX_ULTIMATE_BLOG_DETAILS_REMOVE_CONTAINER="Full-width Layout"
HELIX_ULTIMATE_BLOG_LIST_TYPE="List Type"
HELIX_ULTIMATE_BLOG_LIST_TYPE_DEFAULT="Default"
HELIX_ULTIMATE_BLOG_LIST_TYPE_MASONRY="Masonry"
HELIX_ULTIMATE_BLOG_READ_TIME="Read Time"
HELIX_ULTIMATE_BLOG_READ_TIME_DESC="Display estimated article Read Time in minutes"

HELIX_ULTIMATE_BLOG_LIST_DISABLE_MODULE="Disable Modules"
HELIX_ULTIMATE_BLOG_LIST_DISABLE_MODULE_DESC="This option will disable all modules from the selected field from article list page."
HELIX_ULTIMATE_BLOG_LIST_DISABLE_MODULE_POSITIONS="Disable Positions"
HELIX_ULTIMATE_BLOG_LIST_DISABLE_MODULE_POSITIONS_DESC="Select which module positions you want to disable"
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE="Disable Modules"
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE_DESC="This option will disable all modules from the selected filed from article details page."
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE_POSITIONS="Disable Positions"
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE_POSITIONS_DESC="Select which module positions you want to disable"
HELIX_ULTIMATE_BLOG_MINUTE_READ="minute read"
HELIX_ULTIMATE_BLOG_MINUTES_READ="minutes read"

;Layout
HELIX_ULTIMATE_SECTION_TITLE="Section"
Expand Down Expand Up @@ -348,4 +367,7 @@ COM_FINDER_ADVANCED_TIPS="<p>Entering <strong>this and that</strong> into the se
HELIX_ULTIMATE_HEADER_STICKY_OFFSET="Sticky Offset"
HELIX_ULTIMATE_HEADER_STICKY_OFFSET_DESC="After which scroll offset the header being sticky."
HELIX_ULTIMATE_BLOG_IMAGE_ALT_TEXT="Image Alt Text"
HELIX_ULTIMATE_BLOG_IMAGE_ALT_TEXT_DESCRIPTION="This field isn't required. So, if you leave this field then alt text will get from title."
HELIX_ULTIMATE_BLOG_IMAGE_ALT_TEXT_DESCRIPTION="This field isn't required. So, if you leave this field then alt text will get from title."

HELIX_ULTIMATE_STICKY_POSITION="Position Sticky"
HELIX_ULTIMATE_STICKY_POSITION_DESC="The viewport doesn’t change when the window is scrolled, so a fixed positioned element will stay right/left where it is when the page is scrolled"
6 changes: 3 additions & 3 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ const config = {
srcPath: path.resolve(__dirname),
buildPath: path.resolve(__dirname, './package/'),
qsPath: path.resolve(__dirname, './package/helix_ultimate_quickstart/'),
qsPackageName: 'helixultimate_quickstart_j4_2.0.18.zip',
packageName: 'helixultimate_template_v2.0.18.zip',
pluginPackageName: 'plg_system_helixultimate_v2.0.18.zip',
qsPackageName: 'helixultimate_quickstart_j4_2.1.0.zip',
packageName: 'helixultimate_template_v2.1.0.zip',
pluginPackageName: 'plg_system_helixultimate_v2.1.0.zip',
templateFileExtensions: 'xml, json, php, png, scss, js, ico, svg, jpg, eot, ttf, woff, woff2, otf, css, html',
pluginFileExtensions: function () {
return this.templateFileExtensions + ', ini';
Expand Down
2 changes: 0 additions & 2 deletions language/en-GB/en-GB.tpl_shaper_helixultimate.ini
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,6 @@ HELIX_ULTIMATE_BLOG_SOCIAL_SHARE_LIST_DESC="Add or remove social share button as
HELIX_ULTIMATE_BLOG_SOCIAL_SHARE_FACEBOOK="Facebook"
HELIX_ULTIMATE_BLOG_SOCIAL_SHARE_TWITTER="X (formerly Twitter)"
HELIX_ULTIMATE_BLOG_SOCIAL_SHARE_LINKEDIN="Linkedin"
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE="Disable Modules"
HELIX_ULTIMATE_BLOG_DETAILS_DISABLE_MODULE_DESC="This option will disable all modules from the left or right sidebar from article details page."
HELIX_ULTIMATE_BLOG_DETAILS_READING_TIME_PROGRESS="Reading Time Progress Bar"
HELIX_ULTIMATE_BLOG_DETAILS_READING_TIME_PROGRESS_DESC="Show reading progress bar in blog details page."
HELIX_ULTIMATE_BLOG_DETAILS_READING_TIME_PROGRESS_BG_COLOR="Background Color"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
}

.hu-image-upload-wrapper {
width: 200px;
width: 290px;
display: block;
margin-bottom: 20px;
}

.hu-image-upload-wrapper:not(.loading) {
height: 200px;
max-height: 290px;
background: #f5f5f5;
padding: 5px;
border: 1px solid #e5e5e5;
Expand Down
80 changes: 51 additions & 29 deletions plugins/system/helixultimate/assets/css/admin/helix-ultimate.css
Original file line number Diff line number Diff line change
Expand Up @@ -2144,15 +2144,13 @@ select:focus::-ms-value {
.hu-topbar .topbar-left {
display: flex;
align-items: center;
min-width: 400px;
}

.hu-topbar .topbar-middle {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
min-width: 400px;
transition: all 0.3s ease;
}

Expand Down Expand Up @@ -2209,7 +2207,6 @@ select:focus::-ms-value {
max-width: 450px;
border-left: 1px solid #f1f1f1;
margin-right: 20px;
min-width: 400px;
}

.hu-topbar .topbar-right .hu-btn:not(:last-child) {
Expand Down Expand Up @@ -2242,32 +2239,6 @@ select:focus::-ms-value {
fill: rgb(var(--primary));
}

@media (max-width: 576px) {
.hu-topbar .topbar-middle {
display: none;
}
.hu-topbar .topbar-right .helix-topbar-save-text {
display: none;
}

.hu-btn svg {
margin-right: 0 !important;
}

.hu-topbar .topbar-right .helix-topbar-show-preview-text {
display: none;
}
}

@media (max-width: 768px) {
.hu-topbar .topbar-middle {
display: none;
}
.hu-topbar .topbar-right {
border-left: 0;
}
}

.hu-edit-panel {
background: #eff4fb;
width: 420px;
Expand Down Expand Up @@ -3671,3 +3642,54 @@ input[type='color'] {
.hu-no-gutter-bottom .hu-inline-group {
margin-bottom: 0px !important;
}

/* Media css */
@media (max-width: 768px) {
.hu-topbar .topbar-left {
min-width: auto;
}
.hu-topbar .topbar-middle {
display: none;
min-width: auto;
}
.hu-topbar .topbar-right {
border-left: 0;
min-width: auto;
}
}
@media (max-width: 576px) {
.hu-topbar .topbar-left {
min-width: auto;
}
.hu-topbar .topbar-middle {
display: none;
min-width: auto;
}
.hu-topbar .topbar-right {
min-width: auto;
}
.hu-topbar .topbar-right .helix-topbar-save-text {
display: none;
}

.hu-btn svg {
margin-right: 0 !important;
}

.hu-topbar .topbar-right .helix-topbar-show-preview-text {
display: none;
}

#hu-options-panel {
width: 44px;
}
.hu-fieldset-header .hu-option-title {
display: none;
}
.hu-panel-position-left .hu-fieldset-contents {
top: 12%;
right: 0;
width: 100%;
position: fixed;
}
}
49 changes: 32 additions & 17 deletions plugins/system/helixultimate/assets/js/admin/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ jQuery(function ($) {
event.stopPropagation();

$(this).closest('li').find('.hu-column-list').slideToggle(300);
console.log('click fired');
});

/** Close the hu-column-list on select. */
Expand All @@ -32,9 +31,7 @@ jQuery(function ($) {
opacity: 1,
tolerance: 'pointer',
start(_, ui) {
$('.hu-layout-section [data-hu-layout-row]')
.find('.ui-state-highlight')
.addClass($(ui.item).attr('class'));
$('.hu-layout-section [data-hu-layout-row]').find('.ui-state-highlight').addClass($(ui.item).attr('class'));
$('.hu-layout-section [data-hu-layout-row]')
.find('.ui-state-highlight')
.css('height', $(ui.item).outerHeight());
Expand Down Expand Up @@ -82,7 +79,6 @@ jQuery(function ($) {

// setInputValue Callback Function
$.fn.setInputValue = function (options) {
console.log(options);
if (this.attr('type') == 'checkbox') {
if (options.field == '1') {
this.attr('checked', 'checked');
Expand Down Expand Up @@ -124,16 +120,6 @@ jQuery(function ($) {
// color picker initialize
$.fn.initColorPicker = function () {
Joomla.initColorPicker(this.find('.minicolors'));
// this.find('.minicolors').each(function () {
// $(this).minicolors({
// control: 'hue',
// position: 'bottom',
// theme: 'bootstrap',
// keywords: 'transparent, initial, inherit',
// letterCase: 'uppercase',
// opacity: true,
// });
// });
};

// Open Row settings Modal
Expand Down Expand Up @@ -213,17 +199,46 @@ jQuery(function ($) {

$clone = $('.hu-options-modal-inner').html($clone.removeAttr('id').addClass('hu-options-modal-content'));

var removeSticky = true;

$clone.find('.hu-input').each(function () {
var $that = $(this),
attrName = $that.data('attrname'),
attrValue = $parent.data($that.data('attrname'));
$that.setInputValue({ field: attrValue });

if ((attrName == 'name' && attrValue == 'right') || (attrName == 'name' && attrValue == 'left')) {
removeSticky = false;
}

if (removeSticky) {
if (attrName == 'sticky_position') {
if ($that.prop('checked')) {
$that.prop('checked', false);
}
$that.closest('.control-group').hide();
}
}
});

$clone.find('select.hu-input').each(function () {
$(this).chosen({ width: '100%' });
});

$clone.initColorPicker();

var $chosenSelect = $('select[data-attrname="name"]').chosen();
// Add change event listener to the Chosen select
$chosenSelect.on('change', function () {
var selectedValue = $(this).val();

if (selectedValue == 'right' || selectedValue == 'left') {
$(this).closest('.control-group').next().show();
} else {
$(this).closest('.control-group').next().hide();
$(this).closest('.control-group').next().find('.hu-input-sticky_position').prop('checked', false);
}
});
});

$('.hu-input-column_type').change(function (event) {
Expand Down Expand Up @@ -425,7 +440,7 @@ jQuery(function ($) {

Joomla.HelixToaster.success(
'Grid pattern updated to <strong>' + newLayout.join('+') + '</strong>',
'Layout Settings'
'Layout Settings',
);
updateLayoutField();
});
Expand Down Expand Up @@ -525,7 +540,7 @@ jQuery(function ($) {

Joomla.HelixToaster.success(
'Grid pattern updated to <strong>' + newLayout.join('+') + '</strong>',
'Layout Settings'
'Layout Settings',
);
updateLayoutField();

Expand Down
Loading