qtype description: MDL-16863 Put back edit icon next to descriptions for teachers.

diff --git a/question/type/description/questiontype.php b/question/type/description/questiontype.php
index 0702378c3e135a7ce8beba5891f75a4cc07bc05c..36acbdd4693cbce50886df844803e0a14a0f2d32 100644 (file)
--- a/question/type/description/questiontype.php
+++ b/question/type/description/questiontype.php
@@ -59,8 +59,9 @@ class description_qtype extends default_questiontype {
         if (question_has_capability_on($question, 'edit')) {
             $stredit = get_string('edit');
             $linktext = '<img src="'.$CFG->pixpath.'/t/edit.gif" alt="'.$stredit.'" />';
-            $editlink = link_to_popup_window('/question/question.php?id='.$question->id.$cmorcourseid,
-                                             'editquestion', $linktext, 450, 550, $stredit, '', true);
+            $editlink = link_to_popup_window('/question/question.php?inpopup=1&amp;id=' .
+                    $question->id . $cmorcourseid, 'editquestion',
+                    $linktext, false, false, $stredit, '', true);
         }
 
         $questiontext = $this->format_text($question->questiontext, $question->questiontextformat, $cmoptions);

diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 4649a7e5630b28ee41fa1eda9503ad512e8e5b03..fea7b49519786e294ad8f0ca1260663f0263c45a 100644 (file)
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2686,11 +2686,12 @@ body.notes .notesgroup {
 }
 .que .content {
   float: left;
-  margin: 0;
+  margin: 0.5em 0;
   width: 88%;
 }
 .que.description .info {
-  display: none;
+  margin: 0.5em 0 0.5em 0.2em;
+  width: 1em;
 }
 .que.description .content,
 .que.description .generalfeedback {