Skip to content

Commit

Permalink
Merge pull request #1669 from TaxoPress/release-v3.8.0
Browse files Browse the repository at this point in the history
Release v3.8.0
  • Loading branch information
ojopaul committed Jun 15, 2023
2 parents 39ced65 + 0a7c756 commit a45829a
Show file tree
Hide file tree
Showing 26 changed files with 5,937 additions and 5,182 deletions.
200 changes: 200 additions & 0 deletions assets/css/admin.css
@@ -1,3 +1,203 @@


/* Start COPIED FROM PP BLOCKS */
.taxopress-menus-wrapper.capabilities-dashboard input {
float: right;
}

.st_wrap .taxopress-dashboard-settings-boxes {
margin-bottom: 20px;
margin-top: 20px;
display: grid;
grid-column-gap: 10px;
grid-row-gap: 10px;
grid-template-columns: repeat(3, 1fr);
}

@media (max-width: 1200px) {
.st_wrap .taxopress-dashboard-settings-boxes {
grid-template-columns: repeat(2, 1fr)
}
}

@media (max-width: 979px) {
.st_wrap .taxopress-dashboard-settings-boxes {
grid-template-columns: repeat(1, 1fr)
}
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box {
position: relative;
padding: 20px 20px 0;
background-color: #fff;
box-shadow: 0 10px 30px 0 rgba(160, 166, 190, 0.08);
border: 1px solid #dcdcdc
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box h3 {
margin: 0 0 1em;
line-height: 1.5em;
padding: 0
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box h3 span {
background: #000;
padding: 2px 5px;
color: #fff;
border-radius: 4px;
font-size: 0.8em
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box h3 span.taxopress-label-beta {
background: #ccc
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-description {
line-height: 1.6em;
padding: 0 0 20px;
height: 150px
}

@media (max-width: 979px) {
.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-description {
height: auto
}
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-control {
background: #fbfbfb;
margin: 0 -20px;
padding: 0 20px;
line-height: 60px;
border-top: 1px solid #dcdcdc;
display: grid;
grid-template-columns: 1fr 3fr;
grid-column-gap: 20px
}

@media (min-width: 980px) {
.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-control {
position: absolute;
bottom: 0;
width: 100%;
box-sizing: border-box
}
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-control .taxopress-switch-button {
float: none;
margin: 0
}

.st_wrap .taxopress-dashboard-settings-boxes .taxopress-dashboard-settings-box .taxopress-dashboard-settings-control .taxopress-switch-button .switch {
margin: 17px 0
}


.taxopress-switch-button {
float: right;
margin-left: 10px;
margin-right: 30px;
line-height: 27px
}

.taxopress-switch-button .switch {
position: relative;
display: inline-block;
width: 46px;
height: 26px;
margin: 10px
}

.taxopress-switch-button .switch input {
display: none
}

.taxopress-switch-button .switch .slider {
position: absolute;
cursor: pointer;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: #ccc;
-webkit-transition: 0.4s;
-moz-transition: 0.4s;
-ms-transition: 0.4s;
-o-transition: 0.4s;
transition: 0.4s;
-webkit-border-radius: 40px;
-moz-border-radius: 40px;
border-radius: 40px;
width: auto
}

.taxopress-switch-button .switch .slider:before {
position: absolute;
content: '';
height: 22px;
width: 22px;
left: 2px;
bottom: 2px;
background-color: #fff;
-webkit-transition: 0.4s;
-moz-transition: 0.4s;
-ms-transition: 0.4s;
-o-transition: 0.4s;
transition: 0.4s;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%
}

.taxopress-switch-button .switch input:checked+.slider {
background-color: #00d084
}

.taxopress-switch-button .switch input:checked+.slider:before {
-webkit-transform: translateX(20px);
-moz-transform: translateX(20px);
-ms-transform: translateX(20px);
-o-transform: translateX(20px);
transform: translateX(20px)
}

.block-item-readonly .taxopress-switch-button .switch {
opacity: 0.3
}


.taxopress-floating-status {
position: fixed;
bottom: 20px;
left: 184px;
background: #2c3338;
padding: 10px 15px;
border-radius: 4px;
margin-bottom: 10px;
transition: all 0.5s ease-out;
box-shadow: 0 0 15px #999;
z-index: 999;
}
@media (max-width: 782px) {
.taxopress-floating-status {
left: 60px;
}
}
.taxopress-floating-status.taxopress-floating-status--success {
color: #00d084;
}
.taxopress-floating-status.taxopress-floating-status--error {
color: #d63638;
}

.taxopress-hide-menu-item {
display:none !important
}

/* end COPIED FROM PP BLOCKS */


body.taxopress_page_st_terms tr.inline-edit-row td {
padding-left: 20px !important;
}
Expand Down
60 changes: 59 additions & 1 deletion assets/js/admin.js
Expand Up @@ -7,7 +7,6 @@
*/

$(document).ready(function () {



// -------------------------------------------------------------
Expand Down Expand Up @@ -799,6 +798,65 @@
return str === null || str.match(/^ *$/) !== null;
}

/* Start COPIED FROM PP BLOCKS */
$(".taxopress-dashboard-settings-control .slider").bind("click", function (e) {
try {
e.preventDefault();
if ($(this).hasClass("slider--disabled")) {
return false;
}
var checkbox = $(this).parent().find("input");
var isChecked = checkbox.is(":checked") ? 1 : 0;
var newState = isChecked == 1 ? 0 : 1;
var feature = checkbox.data("feature");
var option_key = checkbox.data("option_key");
var slider = checkbox.parent().find(".slider");
$.ajax({
url: st_admin_localize.ajaxurl,
method: "POST",
data: { action: "save_taxopress_dashboard_feature_by_ajax", feature: option_key, new_state: newState, nonce: st_admin_localize.check_nonce },
beforeSend: function () {
slider.css("opacity", 0.5);
},
success: function () {
newState == 1 ? checkbox.prop("checked", true) : checkbox.prop("checked", false);
slider.css("opacity", 1);
taxopressDynamicSubmenu(feature, newState)
taxopressTimerStatus();
},
error: function (jqXHR, textStatus, errorThrown) {
console.error(jqXHR.responseText);
taxopressTimerStatus("error");
},
});
} catch (e) {
console.error(e);
}
});
function taxopressTimerStatus(type = "success") {
setTimeout(function () {
var uniqueClass = "taxopress-floating-msg-" + Math.round(new Date().getTime() + Math.random() * 100);
var message = type === "success" ? wp.i18n.__("Changes saved!", "capsman-enhanced") : wp.i18n.__(" Error: changes can't be saved.", "capsman-enhanced");
var instances = $(".taxopress-floating-status").length;
$("#wpbody-content").after('<span class="taxopress-floating-status taxopress-floating-status--' + type + " " + uniqueClass + '">' + message + "</span>");
$("." + uniqueClass)
.css("bottom", instances * 45)
.fadeIn(1e3)
.delay(1e4)
.fadeOut(1e3, function () {
$(this).remove();
});
}, 500);
}
function taxopressDynamicSubmenu(slug, newState) {
var pMenu = $("#toplevel_page_st_options");
var cSubmenu = $(pMenu).find("li." + slug + "-menu-item");
if (cSubmenu.length) {
newState == 1 ? cSubmenu.removeClass("taxopress-hide-menu-item").find("a").removeClass("taxopress-hide-menu-item") : cSubmenu.addClass("taxopress-hide-menu-item").find("a").addClass("taxopress-hide-menu-item");
}
}
/* end COPIED FROM PP BLOCKS */

});

})(jQuery);
80 changes: 43 additions & 37 deletions blocks/src/related-posts.js
@@ -1,48 +1,54 @@
(function (wp) {
var el = wp.element.createElement,
registerBlockType = wp.blocks.registerBlockType,
ServerSideRender = wp.components.ServerSideRender,
TextControl = wp.components.TextControl,
SelectControl = wp.components.SelectControl,
InspectorControls = wp.editor.InspectorControls
registerBlockType = wp.blocks.registerBlockType,
ServerSideRender = wp.serverSideRender,
TextControl = wp.components.TextControl,
SelectControl = wp.components.SelectControl,
InspectorControls = wp.editor.InspectorControls,
withSelect = wp.data.withSelect;

registerBlockType('taxopress/related-posts', {
title: ST_RELATED_POST.panel_title,
icon: 'tag',
category: 'widgets',
edit: function(props) {
props.setAttributes({post_id: wp.data.select('core/editor').getCurrentPostId()})
var RelatedPostsEdit = withSelect(function (select, props) {
var currentPostId = select('core/editor').getCurrentPostId();

return {
post_id: currentPostId,
};
})(function (props) {
return [
el(ServerSideRender, {
key: 'serverSideRender',
block: 'taxopress/related-posts',
attributes: props.attributes,
}),
el(InspectorControls, {},
el(SelectControl,
{
id: 'stb-related-post-select',
className: 'stb-block-related-post',
label: ST_RELATED_POST.select_label,
help: ST_RELATED_POST.select_desc,
options: ST_RELATED_POST.options,
onChange: (value) => {
props.setAttributes({relatedpost_id: value}),
props.setAttributes({post_id: wp.data.select('core/editor').getCurrentPostId()})
},
value: props.attributes.relatedpost_id
}
),
el(
InspectorControls,
{ key: 'inspectorControls' },
el(SelectControl, {
id: 'stb-related-post-select',
className: 'stb-block-related-post',
label: ST_RELATED_POST.select_label,
help: ST_RELATED_POST.select_desc,
options: ST_RELATED_POST.options,
onChange: function (value) {
props.setAttributes({
relatedpost_id: value,
post_id: props.post_id,
});
},
value: props.attributes.relatedpost_id,
})
),
];
});

registerBlockType('taxopress/related-posts', {
title: ST_RELATED_POST.panel_title,
icon: 'tag',
category: 'widgets',
edit: RelatedPostsEdit,

]
},

save: function() {
return null
},
})

} )(
window.wp
);
save: function () {
return null;
},
});
})(window.wp);

0 comments on commit a45829a

Please sign in to comment.