Merge pull request #696 from fpcorso/dev

6.0.0 Release
QuizandSurveyMaster · Jun 21, 2018 · 30eb8f9 · 30eb8f9
2 parents 7118397 + 28db859
commit 30eb8f9
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 541 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+= 5.3.2 (June 7, 2018) =
+* Closed Plugin Compatibility: Conflict with Divi Builder ([Issue #686](https://github.com/fpcorso/quiz_master_next/issues/686))
+
+= 5.3.1 (May 21, 2018) =
+* Closed Enhancement: Add user ID to admin results page table - ([Issue #682](https://github.com/fpcorso/quiz_master_next/issues/682))
+* Closed Enhancement: Integrate with WordPress 4.9.6 GDPR features - ([Issue #681](https://github.com/fpcorso/quiz_master_next/issues/681))
+
+= 5.3.0 (May 16, 2018) =
+* Closed Enhancement: Ability to disable IP address collection - ([Issue #670](https://github.com/fpcorso/quiz_master_next/issues/670))
+* Closed User Request: Ability to customize name of QSM archive name - ([Issue #666](https://github.com/fpcorso/quiz_master_next/issues/666))
+* Closed User Request: Progress Bar - ([Issue #412](https://github.com/fpcorso/quiz_master_next/issues/412))
+* Closed User Request: Disable Results Being Stored In Database - ([Issue #215](https://github.com/fpcorso/quiz_master_next/issues/215))
+* Closed Bug: Question ordering doesn't work when using older pagination option - ([Issue #657](https://github.com/fpcorso/quiz_master_next/issues/657))
+
 = 5.2.4 (May 7, 2018) =
 * Closed Bug: %QUESTIONS_ANSWERS% variable is displaying questions in order of creation - ([Issue #660](https://github.com/fpcorso/quiz_master_next/issues/660))
 * Closed Bug: Extra spacing is being added to questions when multiple lines are in question - ([Issue #659](https://github.com/fpcorso/quiz_master_next/issues/659))

diff --git a/css/qsm-admin.css b/css/qsm-admin.css
@@ -61,10 +61,6 @@ Quizzes/Surveys Page
   color: red !important;
 }
 
-.qsm-dialog-form {
-
-}
-
 .qsm-dialog-form label {
   display: inline-block;
   font-size: 16px;
@@ -257,3 +253,152 @@ Misc.
 .qsm-info-box a {
 	color: yellow;
 }
+
+.qsm-popup {
+	font-family: -apple-system,BlinkMacSystemFont,avenir next,avenir,helvetica neue,helvetica,ubuntu,roboto,noto,segoe ui,arial,sans-serif;
+}
+
+.qsm-popup__overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	background: rgba(0,0,0,0.6);
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	z-index: 9999;
+}
+
+.qsm-popup__container {
+	background-color: #fff;
+	padding: 30px;
+	min-width: 500px;
+	max-width: 700px;
+	max-height: 95vh;
+	border-radius: 4px;
+	overflow-y: auto;
+	box-sizing: border-box;
+}
+
+.qsm-popup__header {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+
+.qsm-popup__title {
+	margin-top: 0;
+	margin-bottom: 0;
+	font-weight: 600;
+	font-size: 1.25rem;
+	line-height: 1.25;
+	color: #00449e;
+	box-sizing: border-box;
+}
+
+.qsm-popup__close {
+	background: transparent;
+	border: 0;
+	color: #00449e;
+    text-decoration: none;
+}
+
+.qsm-popup__header .qsm-popup__close:before { 
+	content: "\2715"; 
+}
+
+.qsm-popup__content {
+	margin-top: 2rem;
+	margin-bottom: 2rem;
+	line-height: 1.5;
+	color: rgba(0,0,0,.8);
+}
+
+.qsm-popup__btn {
+	font-size: .875rem;
+	padding-left: 1rem;
+	padding-right: 1rem;
+	padding-top: .5rem;
+	padding-bottom: .5rem;
+	background-color: #e6e6e6;
+	color: rgba(0,0,0,.8);
+	border-radius: .25rem;
+	border-style: none;
+	border-width: 0;
+	cursor: pointer;
+	-webkit-appearance: button;
+	text-transform: none;
+	overflow: visible;
+	line-height: 1.15;
+	margin: 0;
+	will-change: transform;
+	-moz-osx-font-smoothing: grayscale;
+	-webkit-backface-visibility: hidden;
+	backface-visibility: hidden;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+	transition: -webkit-transform .25s ease-out;
+	transition: transform .25s ease-out;
+	transition: transform .25s ease-out,-webkit-transform .25s ease-out;
+}
+
+.qsm-popup__btn:focus, .qsm-popup__btn:hover {
+	-webkit-transform: scale(1.05);
+	transform: scale(1.05);
+}
+
+.qsm-popup__btn-primary {
+	background-color: #00449e;
+	color: #fff;
+}
+
+@keyframes mmfadeIn {
+	from { opacity: 0; }
+	to { opacity: 1; }
+}
+
+@keyframes mmfadeOut {
+	from { opacity: 1; }
+	to { opacity: 0; }
+}
+
+@keyframes mmslideIn {
+from { transform: translateY(15%); }
+	to { transform: translateY(0); }
+}
+
+@keyframes mmslideOut {
+	from { transform: translateY(0); }
+	to { transform: translateY(-10%); }
+}
+
+.qsm-popup-slide {
+	display: none;
+}
+
+.qsm-popup-slide.is-open {
+	display: block;
+}
+
+.qsm-popup-slide[aria-hidden="false"] .qsm-popup__overlay {
+	animation: mmfadeIn .3s cubic-bezier(0.0, 0.0, 0.2, 1);
+}
+
+.qsm-popup-slide[aria-hidden="false"] .qsm-popup__container {
+	animation: mmslideIn .3s cubic-bezier(0, 0, .2, 1);
+}
+
+.qsm-popup-slide[aria-hidden="true"] .qsm-popup__overlay {
+	animation: mmfadeOut .3s cubic-bezier(0.0, 0.0, 0.2, 1);
+}
+
+.qsm-popup-slide[aria-hidden="true"] .qsm-popup__container {
+	animation: mmslideOut .3s cubic-bezier(0, 0, .2, 1);
+}
+
+.qsm-popup-slide .qsm-popup__container,
+.qsm-popup-slide .qsm-popup__overlay {
+	will-change: transform;
+}
diff --git a/js/qsm-admin.js b/js/qsm-admin.js
@@ -47,7 +47,7 @@ var QSMQuizzesSurveys;
           $( '#delete_quiz_name' ).val( val.name );
         }
       });
-      $( '#delete_dialog' ).dialog( 'open' );
+      MicroModal.show( 'modal-5' );
     },
     editQuizName: function( quiz_id ) {
       $( '#edit_quiz_id' ).val( quiz_id );
@@ -56,49 +56,27 @@ var QSMQuizzesSurveys;
           $( '#edit_quiz_name' ).val( val.name );
         }
       });
-      $( '#edit_dialog' ).dialog( 'open' );
+      MicroModal.show( 'modal-3' );
     },
     duplicateQuiz: function( quiz_id ) {
       $( '#duplicate_quiz_id' ).val( quiz_id );
-      $( '#duplicate_dialog' ).dialog( 'open' );
-    }
+      MicroModal.show( 'modal-4' );
+    },
+    /**
+     * Opens the popup to reset quiz stats
+     *
+     * @param int The ID of the quiz
+     */
+    openResetPopup: function( quiz_id ) {
+      quiz_id = parseInt( quiz_id );
+      $( '#reset_quiz_id' ).val( quiz_id );
+      MicroModal.show( 'modal-1' );
+    },
   };
   $(function() {
-    $( '#new_quiz_dialog' ).dialog({
-      autoOpen: false,
-      buttons: {
-        Cancel: function() {
-          $( this ).dialog( 'close' );
-        }
-      }
-    });
-    $( '#delete_dialog' ).dialog({
-      autoOpen: false,
-      buttons: {
-        Cancel: function() {
-          $( this ).dialog( 'close' );
-        }
-      }
-    });
-    $( '#edit_dialog' ).dialog({
-      autoOpen: false,
-      buttons: {
-        Cancel: function() {
-          $( this ).dialog( 'close' );
-        }
-      }
-    });
-    $( '#duplicate_dialog' ).dialog({
-      autoOpen: false,
-      buttons: {
-        Cancel: function() {
-          $( this ).dialog( 'close' );
-        }
-      }
-    });
     $( '#new_quiz_button, #new_quiz_button_two' ).on( 'click', function( event ) {
       event.preventDefault();
-      $( '#new_quiz_dialog' ).dialog( 'open' );
+      MicroModal.show( 'modal-2' );
     });
     $( '#quiz_search' ).keyup( function() {
       QSMQuizzesSurveys.searchQuizzes( $( this ).val() );
@@ -115,6 +93,30 @@ var QSMQuizzesSurveys;
       event.preventDefault();
       QSMQuizzesSurveys.editQuizName( $( this ).parents( '.qsm-quiz-row' ).data( 'id' ) );
     });
+    $( '#the-list' ).on( 'click', '.qsm-action-link-reset', function( event ) {
+      event.preventDefault();
+      QSMQuizzesSurveys.openResetPopup( $( this ).parents( '.qsm-quiz-row' ).data( 'id' ) );
+    });
+    $( '#reset-stats-button' ).on( 'click', function( event ) {
+      event.preventDefault();
+      $( '#reset_quiz_form' ).submit();
+    });
+    $( '#create-quiz-button' ).on( 'click', function( event ) {
+      event.preventDefault();
+      $( '#new-quiz-form' ).submit();
+    });
+    $( '#edit-name-button' ).on( 'click', function( event ) {
+      event.preventDefault();
+      $( '#edit-name-form' ).submit();
+    });
+    $( '#duplicate-quiz-button' ).on( 'click', function( event ) {
+      event.preventDefault();
+      $( '#duplicate-quiz-form' ).submit();
+    });
+    $( '#delete-quiz-button' ).on( 'click', function( event ) {
+      event.preventDefault();
+      $( '#delete-quiz-form' ).submit();
+    });
     QSMQuizzesSurveys.load();
   });
 }(jQuery));
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: 5.3.2
+ * Version: 6.0.0
  * Author: Frank Corso
  * Author URI: https://www.quizandsurveymaster.com/
  * Plugin URI: https://www.quizandsurveymaster.com/
  * Text Domain: quiz-master-next
  *
  * @author Frank Corso
- * @version 5.3.2
+ * @version 6.0.0
  * @package QSM
  */
 
@@ -33,7 +33,7 @@ class MLWQuizMasterNext {
 	 * @var string
 	 * @since 4.0.0
 	 */
-	public $version = '5.3.2';
+	public $version = '6.0.0';
 
 	/**
 	 * QSM Alert Manager Object
@@ -130,11 +130,9 @@ private function load_dependencies() {
 			include 'php/admin/options-page-contact-tab.php';
 			include 'php/admin/options-page-text-tab.php';
 			include 'php/admin/options-page-option-tab.php';
-			include 'php/admin/options-page-leaderboard-tab.php';
 			include 'php/admin/options-page-email-tab.php';
 			include 'php/admin/options-page-results-page-tab.php';
 			include 'php/admin/options-page-style-tab.php';
-			include 'php/admin/options-page-tools-tab.php';
 			include 'php/admin/options-page-preview-tab.php';
 			include 'php/admin/addons-page.php';
 			include 'php/admin/settings-page.php';
@@ -146,8 +144,6 @@ private function load_dependencies() {
 		include 'php/classes/class-qsm-contact-manager.php';
 		include 'php/classes/class-qmn-quiz-manager.php';
 
-		include 'php/leaderboard-shortcode.php';
-		include 'php/widgets.php';
 		include 'php/template-variables.php';
 		include 'php/adverts-generate.php';
 		include 'php/question-types.php';
@@ -180,8 +176,6 @@ private function load_dependencies() {
 	private function add_hooks() {
 		add_action( 'admin_menu', array( $this, 'setup_admin_menu' ) );
 		add_action( 'admin_head', array( $this, 'admin_head' ), 900 );
-		add_action( 'widgets_init', create_function( '', 'return register_widget("Mlw_Qmn_Leaderboard_Widget");' ) );
-		add_shortcode( 'mlw_quizmaster_leaderboard', 'mlw_quiz_leaderboard_shortcode' );
 		add_action( 'init', array( $this, 'register_quiz_post_types' ) );
 	}
 

diff --git a/php/admin/about-page.php b/php/admin/about-page.php
@@ -33,27 +33,20 @@ function mlw_generate_about_page() {
 		</h2>
 		<div class="qsm-tab-content tab-1">
 			<div class="feature">
-				<h2 class="feature-headline">Welcome to QSM 5.3!</h2>
+				<h2 class="feature-headline">Welcome to QSM 6.0!</h2>
 			</div>
 			<div class="feature">
-				<h2 class="feature-headline">New Progress Bar!</h2>
-				<p class="feature-text">You can now enable a progress bar on quizzes and surveys that are using the new pages and questions editor from the 5.2.0 update!</p>
-				<p class="feature-text">When editing your quiz or survey, go to the "Options" tab and set the "Show a progress bar?" option to "Yes".</p>
+				<h2 class="feature-headline">New PHP Minimum</h2>
+				<p class="feature-text">As planned, all versions of Quiz And Survey Master starting with this version will require a minimum of PHP 5.4.</p>
 			</div>
 			<div class="feature">
-				<h2 class="feature-headline">Disable IP Address Collection</h2>
-				<p class="feature-text">You can now disable the plugin from collecting IP addresses, if needed. To do so, go to the "Settings" page and check the "Disable collecting and storing IP addresses?" checkbox.</p>
-			</div>
-			<div class="feature">
-				<h2 class="feature-headline">Disable Storing Results In The Database</h2>
-				<p class="feature-text">For the quizzes and surveys that do not need to actually store any responses, you can now turn off the results being stored in the database. To do so, go to the "Options" tab when editing your quiz or survey and set the "Store the responses in the database?" option to "No".</p>
+				<h2 class="feature-headline">Removing Of Deprecated Features</h2>
+				<p class="feature-text">As planned, the Leaderboards is now in our free addon instead of being built into the main plugin. The old "Tools" tab has also been removed.</p>
 			</div>
 		</div>
 		<div class="qsm-tab-content tab-2" style="display: none;">
 			<h2>Changelog</h2>
-			<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 52 ); ?>
-			<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 51 ); ?>
-			<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 50 ); ?>
+			<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 36 ); ?>
 		</div>
 		<div class="qsm-tab-content tab-3" style="display:none;">
 			<h2>GitHub Contributors</h2>