Merge pull request #53 from NicoAlexH/dev

mathematical notation is now recognized by mathjax, description popup…
ndunand · Aug 18, 2021 · 3456a10 · 3456a10
2 parents c06a98b + 2614476
commit 3456a10
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 35 deletions.
diff --git a/edit_matrix_form.php b/edit_matrix_form.php
@@ -260,8 +260,8 @@ function add_matrix()
             $matrix[] = $builder->create_static('<td>');
 
             $matrix[] = $builder->create_static('<div class="input-group">');
-            $matrix[] = $builder->create_text("rows_shorttext[$row]", false);
 
+            $matrix[] = $builder->create_text("rows_shorttext[$row]", false);
             $question_popup = $builder->create_htmlpopup("rows_description[$row]", lang::row_long());
             $matrix = array_merge($matrix, $question_popup);
             $matrix[] = $builder->create_hidden("rowid[$row]");
@@ -272,7 +272,7 @@ function add_matrix()
             for ($col = 0; $col < $cols_count; $col++) {
                 $matrix[] = $builder->create_static('<td>');
                 $cell_content = $grading->create_cell_element($mform, $row, $col, $multiple);
-                $cell_content = $cell_content ? $cell_content : $builder->create_static('');
+                $cell_content = $cell_content ?: $builder->create_static('');
                 $matrix[] = $cell_content;
                 $matrix[] = $builder->create_static('</td>');
             }

diff --git a/renderer.php b/renderer.php
@@ -96,12 +96,12 @@ public static function matrix_header($header)
         if (strip_tags($description)) {
             $description = preg_replace('-^<p>-', '', $description);
             $description = preg_replace('-</p>$-', '', $description);
-            $description = '<span class="description" >' . $description . '</span>';
+            $description = '<span class="description" >' . format_text($description) . '</span>';
         } else {
             $description = '';
         }
 
-        return '<span class="title">' . $text . '</span>' . $description;
+        return '<span class="title">' . format_text($text) . '</span>' . $description;
     }
 
     protected static function checkbox($name, $checked, $readonly)

diff --git a/styles.css b/styles.css
@@ -138,6 +138,7 @@
   min-width: 383px;
   padding: 0;
   margin-left: 0;
+  z-index: 1;
 }
 .quedit.matrix .popup .title {
   display: block;
@@ -177,12 +178,6 @@
   background-position: 1px center;
   padding-left: 20px;
 }
-#id_add_rows, #id_add_cols{
-  font-size: 22px;
-  background-color: white;
-  color: black;
-  padding: 0px 5px 5px 5px;
-}
 /*
 mod_ND : BEGIN
 // TODO add .qtype_matrix_dndui selector where needed
@@ -214,7 +209,8 @@ mod_ND : BEGIN
   cursor: auto;
   opacity: 0.3;
 }
-.que.matrix.qtype_matrix_dndui .cell span.title, .que.matrix.qtype_matrix_dndui .cell.ui-droppable > span {
+.que.matrix.qtype_matrix_dndui .cell span.title,
+.que.matrix.qtype_matrix_dndui .cell.ui-droppable > span {
   padding: 1em 2em 1em 1em;
   border: 0.2em solid #999;
   position: relative;
@@ -252,6 +248,13 @@ body#page-question-type-matrix #page-content {
 body#page-question-type-matrix div#region-main {
   overflow-x: scroll;
 }
+#id_add_rows,
+#id_add_cols {
+  font-size: 22px;
+  background-color: white;
+  color: black;
+  padding: 0px 5px 5px 5px;
+}
 /*
 mod_ND : END
 */
diff --git a/stylesheets/less/base.less b/stylesheets/less/base.less
@@ -49,7 +49,7 @@
 
     .description {
         display: none;
-        position: fixed !important;
+        position: absolute;
 
         background-color: #EEEEEE;
         border: 1px solid @border-color;
@@ -71,7 +71,7 @@
         }
         &:hover{
             .description{
-                display: inline-block;
+                display: block;
             }
         }
     }
@@ -83,7 +83,7 @@
         }
         &:hover{
             .description{
-                display: inline-block;
+                display: block;
             }
         }
     }
@@ -190,6 +190,7 @@
         min-width: 383px;
         padding: 0;
         margin-left: 0;
+        z-index: 1;
 
         .title {
             display: block;
@@ -231,4 +232,3 @@
         color: #000000;
     }
 }
-
diff --git a/stylesheets/less/dndui.less b/stylesheets/less/dndui.less
@@ -38,7 +38,7 @@ mod_ND : BEGIN
     opacity: 0.3;
 }
 
-.que.matrix.qtype_matrix_dndui .cell span {
+.que.matrix.qtype_matrix_dndui .cell span.title, .que.matrix.qtype_matrix_dndui .cell.ui-droppable > span {
     padding: 1em 2em 1em 1em;
     border: 0.2em solid #999;
     position: relative;
@@ -85,6 +85,13 @@ body#page-question-type-matrix div#region-main {
     overflow-x: scroll;
 }
 
+#id_add_rows, #id_add_cols{
+  font-size: 22px;
+  background-color: white;
+  color: black;
+  padding: 0px 5px 5px 5px;
+}
+
 /*
 mod_ND : END
 */
diff --git a/stylesheets/less/pix.less b/stylesheets/less/pix.less
@@ -2,24 +2,8 @@
 #id_refresh_matrix {
     background-image: url([[pix:a/refresh]]);
     background-repeat: no-repeat;
+    background-color: white;
+    color: black;
     background-position: 1px center;
     padding-left: 20px;
-}
-
-.pbutton.close {
-    background-image: url([[pix:qtype_matrix|close]]);
-    background-repeat: no-repeat;
-    background-position: center center;
-    vertical-align: super;
-    width: 20px;
-    height: 20px;
-    color: transparent;
-}
-
-.button.add {
-    background-image: url([[pix:qtype_matrix|add]]);
-    background-repeat: no-repeat;
-    background-position: center center;
-    display: inline-block;
-    min-width: 25px;
-}
+}