Skip to content

Commit

Permalink
Merge pull request #756 from fpcorso/dev
Browse files Browse the repository at this point in the history
6.2.0 Release
  • Loading branch information
Frank Corso authored Jan 30, 2019
2 parents 445b706 + 158e14e commit 31d5106
Show file tree
Hide file tree
Showing 31 changed files with 2,237 additions and 1,397 deletions.
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
= 6.0.4 (October 2, 2018) =
* Changes links from old documentation to newer documentation

= 6.0.3 (August 20, 2018) =
* Closed Bug: User gets 'trapped' if timer runs out on required question when questions are paginated ([Issue #583](https://github.com/fpcorso/quiz_master_next/issues/583))
* Closed Bug: If user refreshes quiz page when timer is at 0, cannot submit ([Issue #501](https://github.com/fpcorso/quiz_master_next/issues/501))
* Closed Bug: Saving quiz name when editing results in error if no changes are made ([Issue #391](https://github.com/fpcorso/quiz_master_next/issues/391))
* Adds deprecated notice to the quiz setting functions found in the quizCreator object
* Adds hook after results are stored in the database

= 6.0.2 (July 18, 2018) =
* Closed Bug: PHP warning thrown on Help page ([Issue #711](https://github.com/fpcorso/quiz_master_next/issues/711))
* Closed Bug: Timer not working on certain sites when using questions per page option ([Issue #709](https://github.com/fpcorso/quiz_master_next/issues/709))
* Closed Bug: Blank page shown when contact fields and message fields are empty ([Issue #707](https://github.com/fpcorso/quiz_master_next/issues/707))

= 6.0.1 (July 11, 2018) =
* Closed Bug: Quiz comment box shows HTML in label when using newer pagination system ([Issue #704](https://github.com/fpcorso/quiz_master_next/issues/704))

= 6.0.0 (June 20, 2018) =
* Closed Enhancement: Remove Tools tab ([Issue #689](https://github.com/fpcorso/quiz_master_next/issues/689))
* Closed Enhancement: Bump Minimum PHP Version To 5.4 ([Issue #607](https://github.com/fpcorso/quiz_master_next/issues/607))
* Closed Enhancement: Move Leaderboards to free addon ([Issue #380](https://github.com/fpcorso/quiz_master_next/issues/380))

= 5.3.2 (June 7, 2018) =
* Closed Plugin Compatibility: Conflict with Divi Builder ([Issue #686](https://github.com/fpcorso/quiz_master_next/issues/686))

Expand Down
154 changes: 154 additions & 0 deletions css/qsm-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,142 @@ Options Page
font-weight: bold;
}

/********************
Results Pages & Emails Tab
*********************/
.results-page,
.email {
width: 100%;
background-color: #0d97d8;
margin: 20px 0;
padding-bottom: 15px;
box-shadow: 0px 0px 5px 2px rgba(0,0,0,0.4)
}

.results-page-header,
.email-header {
display: flex;
align-items: center;
justify-content: flex-end;
background-color: #fff;
padding: 10px 35px;
border-bottom: 5px solid #1DD969;
}

.delete-page-button,
.delete-email-button {
background: none;
border: none;
color: #1DD969;
cursor: pointer;
transition-duration: 200ms;
}

.delete-page-button:hover,
.delete-email-button:hover {
transform: scale(1.2);
}

.results-page-content,
.email-content {
display: flex;
flex-direction: column;
}

.results-page-when,
.results-page-show,
.email-when,
.email-show {
padding: 10px;
background-color: #fff;
border: 5px solid #1DD969;
margin: 15px 0;
min-width: 60%;
}

.results-page-content-header,
.email-content-header {
margin-bottom: 10px;
}

.results-page-content-header h4,
.results-page-content-header p,
.email-content-header h4,
.email-content-header p {
margin: 0;
}

.results-page-condition,
.email-condition {
display: flex;
flex-direction: column;
margin-bottom: 15px;
justify-content: space-around;
}

.results-page-condition > select,
.results-page-condition > input,
.email-condition > select,
.email-condition > input {
max-width: 100%;
}

.delete-condition-button {
background: none;
border: 1px solid #1DD969;
color: #1DD969;
cursor: pointer;
transition-duration: 200ms;
padding: 6px;
}

.delete-condition-button:hover {
transform: scale(1.1);
}

.email-show .label {
display: block;
}

.results-page-show textarea,
.to-email,
.subject,
.email-template {
width: 100%;
margin-bottom: 10px;
}

@media screen and (min-width: 760px) {
.results-page-content,
.email-content {
flex-direction: row;
justify-content: space-around;
}

.results-page-when,
.results-page-show,
.email-when,
.email-show {
min-width: 35%;
}

.results-page-condition,
.email-condition {
align-items: center;
flex-direction: row;
}
.results-page-condition > select,
.results-page-condition > input,
.email-condition > select,
.email-condition > input {
max-width: 30%;
}

.delete-condition-button {
border: none;
}
}

/********************
Quiz Styles Tab
*********************/
Expand Down Expand Up @@ -255,6 +391,18 @@ Help Page
Misc.
*********************/

/* Ads */
.help-decide {
display: block;
text-align:center;
background: #fff;
border: 5px solid #1DD969;
color: #000;
font-weight: bold;
}
.help-decide p {
font-size: 14px;
}

/* Info Bar */
.qsm-info-box {
Expand Down Expand Up @@ -290,6 +438,12 @@ Misc.
transform: scale(1.1);
}

/* Options tabs */
.qsm_tab_content,
.mlw_tab_content {
padding: 10px 10px 10px 10px;
}

/* Popup */

.qsm-popup {
Expand Down
72 changes: 52 additions & 20 deletions js/admin.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,56 @@

/**
* Main admin file for functions to be used across many QSM admin pages.
*/
var QSMAdmin;
(function ($) {

QSMAdmin = {
selectTab: function( tab ) {
$( '.qsm-tab' ).removeClass( 'nav-tab-active' );
$( '.qsm-tab-content' ).hide();
tab.addClass( 'nav-tab-active' );
tabID = tab.data( 'tab' );
$( '.tab-' + tabID ).show();
}
};
$(function() {
$( '.qsm-tab' ).on( 'click', function( event ) {
event.preventDefault();
QSMAdmin.selectTab( $( this ) );
});
});
}(jQuery));
QSMAdmin = {
/**
* Catches an error from a jQuery function (i.e. $.ajax())
*/
displayjQueryError: function( jqXHR, textStatus, errorThrown ) {
QSMAdmin.displayAlert( 'Error: ' + errorThrown + '! Please try again.', 'error' );
},
/**
* Catches an error from a BackBone function (i.e. model.save())
*/
displayError: function( jqXHR, textStatus, errorThrown ) {
QSMAdmin.displayAlert( 'Error: ' + errorThrown.errorThrown + '! Please try again.', 'error' );
},
/**
* Displays an alert within the "Quiz Settings" page
*
* @param string message The message of the alert
* @param string type The type of alert. Choose from 'error', 'info', 'success', and 'warning'
*/
displayAlert: function( message, type ) {
QSMAdmin.clearAlerts();
var template = wp.template( 'notice' );
var data = {
message: message,
type: type
};
$( '.qsm-alerts' ).append( template( data ) );
},
clearAlerts: function() {
$( '.qsm-alerts' ).empty();
},
selectTab: function( tab ) {
$( '.qsm-tab' ).removeClass( 'nav-tab-active' );
$( '.qsm-tab-content' ).hide();
tab.addClass( 'nav-tab-active' );
tabID = tab.data( 'tab' );
$( '.tab-' + tabID ).show();
}
};
$(function() {
$( '.qsm-tab' ).on( 'click', function( event ) {
event.preventDefault();
QSMAdmin.selectTab( $( this ) );
});

jQuery("#qmn_check_all").change( function() {
jQuery('.qmn_delete_checkbox').prop( 'checked', jQuery('#qmn_check_all').prop('checked') );
});
$( '#qmn_check_all' ).change( function() {
$( '.qmn_delete_checkbox' ).prop( 'checked', jQuery( '#qmn_check_all' ).prop( 'checked' ) );
});
});
}(jQuery));
Loading

0 comments on commit 31d5106

Please sign in to comment.