Merge pull request #2507 from QuizandSurveyMaster/dev-zubair

Dev zubair
QuizandSurveyMaster · Mar 26, 2024 · 3f4044b · 3f4044b
2 parents 8c151ee + b703f43
commit 3f4044b
Show file tree

Hide file tree

Showing 14 changed files with 271 additions and 231 deletions.
diff --git a/blocks/block.php b/blocks/block.php
diff --git a/blocks/build/answer-option/index.asset.php b/blocks/build/answer-option/index.asset.php
@@ -1 +1,4 @@
-<?php return array('dependencies' => array('react', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => '2d3f4bd22446647134b1');
+<?php return array(
+	'dependencies' => array( 'react', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-escape-html', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url' ),
+	'version'      => '2d3f4bd22446647134b1',
+);
diff --git a/blocks/build/index.asset.php b/blocks/build/index.asset.php
@@ -1 +1,4 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices'), 'version' => '9ae62c1e6dbc6a16c846');
+<?php return array(
+	'dependencies' => array( 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-editor', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-notices' ),
+	'version'      => '9ae62c1e6dbc6a16c846',
+);
diff --git a/blocks/build/page/index.asset.php b/blocks/build/page/index.asset.php
@@ -1 +1,4 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => 'b938d315c3e97d3c8ae6');
+<?php return array(
+	'dependencies' => array( 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n' ),
+	'version'      => 'b938d315c3e97d3c8ae6',
+);
diff --git a/blocks/build/question/index.asset.php b/blocks/build/question/index.asset.php
@@ -1 +1,4 @@
-<?php return array('dependencies' => array('wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices'), 'version' => '45906d9cb21e070d8451');
+<?php return array(
+	'dependencies' => array( 'wp-api-fetch', 'wp-blob', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices' ),
+	'version'      => '45906d9cb21e070d8451',
+);
diff --git a/blocks/src/render.php b/blocks/src/render.php
@@ -4,5 +4,5 @@
  */
 ?>
 <p <?php echo get_block_wrapper_attributes(); ?>>
-	<?php esc_html_e( 'QSM Block hello from a dynamic block!', 'main-block' ); ?>
+	<?php esc_html_e( 'QSM Block hello from a dynamic block!', 'quiz-master-next' ); ?>
 </p>
diff --git a/css/qsm-admin.css b/css/qsm-admin.css
@@ -773,6 +773,14 @@ ul.changelog li.update div.two:before {
 #qsm-export-settings-options .select2-container{
 	max-width: 430px;
 }
+.qsm-btn-link-global-settings {
+    line-height: 27px;
+    margin-right: 10px;
+}
+#qsm-export-settings-options .ms-options-wrap>.ms-options>.ms-search input{
+	max-width: 100% !important;
+    border: 1px solid #dcdccfd4;
+}
 .admin_page_mlw_quiz_options .qsm-info-widget {
 	background: #fff;
 	margin: 0 0 20px 0;

diff --git a/js/qsm-admin.js b/js/qsm-admin.js
@@ -86,14 +86,8 @@ var QSMAdmin;
             MicroModal.show('qsm-global-default-popup');
         });
         $(document).on('click', '#qsm-apply-global-settings', function () {
-            console.log($('#qsm-select-quiz-apply').multiselect('getChecked'));
-            let selectedCount = $('#qsm-select-quiz-apply').find('option:selected').length;
-            jQuery("#qsm-quizzes-global-count").text(selectedCount);
             MicroModal.show('qsm-global-apply-default-popup');
         });
-        $(document).on('click', '#qsm-apply-global-default-btn', function () {
-            jQuery('#qsm-apply-global-settings-form').submit();
-        });
 
         $('#qmn_check_all').change(function () {
             $('.qmn_delete_checkbox').prop('checked', jQuery('#qmn_check_all').prop('checked'));
@@ -184,6 +178,7 @@ var QSMAdmin;
         if( jQuery('#qsm-select-quiz-apply').length ) {
             $('#qsm-select-quiz-apply').multiselect({
                 columns: 1,
+                placeholder: qsm_admin_messages.select,
                 search: true,
                 selectAll: true,
                 dropdownAutoWidth: false,

diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
@@ -226,7 +226,7 @@ private function load_dependencies() {
 		include_once 'php/adverts-generate.php';
 		include_once 'php/question-types.php';
 		include_once 'php/default-templates.php';
-		include_once 'php/shortcodes.php';		
+		include_once 'php/shortcodes.php';      
 
 		include_once 'php/classes/class-qmn-alert-manager.php';
 		$this->alertManager = new MlwQmnAlertManager();
@@ -487,6 +487,7 @@ public function qsm_admin_scripts_style( $hook ) {
 			'variables'                  => __("Variables", 'quiz-master-next'),
 			'insert_variable'            => __("Insert QSM variables", 'quiz-master-next'),
 			'select_all'                 => __("Select All", 'quiz-master-next'),
+			'select'                     => __("Select", 'quiz-master-next'),
 		);
 		$qsm_admin_messages = apply_filters( 'qsm_admin_messages_after', $qsm_admin_messages );
 		wp_localize_script( 'qsm_admin_js', 'qsm_admin_messages', $qsm_admin_messages );
@@ -587,7 +588,7 @@ public function register_quiz_post_types() {
 			'show_ui'           => true,
 			'show_admin_column' => true,
 			'show_in_nav_menus' => true,
-			'show_in_rest' 		=> true,
+			'show_in_rest'      => true,
 			'show_tagcloud'     => false,
 			'rewrite'           => false,
 		);

diff --git a/php/admin/functions.php b/php/admin/functions.php
@@ -588,7 +588,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 		global $globalQuizsetting, $mlwQuizMasterNext, $themes_data;
 
 		$quiz_setting_option = array(
-			'form_type'              => array(
+			'form_type'                              => array(
 				'option_name' => __( 'Form Type', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['form_type'],
 				'default'     => 0,
@@ -608,7 +608,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 					),
 				),
 			),
-			'system'                 => array(
+			'system'                                 => array(
 				'option_name' => __( 'Grading System', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['system'],
 				'default'     => 0,
@@ -629,7 +629,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 				),
 				'help'        => __( 'Select the system for grading the quiz.', 'quiz-master-next' ),
 			),
-			'enable_contact_form'    => array(
+			'enable_contact_form'                    => array(
 				'option_name' => __( 'Display a contact form before quiz', 'quiz-master-next' ),
 				'value'       => 0,
 				'type'        => 'radio',
@@ -644,21 +644,21 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 					),
 				),
 			),
-			'timer_limit'            => array(
+			'timer_limit'                            => array(
 				'option_name' => __( 'Time Limit (in Minute)', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['timer_limit'],
 				'type'        => 'number',
 				'default'     => 0,
 				'help'        => __( 'Leave 0 for no time limit', 'quiz-master-next' ),
 			),
-			'pagination'             => array(
+			'pagination'                             => array(
 				'option_name' => __( 'Questions Per Page', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['pagination'],
 				'type'        => 'number',
 				'default'     => 0,
 				'help'        => __( 'Override the default pagination created on questions tab', 'quiz-master-next' ),
 			),
-			'enable_pagination_quiz' => array(
+			'enable_pagination_quiz'                 => array(
 				'option_name' => __( 'Show current page number', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['enable_pagination_quiz'],
 				'options'     => array(
@@ -689,7 +689,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 				),
 				'default'     => 0,
 			),
-			'progress_bar'           => array(
+			'progress_bar'                           => array(
 				'option_name' => __( 'Show progress bar', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['enable_pagination_quiz'],
 				'type'        => 'radio',
@@ -705,7 +705,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 				),
 				'default'     => 0,
 			),
-			'require_log_in'         => array(
+			'require_log_in'                         => array(
 				'option_name' => __( 'Require User Login', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['require_log_in'],
 				'type'        => 'radio',
@@ -722,7 +722,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 				'default'     => 0,
 				'help'        => __( 'Enabling this allows only logged in users to take the quiz', 'quiz-master-next' ),
 			),
-			'disable_first_page'     => array(
+			'disable_first_page'                     => array(
 				'option_name' => __( 'Disable first page on quiz', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['disable_first_page'],
 				'type'        => 'radio',
@@ -738,7 +738,7 @@ function qsm_settings_to_create_quiz( $require_field = false ) {
 				),
 				'default'     => 0,
 			),
-			'comment_section'        => array(
+			'comment_section'                        => array(
 				'option_name' => __( 'Enable Comment box', 'quiz-master-next' ),
 				'value'       => $globalQuizsetting['comment_section'],
 				'type'        => 'radio',