From: pilpi Date: Fri, 28 Nov 2008 15:16:40 +0000 (+0000) Subject: quiz editing: MDL-17451 CSS and whitespace fixes to truncate overlong question catego... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=7b2c3bde9eefafc79f67f02e2f0958beef120e12;p=moodle.git quiz editing: MDL-17451 CSS and whitespace fixes to truncate overlong question category name Tested on opera 9.27, IE6, Firefox 3 on Ubuntu Linux 8.04 --- diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 690dc6b16c..e7b300e607 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -909,7 +909,7 @@ function quiz_print_singlequestion_reordertool(&$question, &$questionurl, &$quiz $editstring="out(false, array('id'=>$question->id)). "\">pixpath/t/edit.gif\" alt=\"". - $stredit."\" /> "; + $stredit."\" />"; } elseif (question_has_capability_on($question, 'view', $question->category)){ echo "$reordercheckboxlabel". diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index 89bdf151fe..f0072ff488 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -766,7 +766,7 @@ function quiz_question_preview_button($quiz, $question, $label=true) { $strpreview = get_string('previewquestion', 'quiz'); $strpreviewlabel=""; if($label){ - $strpreviewlabel = " ".get_string('preview', 'quiz'); + $strpreviewlabel = get_string('preview', 'quiz'); } $quizorcourseid = $quiz->id?('&quizid=' . $quiz->id):('&courseid=' .$COURSE->id); return link_to_popup_window('/question/preview.php?id=' . $question->id . $quizorcourseid, 'questionpreview', diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css index 75498c912f..cfdea06666 100644 --- a/theme/standard/styles_color.css +++ b/theme/standard/styles_color.css @@ -1134,6 +1134,13 @@ bank window's title is prominent enough*/ #mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul{ color:#555; } +#mod-quiz-edit div.question div.content div.singlequestion .questionpreview{ + background-color:#eee; +} + +#mod-quiz-edit div.question div.content .questionpreview a{ + background-color:#eee; +} #mod-quiz-edit .questioncontentcontainer div.randomquestionqlist .totalquestionsinrandomqcategory{ color:#000; } diff --git a/theme/standard/styles_ie6.css b/theme/standard/styles_ie6.css index 6ff585e375..1d38d3f307 100755 --- a/theme/standard/styles_ie6.css +++ b/theme/standard/styles_ie6.css @@ -69,11 +69,12 @@ form.mform textarea { #mod-quiz-review #middle-column { height: 1%; } -#mod-quiz-edit div.question div.content .questionname, -#categoryquestions .questionname{ +#mod-quiz-edit div.question div.content .questiontext, +#mod-quiz-edit #categoryquestions .questionname{ /*ie6 shows this as an arrow if this is not specified*/ cursor: pointer; } +#mod-quiz-edit div.question div.content .questionname, #mod-quiz-edit #categoryquestions .questiontext{ /*ie6 shows this as an arrow if this is not specified*/ cursor: pointer; @@ -90,3 +91,9 @@ form.mform textarea { #mod-quiz-edit div.question div.content .questionname,#categoryquestions .questionname{ width:20%; } +#mod-quiz-edit .editq div.question div.content .randomquestioncategory a{ + width:40%; +} +#mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{ + width: 35%; +} \ No newline at end of file diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index f9949f631a..e638425a33 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -4683,7 +4683,7 @@ table.quizreviewsummary td.cell { position:relative; zoom:1; padding-left:0.3em; - max-width:50%; + max-width:40%; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; @@ -4710,7 +4710,6 @@ table.quizreviewsummary td.cell { margin-left:0.3em; padding-left:0.2em; padding-right:0.2em; - background-color:#eee; } #mod-quiz-edit div.question div.content div.quiz_randomquestion .questionpreview{ @@ -4828,6 +4827,60 @@ table.quizreviewsummary td.cell { margin:0; padding:0; } +#mod-quiz-edit .reorder .questioncontentcontainer .quiz_randomquestion{ + + position:relative; +} + +#mod-quiz-edit .reorder div.question div.content div.quiz_randomquestion{ + line-height:1em; +} + +#mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory label{ + max-width: 25%; + overflow:hidden; + padding-left:0.3em; + white-space:nowrap; + display:inline-block; +} +#mod-quiz-edit .reorder .questioncontentcontainer .randomquestionfromcategory label{ + overflow:hidden; + white-space:nowrap; + display:inline-block; +} + +#mod-quiz-edit .editq div.question div.content .randomquestioncategory{ + position:relative; + display:inline-block; + +} + +#mod-quiz-edit .editq div.question div.content .randomquestioncategory a{ + display:block; + max-width:15em; + overflow: hidden; + text-overflow:ellipsis; + -o-text-overflow:ellipsis; + white-space: nowrap; + float:left; + position:relative; +} +#mod-quiz-edit .editq div.question div.content .questionpreview{ + float:left; +} +#mod-quiz-edit .editq div.question div.content .questionpreview a{ + font-weight:normal; + margin-left:0em; + display:inline; + float:none; +} +#mod-quiz-edit .editq div.question div.content .randomquestioncategory .questionpreview img{ + padding-right:0.3em; +} + +#mod-quiz-edit .questioncontentcontainer div.randomquestionqlist ul li img{ + padding-right:0.3em; +} #mod-quiz-edit .reorder .questioncontentcontainer .randomquestioncategory,