Merge pull request #1730 from QuizandSurveyMaster/dev

Version 7.3.10
QuizandSurveyMaster · Jan 28, 2022 · 1333cfa · 1333cfa
2 parents 782444d + acd100c
commit 1333cfa
Show file tree

Hide file tree

Showing 15 changed files with 689 additions and 552 deletions.
diff --git a/css/admin-dashboard.css b/css/admin-dashboard.css
@@ -1055,6 +1055,48 @@ h2.hndle.ui-sortable-handle {
 	box-shadow: 0 0 3px rgba(10, 10, 10, 0.2);
 }
 
+.qsm_dashboard_page .welcome-panel-column{
+	display: block;
+}
+
+.qsm_dashboard_page.welcome-panel h2 {
+    margin: 0;
+    font-size: 21px;
+    font-weight: 400;
+	color: #1d2327;
+    line-height: 1.2;
+}
+
+.qsm_dashboard_page.welcome-panel::before{
+	content: none;
+}
+
+.qsm_dashboard_page.postbox {
+    padding: 23px 10px 0;
+}
+
+.qsm_dashboard_page .welcome-panel-content {
+    margin-left: 13px;
+    min-height: auto;
+    display: block;
+}
+
+.qsm_dashboard_page .welcome-panel-column-container {
+    padding: 0 !important;
+    margin: 1.33em 0 0 !important;
+}
+
+.qsm_dashboard_page p.about-description {
+    margin: 0;
+    font-size: 16px;
+    line-height: 1.5;
+    color: #646970;
+}
+
+.qsm_dashboard_page .welcome-panel h3 {
+    margin: 1.33em 0 0;
+}
+
 @media screen and (min-width: 1200px) {
 	#quiz_settings_wrapper tr td fieldset>br {
 		display: none;

diff --git a/js/qsm-admin.js b/js/qsm-admin.js
@@ -2321,6 +2321,7 @@ if (jQuery('body').hasClass('admin_page_mlw_quiz_options')){
                 if (confirm('Are you sure?')) {
                     $(this).parents('.page').remove();
                     $('.save-page-button').trigger('click');
+                    QSMQuestion.countTotal();
                 }
             });
             $(document).on('click', '#answers .delete-answer-button', function (event) {

diff --git a/js/qsm-quiz.js b/js/qsm-quiz.js
@@ -201,7 +201,7 @@ var QSMPageTimer;
 				$(".mlw_answer_number").attr('readonly', true);
 
 				$quizForm.closest('.qmn_quiz_container').addClass('qsm_timer_ended');
-				$quizForm.closest('.qmn_quiz_container').prepend('<p class="qmn_error_message" style="color: red;">Quiz time is over</p>');
+				$quizForm.closest('.qmn_quiz_container').prepend('<p class="qmn_error_message" style="color: red;">' + qmn_ajax_object.quiz_time_over + '</p>');
 				if (qmn_quiz_data[quizID].enable_result_after_timer_end == 1) {
 					$quizForm.closest('.qmn_quiz_container').find('.qsm-submit-btn').trigger('click');
 				} else {

diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
@@ -2,14 +2,14 @@
 /**
  * Plugin Name: Quiz And Survey Master
  * Description: Easily and quickly add quizzes and surveys to your website.
- * Version: 7.3.9
+ * Version: 7.3.10
  * Author: ExpressTech
  * Author URI: https://quizandsurveymaster.com/
  * Plugin URI: https://expresstech.io/
  * Text Domain: quiz-master-next
  *
  * @author QSM Team
- * @version 7.3.9
+ * @version 7.3.10
  * @package QSM
  */
 
@@ -44,7 +44,7 @@ class MLWQuizMasterNext {
 	 * @var string
 	 * @since 4.0.0
 	 */
-	public $version = '7.3.9';
+	public $version = '7.3.10';
 
 	/**
 	 * QSM Alert Manager Object

diff --git a/php/admin/admin-dashboard.php b/php/admin/admin-dashboard.php
@@ -109,7 +109,7 @@ function qsm_generate_dashboard_page() {
 ?>
 <div class="wrap">
 	<h1><?php esc_html_e( 'QSM Dashboard', 'quiz-master-next' ); ?></h1>
-	<div id="welcome_panel" class="postbox welcome-panel <?php qsm_check_close_hidden_box( 'welcome_panel' ); ?>">
+	<div id="welcome_panel" class="qsm_dashboard_page postbox welcome-panel <?php qsm_check_close_hidden_box( 'welcome_panel' ); ?>">
 		<div class="qsm-welcome-panel-close">
 			<img src="<?php echo esc_url( QSM_PLUGIN_URL . '/assets/icon-128x128.png' ); ?>" alt="Welcome Logo">
 			<p class="current_version"><?php echo esc_attr( $mlwQuizMasterNext->version ); ?></p>
@@ -298,7 +298,7 @@ function qsm_wizard_template_quiz_options() {
 			QSM_Fields::generate_field( $field, $single_setting['value'] );
 		}
 	} else {
-		echo esc_html__( 'No settings are found!', 'quiz-master-next' );
+		esc_html_e( 'No settings are found!', 'quiz-master-next' );
 	}
 	echo '=====';
 	if ( $addons ) {
@@ -412,7 +412,7 @@ function qsm_dashboard_recent_taken_quiz( $widget_id ) {
 								$user_name = 'None' === $single_result_arr['name'] ? $actual_user->data->display_name : $single_result_arr['name'];
 								echo '<a href="' . esc_url( $edit_link ) . '">' . esc_html( $user_name ) . '</a>';
 							} else {
-								echo esc_html__( 'Guest', 'quiz-master-next' );
+								esc_html_e( 'Guest', 'quiz-master-next' );
 							}
 							esc_html_e( ' took quiz ', 'quiz-master-next' );
 							echo '<a href="admin.php?page=mlw_quiz_options&quiz_id=' . esc_attr( $single_result_arr['quiz_id'] ) . '">' . esc_html( $single_result_arr['quiz_name'] ) . '</a>';
@@ -620,6 +620,8 @@ function qsm_create_new_quiz_from_wizard() {
 			'require_log_in'                     => isset( $_POST['require_log_in'] ) ? sanitize_text_field( wp_unslash( $_POST['require_log_in'] ) ) : '',
 			'disable_scroll_next_previous_click' => isset( $_POST['disable_scroll_next_previous_click'] ) ? sanitize_text_field( wp_unslash( $_POST['disable_scroll_next_previous_click'] ) ) : '',
 		);
+		$get_saved_value = get_option( 'qsm-quiz-settings' );
+		$quiz_options    = array_replace( $get_saved_value, $quiz_options );
 		$quiz_options    = apply_filters( 'qsm_quiz_wizard_settings_option_save', $quiz_options );
 		$mlwQuizMasterNext->quizCreator->create_quiz( $quiz_name, $theme_id, array( 'quiz_options' => $quiz_options ) );
 	}

diff --git a/php/admin/functions.php b/php/admin/functions.php
@@ -533,46 +533,47 @@ class="button "><?php esc_html_e( 'Set Featured Image', 'quiz-master-next' ); ?>
 							</span>
 						</div>
 						<?php
-						$all_settings            = $mlwQuizMasterNext->quiz_settings->load_setting_fields( 'quiz_options' );
-						$quiz_setting_option     = array(
+						$all_settings = $mlwQuizMasterNext->quiz_settings->load_setting_fields( 'quiz_options' );
+						global $globalQuizsetting;
+						$quiz_setting_option = array(
 							'form_type'              => array(
 								'option_name' => __( 'Form Type', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['form_type'],
 							),
 							'system'                 => array(
 								'option_name' => __( 'Grading System', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['system'],
 							),
 							'pagination'             => array(
 								'option_name' => __( 'Questions Per Page', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['pagination'],
 							),
 							'progress_bar'           => array(
 								'option_name' => __( 'Show Progress Bar', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['progress_bar'],
 							),
 							'timer_limit'            => array(
 								'option_name' => __( 'Time Limit (in Minute)', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['timer_limit'],
 							),
 							'enable_pagination_quiz' => array(
 								'option_name' => __( 'Show current page number', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['enable_pagination_quiz'],
 							),
 							'require_log_in'         => array(
 								'option_name' => __( 'Require User Login', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['require_log_in'],
 							),
 							'disable_scroll_next_previous_click' => array(
 								'option_name' => __( 'Disable scroll on next and previous button click?', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['disable_scroll_next_previous_click'],
 							),
 							'disable_first_page'     => array(
 								'option_name' => __( 'Disable first page on quiz', 'quiz-master-next' ),
-								'value'       => 0,
+								'value'       => $globalQuizsetting['disable_first_page'],
 							),
 						);
-							$quiz_setting_option = apply_filters( 'qsm_quiz_wizard_settings_option', $quiz_setting_option );
+						$quiz_setting_option = apply_filters( 'qsm_quiz_wizard_settings_option', $quiz_setting_option );
 						if ( $quiz_setting_option ) {
 							foreach ( $quiz_setting_option as $key => $single_setting ) {
 								$key              = array_search( $key, array_column( $all_settings, 'id' ), true );