Skip to content

Commit

Permalink
Add secondarybtn class to nevermind buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@drlippman
drlippman committed Dec 18, 2013
1 parent 1227077 commit c3b19ce
Show file tree
Hide file tree
Showing 26 changed files with 74 additions and 69 deletions.
2 changes: 1 addition & 1 deletion admin/diagonetime.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
} else if (isset($_GET['delete'])) {
echo "<p>Are you sure you want to delete all one-time passwords for this diagnostic?</p>\n";
echo "<p><input type=button value=\"Delete\" onclick=\"window.location='diagonetime.php?id=$diag&delete=true'\">\n";
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='admin.php'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='admin.php'\"></p>\n";
} else {
echo "<b>All one-time passwords</b> <a href=\"diagonetime.php?id=$diag&generate=true\">Generate</a> <a href=\"diagonetime.php?id=$diag&delete=check\">Delete all</a>";
echo '<table><thead><tr><th>Codes</th><th>Good For</th><th>Created</th></tr></thead><tbody>';
Expand Down
2 changes: 1 addition & 1 deletion admin/externaltools.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
echo '<p>Are you SURE you want to delete the tool <b>'.$name.'</b>? Doing so will break ALL placements of this tool.</p>';
echo '<form method="post" action="externaltools.php?cid='.$cid.$ltfrom.'&amp;id='.$_GET['id'].'&amp;delete=true">';
echo '<input type=submit value="Yes, I\'m Sure">';
echo '<input type=button value="Nevermind" onclick="window.location=\'externaltools.php?cid='.$cid.'\'">';
echo '<input type=button value="Nevermind" class="secondarybtn" onclick="window.location=\'externaltools.php?cid='.$cid.'\'">';
echo '</form>';

} else if (isset($_GET['id'])) {
Expand Down
8 changes: 4 additions & 4 deletions admin/forms.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
echo '<div id="headerforms" class="pagetitle"><h2>Delete Course</h2></div>';
echo "<p>Are you sure you want to delete the course <b>$name</b>?</p>\n";
echo "<p><input type=button value=\"Delete\" onclick=\"window.location='actions.php?action=delete&id={$_GET['id']}'\">\n";
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='admin.php'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='admin.php'\"></p>\n";
break;
case "deladmin":
echo "<p>Are you sure you want to delete this user?</p>\n";
echo "<p><input type=button value=\"Delete\" onclick=\"window.location='actions.php?action=deladmin&id={$_GET['id']}'\">\n";
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='admin.php'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='admin.php'\"></p>\n";
break;
case "chgpwd":
echo '<div id="headerforms" class="pagetitle"><h2>Change Your Password</h2></div>';
Expand Down Expand Up @@ -619,7 +619,7 @@
}
echo "</select>\n";
echo "<p><input type=submit value=\"Transfer\">\n";
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='admin.php'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='admin.php'\"></p>\n";
echo "</form>\n";
break;
case "deloldusers":
Expand Down Expand Up @@ -725,7 +725,7 @@
case "removediag":
echo "<p>Are you sure you want to delete this diagnostic? This does not delete the connected course and does not remove students or their scores.</p>\n";
echo "<p><input type=button value=\"Delete\" onclick=\"window.location='actions.php?action=removediag&id={$_GET['id']}'\">\n";
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='admin.php'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='admin.php'\"></p>\n";
break;
}

Expand Down
2 changes: 1 addition & 1 deletion course/addassessment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
$body .= "<h3>$assessmentname</h3>";
$body .= "<p>Are you SURE you want to delete all attempts (grades) for this assessment?</p>";
$body .= "<p><input type=button value=\"Yes, Clear\" onClick=\"window.location='addassessment.php?cid={$_GET['cid']}&id={$_GET['id']}&clearattempts=confirmed'\">\n";
$body .= "<input type=button value=\"Nevermind\" onClick=\"window.location='addassessment.php?cid={$_GET['cid']}&id={$_GET['id']}'\"></p>\n";
$body .= "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onClick=\"window.location='addassessment.php?cid={$_GET['cid']}&id={$_GET['id']}'\"></p>\n";
}
} elseif ($_POST['name']!= null) { //if the form has been submitted

Expand Down
6 changes: 3 additions & 3 deletions course/addquestions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
$body .= "<h3>$assessmentname</h3>";
$body .= "<p>Are you SURE you want to delete all attempts (grades) for this assessment?</p>";
$body .= "<p><input type=button value=\"Yes, Clear\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid&clearattempts=confirmed'\">\n";
$body .= "<input type=button value=\"Nevermind\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid';\"></p>\n";
$body .= "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid';\"></p>\n";
}
}
if (isset($_GET['clearqattempts'])) {
Expand Down Expand Up @@ -204,7 +204,7 @@
$body .= "<p>This will allow you to safely change points and penalty for a question, or give students another attempt ";
$body .= "on a question that needed fixing. This will NOT allow you to remove the question from the assessment.</p>";
$body .= "<p><input type=button value=\"Yes, Clear\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid&clearqattempts={$_GET['clearqattempts']}&confirmed=1'\">\n";
$body .= "<input type=button value=\"Nevermind\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid'\"></p>\n";
$body .= "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid'\"></p>\n";
}
}
if (isset($_GET['withdraw'])) {
Expand Down Expand Up @@ -317,7 +317,7 @@
}
$body .= '<p>This action can <b>not</b> be undone.</p>';
$body .= '<p><input type=submit value="Withdraw Question">';
$body .= "<input type=button value=\"Nevermind\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid'\"></p>\n";
$body .= "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onClick=\"window.location='addquestions.php?cid=$cid&aid=$aid'\"></p>\n";

$body .= '</form>';
}
Expand Down
2 changes: 1 addition & 1 deletion course/categorize.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function flattenarr($ar) {

echo "<p>Add new category to lists: <input type=type id=\"newcat\" size=40> ";
echo "<input type=button value=\"Add Category\" onclick=\"addcategory()\"></p>\n";
echo '<p><input type=submit value="Record Categorizations"> and return to the course page. <input type="button" value="Reset" onclick="resetcat()"/></p>';
echo '<p><input type=submit value="Record Categorizations"> and return to the course page. <input type="button" class="secondarybtn" value="Reset" onclick="resetcat()"/></p>';
echo "</form>\n";


Expand Down
2 changes: 1 addition & 1 deletion course/chgoffline.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
echo $row[0].'<br/>';
}
echo '<p><p><input type="submit" value="Yes, Delete"/>';
echo '<input type=button value="Nevermind" onClick="window.location=\'gradebook.php?cid='.$cid.'\'"></p>';
echo '<input type=button value="Nevermind" class="secondarybtn" onClick="window.location=\'gradebook.php?cid='.$cid.'\'"></p>';
echo '</form>';
require("../footer.php");
exit;
Expand Down
2 changes: 1 addition & 1 deletion course/coursetolibrary.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function setlibnames(libn) {
echo "<input type=button value=\"Select Library\" onClick=\"libselect()\"></span><br class=form> ";

echo "<p><input type=submit value=\"Copy Questions to Library\">\n";
echo "<input type=button value=\"Never Mind\" onclick=\"window.location='course.php?cid=$cid'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='course.php?cid=$cid'\"></p>\n";
echo "</form>\n";
require("../footer.php");
exit;
Expand Down
2 changes: 1 addition & 1 deletion course/deleteassessment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
Are you <b>SURE</b> you want to delete this assessment and all associated student attempts?
<p>
<input type=button value="Yes, Delete" onClick="window.location='deleteassessment.php?cid=<?php echo $_GET['cid'] ?>&block=<?php echo $block ?>&id=<?php echo $_GET['id'] ?>&remove=really'">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
</p>

<?php
Expand Down
2 changes: 1 addition & 1 deletion course/deleteblock.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<p><input type=radio name="delcontents" value="0" checked="checked"/>Move all items out of block<br/>
<input type=radio name="delcontents" value="1"/>Also Delete all items in block</p>
<p><input type=submit value="Yes, Delete">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'"></p>
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'"></p>
<?php
}

Expand Down
2 changes: 1 addition & 1 deletion course/deleteforum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<h3><?php echo $itemname; ?></h3>
Are you SURE you want to delete this forum and all associated postings?
<p><input type=button value="Yes, Delete" onClick="window.location='deleteforum.php?cid=<?php echo $_GET['cid'] ?>&block=<?php echo $block ?>&id=<?php echo $_GET['id'] ?>&remove=really'">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
</p>

<?php
Expand Down
2 changes: 1 addition & 1 deletion course/deleteinlinetext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<h3><?php echo $itemname; ?></h3>
Are you SURE you want to delete this text item?
<p><input type=button value="Yes, Delete" onClick="window.location='deleteinlinetext.php?cid=<?php echo $cid ?>&block=<?php echo $block ?>&id=<?php echo $_GET['id'] ?>&remove=really'">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $cid ?>'"></p>
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $cid ?>'"></p>

<?php
}
Expand Down
2 changes: 1 addition & 1 deletion course/deletelinkedtext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<h3><?php echo $itemname; ?></h3>
Are you SURE you want to delete this link item?
<p><input type=button value="Yes, Delete" onClick="window.location='deletelinkedtext.php?cid=<?php echo $_GET['cid'] ?>&block=<?php echo $block ?>&id=<?php echo $_GET['id'] ?>&remove=really'">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'"></p>
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'"></p>

<?php
}
Expand Down
2 changes: 1 addition & 1 deletion course/deletewiki.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<h3><?php echo $itemname; ?></h3>
Are you SURE you want to delete this Wiki and all associated revisions?
<p><input type=button value="Yes, Delete" onClick="window.location='deletewiki.php?cid=<?php echo $_GET['cid'] ?>&block=<?php echo $block ?>&id=<?php echo $_GET['id'] ?>&remove=really'">
<input type=button value="Nevermind" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
<input type=button value="Nevermind" class="secondarybtn" onClick="window.location='course.php?cid=<?php echo $_GET['cid'] ?>'">
</p>

<?php
Expand Down
8 changes: 4 additions & 4 deletions course/gb-viewasid.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
}
echo "<p>Are you sure you want to clear this $pers's assessment attempt? This will make it appear the $pers never tried the assessment, and the $pers will receive a new version of the assessment.</p>";
echo "<p><input type=button onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&from=$from&clearattempt=confirmed'\" value=\"Really Clear\">\n";
echo "<input type=button value=\"Never Mind\" onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&cid=$cid&from=$from&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&cid=$cid&from=$from&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
exit;
}
}
Expand All @@ -146,7 +146,7 @@
echo getconfirmheader();
echo "<p>Are you sure you want to separate this student from their current group?</p>";
echo "<p><input type=button onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&cid=$cid&from=$from&asid={$_GET['asid']}&uid={$_GET['uid']}&breakfromgroup=confirmed'\" value=\"Really Separate\">\n";
echo "<input type=button value=\"Never Mind\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
exit;
}
}
Expand Down Expand Up @@ -200,7 +200,7 @@
}
echo "<p>Are you sure you want to clear this $pers's scores for this assessment?</p>";
echo "<p><input type=button onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&from=$from&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}&clearscores=confirmed'\" value=\"Really Clear\">\n";
echo "<input type=button value=\"Never Mind\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
exit;
}
}
Expand Down Expand Up @@ -296,7 +296,7 @@
}
echo "<p>Are you sure you want to clear this $pers's scores for this question?</p>";
echo "<p><input type=button onclick=\"window.location='gb-viewasid.php?stu=$stu&gbmode=$gbmode&cid=$cid&from=$from&asid={$_GET['asid']}&clearq={$_GET['clearq']}&uid={$_GET['uid']}&confirmed=true'\" value=\"Really Clear\">\n";
echo "<input type=button value=\"Never Mind\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='gb-viewasid.php?stu=$stu&from=$from&gbmode=$gbmode&cid=$cid&asid={$_GET['asid']}&uid={$_GET['uid']}'\"></p>\n";
exit;
}
}
Expand Down
29 changes: 17 additions & 12 deletions course/gradebook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,25 +705,21 @@ function gbstudisp($stu) {
echo ' <span class="small">Section: '.$stusection.'</span>';
}
echo '</h3>';
echo '<div style="clear:both">';
if ($isteacher) {
echo '<div style="clear:both;display:inline-block" class="cpmid secondary">';
echo '<a href="mailto:'.$stuemail.'">', _('Email'), '</a> | ';
echo "<a href=\"$imasroot/msgs/msglist.php?cid={$_GET['cid']}&add=new&to=$stu\">", _('Message'), "</a> | ";
echo "<a href=\"gradebook.php?cid={$_GET['cid']}&uid=$stu&massexception=1\">", _('Make Exception'), "</a> | ";
echo "<a href=\"listusers.php?cid={$_GET['cid']}&chgstuinfo=true&uid=$stu\">", _('Change Info'), "</a> | ";
echo "<a href=\"viewloginlog.php?cid={$_GET['cid']}&uid=$stu&from=gb\">", _('Login Log'), "</a> | ";
echo "<a href=\"viewactionlog.php?cid={$_GET['cid']}&uid=$stu&from=gb\">", _('Activity Log'), "</a> | ";
echo "<a href=\"#\" onclick=\"makeofflineeditable(this); return false;\">", _('Edit Offline Scores'), "</a>";

echo '</div>';
} else if ($istutor) {
echo '<div style="clear:both;display:inline-block" class="cpmid">';
echo "<a href=\"viewloginlog.php?cid={$_GET['cid']}&uid=$stu&from=gb\">", _('Login Log'), "</a> | ";
echo "<a href=\"viewactionlog.php?cid={$_GET['cid']}&uid=$stu&from=gb\">", _('Activity Log'), "</a>";
}
//TODO i18n
if ($showlatepass==1) {
if ($latepasses==0) { $latepasses = 'No';}
if ($isteacher || $istutor) {echo '<br/>';}
echo "$latepasses LatePass".($latepasses!=1?"es":"").' available';
echo '</div>';
}

if (trim($gbcomment)!='' || $isteacher) {
Expand All @@ -733,17 +729,26 @@ function gbstudisp($stu) {
echo "<textarea name=\"usrcomments\" rows=3 cols=60>$gbcomment</textarea>";
echo '</form>';
} else {
echo "<div class=\"item\">$gbcomment</div>";
echo "<div style=\"clear:both;display:inline-block\" class=\"cpmid\">$gbcomment</div><br/>";
}
}
echo '</div>';
//TODO i18n
if ($showlatepass==1) {
if ($latepasses==0) { $latepasses = 'No';}
if ($isteacher || $istutor) {echo '<br/>';}
$lpmsg = "$latepasses LatePass".($latepasses!=1?"es":"").' available';
}
if (!$isteacher && !$istutor) {
echo $lpmsg;
}

}
echo "<form method=\"post\" id=\"qform\" action=\"gradebook.php?{$_SERVER['QUERY_STRING']}&uid=$stu\">";
//echo "<input type='button' onclick='conditionalColor(\"myTable\",1,50,80);' value='Color'/>";
if ($isteacher && $stu>0) {
echo '<p><button type="submit" value="Save Changes" style="display:none"; id="savechgbtn">', _('Save Changes'), '</button> ';
echo '<button type="submit" value="Save Changes" style="display:none"; id="savechgbtn">', _('Save Changes'), '</button> ';
echo _('Check:'), ' <a href="#" onclick="return chkAllNone(\'qform\',\'assesschk[]\',true)">All</a> <a href="#" onclick="return chkAllNone(\'qform\',\'assesschk[]\',false)">', _('None'), '</a> ';
echo _('With selected:'), ' <button type="submit" value="Make Exception" name="posted">',_('Make Exception'),'</button></p>';
echo _('With selected:'), ' <button type="submit" value="Make Exception" name="posted">',_('Make Exception'),'</button> '.$lpmsg.'';
}
echo '<table id="myTable" class="gb" style="position:relative;">';
echo '<thead><tr>';
Expand Down
2 changes: 1 addition & 1 deletion course/listusers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@

<p>
<input type=submit value="Yes, I'm Sure">
<input type=button value="Nevermind" onclick="window.location='listusers.php?cid=<?php echo $cid ?>'">
<input type=button value="Nevermind" class="secondarybtn" onclick="window.location='listusers.php?cid=<?php echo $cid ?>'">
</p>
</form>

Expand Down
4 changes: 2 additions & 2 deletions course/lockstu.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
<input type=submit value="Yes, Lock Out Student">
<?php
if ($calledfrom=='lu') {
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='listusers.php?cid=$cid'\">";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='listusers.php?cid=$cid'\">";
} else if ($calledfrom=='gb') {
echo "<input type=button value=\"Nevermind\" onclick=\"window.location='gradebook.php?cid=$cid&gbmode={$_GET['gbmode']}'\">";
echo "<input type=button value=\"Nevermind\" class=\"secondarybtn\" onclick=\"window.location='gradebook.php?cid=$cid&gbmode={$_GET['gbmode']}'\">";
}
?>
</p>
Expand Down
Loading

0 comments on commit c3b19ce

Please sign in to comment.