Skip to content

Commit

Permalink
Merge pull request #174 from fpcorso/release/4.2.4
Browse files Browse the repository at this point in the history 
Release 4.2.4
  • Loading branch information
@fpcorso
fpcorso committed Apr 1, 2015
2 parents 53b616e + 51fbb0f commit fe5c8af
Show file tree
Hide file tree
Showing 24 changed files with 493 additions and 491 deletions.
2 changes: 1 addition & 1 deletion includes/qmn_credits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function mlw_qmn_setTab(tab) {
<br />
</div>
<div id="mlw_quiz_changelog" style="display: none;">
<h3><?php echo $mlw_quiz_version; ?> (March 26, 2015)</h3>
<h3><?php echo $mlw_quiz_version; ?> (April 1, 2015)</h3>
<ul>
<li>* Minor Design Changes</li>
<li>* Minor Bug Fixes</li>
Expand Down
17 changes: 6 additions & 11 deletions includes/qmn_options_certificate_tab.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,10 @@ function mlw_options_certificate_tab_content()
}
?>
<div id="tabs-5" class="mlw_tab_content">
<script>
jQuery(function() {
jQuery( "#enableCertificates" ).buttonset();
});
</script>
<h3><?php _e('Quiz Certificate (Beta)', 'quiz-master-next'); ?></h3>
<p><?php _e('Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate.', 'quiz-master-next'); ?></p>
<p><?php _e('These fields cannot contain HTML.', 'quiz-master-next'); ?></p>
<button id="save_certificate_button" class="button" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
<button id="save_certificate_button" class="button-primary" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
<?php
echo "<form action='' method='post' name='quiz_certificate_options_form'>";
echo "<input type='hidden' name='save_certificate_options' value='confirmation' />";
Expand All @@ -79,10 +74,10 @@ function mlw_options_certificate_tab_content()
<table class="form-table">
<tr valign="top">
<td><label for="enableCertificates"><?php _e('Enable Certificates For This Quiz?', 'quiz-master-next'); ?></label></td>
<td><div id="enableCertificates">
<input type="radio" id="radio30" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio30"><?php _e('Yes', 'quiz-master-next'); ?></label>
<input type="radio" id="radio31" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio31"><?php _e('No', 'quiz-master-next'); ?></label>
</div></td>
<td>
<input type="radio" id="radio30" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio30"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
<input type="radio" id="radio31" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio31"><?php _e('No', 'quiz-master-next'); ?></label><br>
</td>
</tr>
<tr>
<td width="30%">
Expand Down Expand Up @@ -126,7 +121,7 @@ function mlw_options_certificate_tab_content()
</td>
</tr>
</table>
<button id="save_certificate_button" class="button" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
<button id="save_certificate_button" class="button-primary" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
</form>
</div>
<?php
Expand Down
20 changes: 10 additions & 10 deletions includes/qmn_options_email_tab.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,22 +316,22 @@ function delete_admin_email(id)
<input type='hidden' name='mlw_add_admin_email_page' value='confirmation' />
<input type='hidden' name='mlw_add_admin_email_quiz_id' value='<?php echo $quiz_id; ?>' />
</form>
<button id="save_email_button" class="button" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
<button id="save_email_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
<form method="post" action="" name="mlw_quiz_save_email_form">
<table class="form-table">
<tr valign="top">
<th scope="row"><label for="sendUserEmail"><?php _e('Send user email upon completion?', 'quiz-master-next'); ?></label></th>
<td><div id="sendUserEmail">
<input type="radio" id="radio5" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio5"><?php _e('Yes', 'quiz-master-next'); ?></label>
<input type="radio" id="radio6" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio6"><?php _e('No', 'quiz-master-next'); ?></label>
</div></td>
<td>
<input type="radio" id="radio5" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio5"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
<input type="radio" id="radio6" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio6"><?php _e('No', 'quiz-master-next'); ?></label><br>
</td>
</tr>
<tr valign="top">
<th scope="row"><label for="sendAdminEmail"><?php _e('Send admin email upon completion?', 'quiz-master-next'); ?></label></th>
<td><div id="sendAdminEmail">
<input type="radio" id="radio19" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio19"><?php _e('Yes', 'quiz-master-next'); ?></label>
<input type="radio" id="radio20" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio20"><?php _e('No', 'quiz-master-next'); ?></label>
</div></td>
<td>
<input type="radio" id="radio19" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio19"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
<input type="radio" id="radio20" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio20"><?php _e('No', 'quiz-master-next'); ?></label><br>
</td>
</tr>
<tr valign="top">
<th scope="row"><label for="adminEmail"><?php _e('What emails should we send the admin email to? Separate emails with a comma.', 'quiz-master-next'); ?></label></th>
Expand Down Expand Up @@ -515,7 +515,7 @@ function delete_admin_email(id)
</form>
<br />
<br />
<button id="save_email_button" class="button" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
<button id="save_email_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
</div>
<?php
}
Expand Down
4 changes: 2 additions & 2 deletions includes/qmn_options_leaderboard_tab.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function mlw_options_leaderboard_tab_content()
<td><strong>%QUIZ_NAME%</strong> - <?php _e("The name of the quiz", 'quiz-master-next'); ?></td>
</tr>
</table>
<button id="save_template_button" class="button" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
<?php
echo "<form action='' method='post' name='quiz_leaderboard_options_form'>";
echo "<input type='hidden' name='save_leaderboard_options' value='confirmation' />";
Expand Down Expand Up @@ -105,7 +105,7 @@ function mlw_options_leaderboard_tab_content()
</td>
</tr>
</table>
<button id="save_template_button" class="button" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
</form>
</div>
<?php
Expand Down
Loading

0 comments on commit fe5c8af

Please sign in to comment.