From: Simon H. <sim...@us...> - 2010-11-09 16:51:48
|
Update of /cvsroot/stack/stack-dev/opaque/moodleModule/opaque In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25193/opaque/moodleModule/opaque Modified Files: Tag: item_state_separation questiontype.php Added Files: Tag: item_state_separation styles.css Log Message: Brought back up to date with big HEAD merge. --- NEW FILE: styles.css --- /** Fonts --------------------------------------- */ h1.section{ font-family: Lucida Sans, serif; text-align: center; } /** Spans --------------------------------------- */ span.correct{ color: green; } span.partially{ color: orange; } span.incorrect{ color: red; background-color: transparent; } div.displayedEq{ text-align: center; padding: 0.2em; } /** Generic classes -------------------------------- */ img{ border:0; margin-left: 0.1em; margin-right: 0.1em; } .warning{ color: orange; } .icon{ float:right; margin-top: -35px; margin-bottom: -60px; padding: 1.0em; /*background: yellow;*/ } .SyntaxExample1{ border: 1px dotted #333; padding: 0.2em; color: blue; background-color: #eee; font-family: monospace; font-size: 120%; font-weight: bold; } .SyntaxExample2{ color: blue; font-family: monospace; font-size: 100%; font-weight: bold; } /* No dashed box, for inclusion inside other error message boxes*/ .errorMsg{ color: #ff0000; } .error{ color: #ff0000; } p.error{ } .feedback{ } .solutionButton{ } .removeButton{ float:right; } .tableTitle{ font-weight: bold; } .centre{ text-align: center; } .quote{ font-style: italic; text-align: center; width: 80%; } .small{ font-size: 80%; } .relatedBox{ border: 1px dotted #333; padding: 0.2em; margin-left: 1em; margin-right: 1em; } .stackbutton{ margin-left: 0em; margin-right: 1.5em; } .logs{ font-family: monospace; } /** Structural DIVs ----------------------------------------------*/ div.error{ min-width: 30em; color: red; font-weight: bold; font-size: 90%; background-color: #fff; border: 1px dashed #c12926; text-align: left; padding: 0.2em; margin: 1em; } div.clearer{ clear: both; display: inline-block; } /*secondary information to the student, */ /* request feedback, resubmit etc. Netural feedback */ div.secondaryFeedback{ border: 1px solid #e1e1e1; background-color: #eee; padding: 0.2em; margin-bottom: 0.2em; width: 80%; margin-left: auto; margin-right: auto; margin-top: 0.2em; } h3.secondaryFeedback{ font-weight: normal; border-bottom: 1px solid #ccc; } /*feedback to student */ div.InteractionElementFeedback{ background-color: #FFFF99; border: 1px solid #EEEE66; margin-left: auto; margin-right: auto; padding: 0.2em; width: 80%; margin-top: 0.2em; margin-bottom: 0.2em; } /*Make the paragraph have only a single line break between paragraphs*/ p.studentFeedback{ margin: 0em; } /*PRT feedback */ div.PRTFeedback{ border: 1px solid #ccf; background-color: #ddf; width: 80%; margin-left: auto; margin-right: auto; margin-bottom: 0.2em; padding-left: 0.2em; padding-right: 0.2em; padding-bottom: 0.2em; /*Top has enough padding with the <h3>tag */ } h3.PRTFeedback{ font-weight: normal; border-bottom: 1px solid #bbf; } .PRTScore{ float: right; } /*Authoring layout */ div.requirements{ border: 1px solid #000; padding: 0.4em; background-color: #fff; } div.section { border: 1px solid #e1e1e1; background-color: #eee; padding: 0.4em; margin-bottom: 0.5em; margin-left: 140px; } h3.section{ font-weight: normal; border-bottom: 1px solid #aaa; } div.section80{ border: 1px solid #e1e1e1; background-color: #eee; padding: 0.4em; margin-bottom: 0.5em; width: 80%; margin-right: auto; margin-left: auto; } h3.section80{ font-weight: normal; border-bottom: 1px solid #aaa; } div.PRT{ /*border: 1px solid #222;*/ padding: 1.0em; margin: 1em; background-color: #ddd; } div.PR{ border: 1px solid #000; background-color: #fff; margin-top: 1em; margin-bottom: 0.5em; padding: 1em; } div.PRTTrue{ border: 1px solid #DDFFBA; padding: 0.25em; margin-top: 1em; background-color: #efe; } div.PRTFalse{ border: 1px dotted #FFA19E; padding: 0.25em; margin-top: 1em; background-color: #fee; } .interactionElementsTable, .deploymentTable { margin-right: auto; margin-left: auto; text-align: left; width: 95%; background-color: #fff; } div.row { clear: both; padding-top: 0.1em; padding-bottom: 0.1em; min-height: 2em; height: 1%; } div.row span.error { min-width: 30em; color: red; font-weight: bold; font-size: 90%; background-color: #fee; border: 1px dashed #c12926; float: left; text-align: left; padding: 0.2em; } div.row span.label { float: left; width: 250px; text-align: right; padding: 0.25em; } div.row span.formw { float: left; text-align: left; padding: 0.2em; /*width: 300px;*/ } div.row span.full{ float: left; text-align: left; padding: 0.2em; } div.authorMath { background-color:#FFFFFF; border:1px dashed; clear:left; float:none; padding:0.2em; width:505px; display: none; } div#authoringControls { background-color:#EEEEEE; border:1px solid #E1E1E1; padding:5px; position:fixed; width:120px; left:20px; } div#authoringControls input { width: 110px; margin: 1px 5px; } /* Tables --------------------------------------------------------------*/ .tableHeader{ font-weight: bold; background-color: #ddd; } tr.light{ } tr.dark{ background-color: #eee; } .reportTable{ text-align: left; width: 100%; } .reportsStatsTable{ text-align: left; width: 60%; } .optionEditor{ background-color: white; } .matrixTable td { border: 0px solid black; } tr.odd { background-color: #eee; } tr.even { background-color: #fff; } td { vertical-align: top; } /* Lists ------------------------------------------------------------------*/ .horizontal li{ display: inline; list-style-type: none; margin-right: 2em; } /* Searching -------------------------------------------------------------*/ .over80pc{ background-color: #CCFF99; } .over60pc{ background-color: #FFFF99; } .over30pc{ background-color: #FFCC99; } .lower30pc{ background-color: #FF9999; } /* Moodle -------------------------------------------------------------------*/ /*Turn off moodle grading*/ div.grading{ display: none; } /* hide review all questions on one page */ div.controls a{ display: none; } Index: questiontype.php =================================================================== RCS file: /cvsroot/stack/stack-dev/opaque/moodleModule/opaque/questiontype.php,v retrieving revision 1.9 retrieving revision 1.9.8.1 diff -C2 -d -r1.9 -r1.9.8.1 *** questiontype.php 23 Sep 2009 13:20:05 -0000 1.9 --- questiontype.php 9 Nov 2010 16:51:40 -0000 1.9.8.1 *************** *** 73,80 **** $contributions = array('<link rel="stylesheet" type="text/css" href="' . $this->plugin_baseurl() . '/styles.css" />'); ! /* TODO: remove this nasty hardwired hack */ ! $contributions[] = "<link rel=\"stylesheet\" type=\"text/css\" href=\"http://stack.bham.ac.uk/stack-dev/styles.css\" />"; ! $contributions[] = "<script type=\"text/javascript\" src=\"http://stack.bham.ac.uk/stack-dev/lib/ui/inputTypes/dragmath/dragmath.php\"></script>"; ! $contributions[] = "<script type=\"text/javascript\" src=\"http://stack.bham.ac.uk/stack-dev/lib/ui/helpPopup.js\"></script>"; return $contributions; --- 73,79 ---- $contributions = array('<link rel="stylesheet" type="text/css" href="' . $this->plugin_baseurl() . '/styles.css" />'); ! /* TOFIX: references to the STACK base below */ ! //$contributions[] = "<script type=\"text/javascript\" src=\"http://stack.bham.ac.uk/stack-dev/lib/ui/inputTypes/dragmath/dragmath.php\"></script>"; ! //$contributions[] = "<script type=\"text/javascript\" src=\"http://stack.bham.ac.uk/stack-dev/lib/ui/helpPopup.js\"></script>"; return $contributions; *************** *** 226,229 **** --- 225,231 ---- } + function print_question_grading_details(&$question, &$state, $cmoptions, $options) { + // No output in STACK, thanks. + } } |