diff --git a/css/qsm-admin.css b/css/qsm-admin.css index 07fcf3c47..63a049e03 100644 --- a/css/qsm-admin.css +++ b/css/qsm-admin.css @@ -841,10 +841,6 @@ ul.changelog li.update div.two:before { align-items: stretch; border-bottom: 1px solid #cecece; } -/* .qsm-sub-text-tab-menu { - display: inline-block; - width: 100%; -} */ .save-text-changes { display: flex; flex-direction: row-reverse; @@ -926,8 +922,8 @@ ul.changelog li.update div.two:before { padding: 10px 6px; width: 100%; } -.qsm-sub-text-tab-menu a, .qsm-sub-tab-menu a, +.qsm-sub-text-tab-menu a, .qsm_tab_content a { cursor: pointer; text-decoration: none; @@ -3125,7 +3121,8 @@ input#duplicate_questions { .auto-fold .option-page-result-page-tab-footer { left: 36px; } -.option-page-option-tab-footer, .option-page-result-page-tab-footer, .contact-page-tab-footer { +.option-page-option-tab-footer, .option-page-result-page-tab-footer, +.contact-page-tab-footer { position: fixed; bottom: 0; right: 0; @@ -3152,7 +3149,9 @@ input#duplicate_questions { width: 60%; } @media screen and (min-width: 1900px) { - .option-page-option-tab-footer,.option-page-result-page-tab-footer,.contact-page-tab-footer { + .option-page-option-tab-footer, + .option-page-result-page-tab-footer, + .contact-page-tab-footer { flex-direction: row-reverse; } } @@ -3189,25 +3188,19 @@ input#duplicate_questions { margin: 0 10px 0 0; } @media screen and (min-width: 961px) { - .folded .option-page-result-page-tab-footer { - left: 36px !important; - } - .option-page-result-page-tab-footer { - left: 160px !important; - } - .folded .option-page-option-tab-footer, - .folded .contact-page-tab-footer { + .folded .option-page-result-page-tab-footer, + .folded .contact-page-tab-footer, + .folded .option-page-option-tab-footer { left: 36px !important; } - .option-page-option-tab-footer, - .contact-page-tab-footer { + .option-page-result-page-tab-footer, + .contact-page-tab-footer, + .option-page-option-tab-footer { left: 160px !important; } } @media screen and (max-width: 782px) { - .option-page-result-page-tab-footer { - left: 0 !important; - } + .option-page-result-page-tab-footer, .option-page-option-tab-footer, .contact-page-tab-footer { left: 0 !important; @@ -3470,7 +3463,6 @@ input#preferred-date-format-custom { content: ""; width: calc(100% + 26px); } - /* Extra shortcodes popup */ button.button.qsm-extra-shortcode-popup { display: flex; diff --git a/js/qsm-admin.js b/js/qsm-admin.js index d009935c5..603dbe52d 100644 --- a/js/qsm-admin.js +++ b/js/qsm-admin.js @@ -612,11 +612,6 @@ var QSMAdmin; MicroModal.show('modal-proctor-quiz'); }); - $(document).on('click', '.quiz_style_tab_content #qsm_ultimate_progress_bar', function (e) { - e.preventDefault(); - MicroModal.show('qsm-ultimate-upgrade'); - }); - jQuery(document).on('click', '#btn_export', function (e) { e.preventDefault(); jQuery.ajax({ @@ -790,13 +785,6 @@ jQuery('.quiz_text_tab').click(function (e) { if(current_id == 'qsm_general_text'){ jQuery(".current_general")[0].click();} if(current_id == 'qsm_variable_text'){ jQuery(".current_variable")[0].click();} if(current_id == 'qsm_custom_label'){ jQuery("#postbox-container-1").css("display", "none");} - if(current_id == 'qsm_button_custom_class') { - jQuery("#postbox-container-1").css("display", "none"); - if ( jQuery("#qsm_button_custom_class").find('.left-bar').length == 0 ) { - jQuery(".qsm-text-main-wrap #post-body-content").css("background", "transparent"); - jQuery(".quiz_text_tab_content").css("border", "none"); - } - } jQuery('#' + current_id).show(); jQuery(document).trigger('qsm_quiz_text_tab_after', [current_id]); }); @@ -1400,12 +1388,12 @@ function qsm_is_substring_in_array( text, array ) { } } addTinyMceAutoSuggestion(); - + $( document ).on( 'click', '.qsm-extra-shortcode-popup', function( e ) { e.preventDefault(); MicroModal.show('modal-extra-shortcodes'); } ); - + jQuery(document).on('qsm_after_add_result_block', function(event, conditions, page, redirect, total) { let $matchingElement = $(`#results-page-${total}`); let $button = $matchingElement.parents('.results-page-show').find('.qsm-result-editor-custom-button'); diff --git a/js/qsm-quiz.js b/js/qsm-quiz.js index 89c3611eb..7bc31c3af 100644 --- a/js/qsm-quiz.js +++ b/js/qsm-quiz.js @@ -132,7 +132,7 @@ var qsmTimerInterval = []; // Calculates starting time. var timerTotal = parseFloat(qmn_quiz_data[quizID].timer_limit) * 60; var timerStarted = localStorage.getItem('mlw_started_quiz' + quizID); - var timerConsumed = parseInt(localStorage.getItem('mlw_time_consumed_quiz' + quizID)); + var timerConsumed = parseInt(localStorage.getItem('mlw_time_consumed_quiz' + quizID)) || 1; var timerRemaning = timerTotal - timerConsumed; if ('yes' == timerStarted && 0 < timerRemaning) { seconds = parseInt(timerRemaning); @@ -357,7 +357,7 @@ var qsmTimerInterval = []; // Calculates starting time. let timerStarted = localStorage.getItem('mlw_started_quiz' + quizID); - let timerConsumed = parseInt(localStorage.getItem('mlw_time_consumed_quiz' + quizID)); + var timerConsumed = parseInt(localStorage.getItem('mlw_time_consumed_quiz' + quizID)) || 1; let seconds = parseFloat(qmn_quiz_data[quizID].timer_limit) * 60; let timerRemaning = seconds - timerConsumed; if ('yes' == timerStarted && 0 < timerRemaning) { diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php index 691737e9c..b65eb8b09 100644 --- a/mlw_quizmaster2.php +++ b/mlw_quizmaster2.php @@ -2,7 +2,7 @@ /** * Plugin Name: Quiz And Survey Master * Description: Easily and quickly add quizzes and surveys to your website. - * Version: 9.1.2 + * Version: 9.1.3 * Author: ExpressTech * Author URI: https://quizandsurveymaster.com/ * Plugin URI: https://expresstech.io/ @@ -43,7 +43,7 @@ class MLWQuizMasterNext { * @var string * @since 4.0.0 */ - public $version = '9.1.2'; + public $version = '9.1.3'; /** * QSM Alert Manager Object diff --git a/php/admin/functions.php b/php/admin/functions.php index 2bea60e66..1d8334605 100644 --- a/php/admin/functions.php +++ b/php/admin/functions.php @@ -1656,19 +1656,4 @@ function qsm_advanced_assessment_quiz_page_content() { "addon_link" => qsm_get_plugin_link( 'downloads/advanced-assessment', 'quiz-documentation', 'plugin', 'advanced-assessment', 'qsm_plugin_upsell' ), ); qsm_admin_upgrade_content( $args, 'page' ); -} -function qsm_ultimate_addon_upgrade_content() { - $args = array( - "id" => 'qsm-ultimate-upgrade', - "title" => __( 'QSM Ultimate Addon', 'quiz-master-next' ), - "description" => __( 'Enjoy features like adding "other" options, bulk answer input, question-based progress bars, automatic page navigation, and showing detailed results after collecting contact details. Customize buttons, progress bar placement, and colors schemes and more with QSM Ultimate addon', 'quiz-master-next' ), - "chart_image" => plugins_url( '', dirname( __FILE__ ) ) . '/images/ultimate_upgrade.png', - "warning" => __( 'Missing Feature - QSM Ultimate Add-on required', 'quiz-master-next' ), - "information" => __( 'QSM Addon Bundle is the best way to get all our add-ons at a discount. Upgrade to save 95% today. OR you can buy QSM Ultimate Addon separately.', 'quiz-master-next' ), - "buy_btn_text" => __( 'Buy QSM Ultimate Addon', 'quiz-master-next' ), - "doc_link" => qsm_get_plugin_link( 'docs/add-ons/ultimate', 'quiz-documentation', 'plugin', 'ultimate', 'qsm_plugin_upsell' ), - "upgrade_link" => qsm_get_plugin_link( 'pricing', 'quiz-documentation', 'plugin', 'ultimate', 'qsm_plugin_upsell' ), - "addon_link" => qsm_get_plugin_link( 'downloads/ultimate', 'quiz-documentation', 'plugin', 'ultimate', 'qsm_plugin_upsell' ), - ); - qsm_admin_upgrade_content( $args, 'page' ); } \ No newline at end of file diff --git a/php/admin/options-page-questions-tab.php b/php/admin/options-page-questions-tab.php index bc8458a2e..41b3a0aa3 100644 --- a/php/admin/options-page-questions-tab.php +++ b/php/admin/options-page-questions-tab.php @@ -1144,7 +1144,7 @@ function qsm_bulk_delete_question_from_database() { "DELETE FROM {$wpdb->prefix}mlw_questions WHERE question_id IN (%s)", implode( ', ', $placeholders ) ); - + // Prepare the query $query = $wpdb->prepare( $query, $question_id ); diff --git a/php/admin/options-page-style-tab.php b/php/admin/options-page-style-tab.php index da4e46fd1..9eb3cee99 100644 --- a/php/admin/options-page-style-tab.php +++ b/php/admin/options-page-style-tab.php @@ -65,9 +65,6 @@ function qsm_options_styling_tab_content() {