Merge branch 'MDL-62373_master' of git://github.com/dmonllao/moodle

rudivdme · May 11, 2018 · cef2c01 · cef2c01
2 parents b513b36 + 7258bf0
commit cef2c01
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/admin/tool/dataprivacy/classes/output/renderer.php b/admin/tool/dataprivacy/classes/output/renderer.php
@@ -62,7 +62,8 @@ public function render_my_data_requests_page(my_data_requests_page $page) {
     public function render_contact_dpo_link($replytoemail) {
         $params = [
             'data-action' => 'contactdpo',
-            'data-replytoemail' => $replytoemail
+            'data-replytoemail' => $replytoemail,
+            'class' => 'contactdpo'
         ];
         return html_writer::link('#', get_string('contactdataprotectionofficer', 'tool_dataprivacy'), $params);
     }

diff --git a/admin/tool/dataprivacy/styles.css b/admin/tool/dataprivacy/styles.css
@@ -14,3 +14,13 @@
     height: 70vh;
     overflow-y: scroll;
 }
+
+dd a.contactdpo {
+    /* Reverting dd's left margin */
+    margin-left: -10px;
+}
+
+.card dd a.contactdpo {
+    /* Reverting dd's left margin */
+    margin-left: inherit;
+}
diff --git a/admin/tool/dataprivacy/templates/contact_dpo.mustache b/admin/tool/dataprivacy/templates/contact_dpo.mustache
@@ -36,7 +36,7 @@
     }
 }}
 <div class="container">
-    <div class="row">
+    <div class="row m-b-2">
         <label class="col-md-3 span3 col-form-label">{{#str}}replyto, tool_dataprivacy{{/str}}</label>
         <div class="col-md-9 span9 col-form-label">{{replytoemail}}</div>
     </div>