From bd7573e471ad84fd003b2a2561c652cd53bee275 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 15 Aug 2018 11:07:46 +0800
Subject: [PATCH 1/2] MDL-62395 tool_dataprivacy: Fix tables display

* Use standard Bootstrap4 table classes for the categories and purposes
  tables.
* Set 25% width for the name and description columns of the purposes
  table.
* Set 50% width for the description column of the categories table.
---
 admin/tool/dataprivacy/styles.css             | 11 ++++++-
 .../dataprivacy/templates/categories.mustache |  4 +--
 .../dataprivacy/templates/purposes.mustache   | 32 +++++++++----------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/admin/tool/dataprivacy/styles.css b/admin/tool/dataprivacy/styles.css
index 4a3c9b9d244..c19dc6dfbd6 100644
--- a/admin/tool/dataprivacy/styles.css
+++ b/admin/tool/dataprivacy/styles.css
@@ -35,4 +35,13 @@ dd a.contactdpo {
 
 .context-level-view {
     margin: 1em;
-}
\ No newline at end of file
+}
+
+[data-region="purposes"] .col-description,
+[data-region="purposes"] .col-name {
+    width: 25%;
+}
+
+[data-region="categories"] .col-description {
+    width: 50%;
+}
diff --git a/admin/tool/dataprivacy/templates/categories.mustache b/admin/tool/dataprivacy/templates/categories.mustache
index 523a56b1990..ebe9ba577b8 100644
--- a/admin/tool/dataprivacy/templates/categories.mustache
+++ b/admin/tool/dataprivacy/templates/categories.mustache
@@ -56,12 +56,12 @@
             {{#pix}}t/add, moodle, {{#str}}addcategory, tool_dataprivacy{{/str}}{{/pix}}
         </button>
     </div>
-    <table class="generaltable fullwidth">
+    <table class="table table-striped table-hover">
         <caption class="accesshide">{{#str}}categorieslist, tool_dataprivacy{{/str}}</caption>
         <thead>
             <tr>
                 <th scope="col">{{#str}}name{{/str}}</th>
-                <th scope="col">{{#str}}description{{/str}}</th>
+                <th scope="col" class="col-description">{{#str}}description{{/str}}</th>
                 <th scope="col">{{#str}}actions{{/str}}</th>
             </tr>
         </thead>
diff --git a/admin/tool/dataprivacy/templates/purposes.mustache b/admin/tool/dataprivacy/templates/purposes.mustache
index b0d09896765..396ac82a408 100644
--- a/admin/tool/dataprivacy/templates/purposes.mustache
+++ b/admin/tool/dataprivacy/templates/purposes.mustache
@@ -63,25 +63,25 @@
             {{#pix}}t/add, moodle, {{#str}}addpurpose, tool_dataprivacy{{/str}}{{/pix}}
         </button>
     </div>
-    <table class="generaltable fullwidth">
+    <table class="table table-striped table-hover">
         <caption class="accesshide">{{#str}}purposeslist, tool_dataprivacy{{/str}}</caption>
         <thead>
-            <tr style="display: flex;">
-                <th scope="col" class="col-md-2">{{#str}}name{{/str}}</th>
-                <th scope="col" class="col-md-3">{{#str}}description{{/str}}</th>
-                <th scope="col" class="col-md-2">{{#str}}lawfulbases, tool_dataprivacy{{/str}}</th>
-                <th scope="col" class="col-md-2">{{#str}}sensitivedatareasons, tool_dataprivacy{{/str}}</th>
-                <th scope="col" class="col-md-1">{{#str}}retentionperiod, tool_dataprivacy{{/str}}</th>
-                <th scope="col" class="col-md-1">{{#str}}protected, tool_dataprivacy{{/str}}</th>
-                <th scope="col" class="col-md-1">{{#str}}actions{{/str}}</th>
+            <tr>
+                <th scope="col" class="col-name">{{#str}}name{{/str}}</th>
+                <th scope="col" class="col-description">{{#str}}description{{/str}}</th>
+                <th scope="col">{{#str}}lawfulbases, tool_dataprivacy{{/str}}</th>
+                <th scope="col">{{#str}}sensitivedatareasons, tool_dataprivacy{{/str}}</th>
+                <th scope="col">{{#str}}retentionperiod, tool_dataprivacy{{/str}}</th>
+                <th scope="col">{{#str}}protected, tool_dataprivacy{{/str}}</th>
+                <th scope="col">{{#str}}actions{{/str}}</th>
             </tr>
         </thead>
         <tbody>
             {{#purposes}}
             <tr data-purposeid="{{id}}">
-                <td class="col-md-2">{{{name}}}</td>
-                <td class="col-md-3">{{{description}}}</td>
-                <td class="col-md-2">
+                <td>{{{name}}}</td>
+                <td>{{{description}}}</td>
+                <td>
                     <ul>
                         {{#formattedlawfulbases}}
                             <li>
@@ -90,7 +90,7 @@
                         {{/formattedlawfulbases}}
                     </ul>
                 </td>
-                <td class="col-md-2">
+                <td>
                     <ul>
                         {{#formattedsensitivedatareasons}}
                             <li>
@@ -99,8 +99,8 @@
                         {{/formattedsensitivedatareasons}}
                     </ul>
                 </td>
-                <td class="col-md-1">{{formattedretentionperiod}}</td>
-                <td class="col-md-1">
+                <td>{{formattedretentionperiod}}</td>
+                <td>
                     {{#protected}}
                         {{#pix}}i/checked, core, {{#str}}yes{{/str}}{{/pix}}
                     {{/protected}}
@@ -108,7 +108,7 @@
                         {{#str}}no{{/str}}
                     {{/protected}}
                 </td>
-                <td class="col-md-1">
+                <td>
                     {{#actions}}
                         {{> core/action_menu}}
                     {{/actions}}

From 4db468246400cc4b95cb5033bd4e6107b2a21a01 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Tue, 2 Oct 2018 14:43:38 +0800
Subject: [PATCH 2/2] MDL-62395 tool_dataprivacy: Purpose name and description
 in one column

* Show the purpose's name and description under one column.
---
 admin/tool/dataprivacy/styles.css             |  3 +--
 .../dataprivacy/templates/purposes.mustache   | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/admin/tool/dataprivacy/styles.css b/admin/tool/dataprivacy/styles.css
index c19dc6dfbd6..836fac56232 100644
--- a/admin/tool/dataprivacy/styles.css
+++ b/admin/tool/dataprivacy/styles.css
@@ -37,8 +37,7 @@ dd a.contactdpo {
     margin: 1em;
 }
 
-[data-region="purposes"] .col-description,
-[data-region="purposes"] .col-name {
+[data-region="purposes"] .col-name-description {
     width: 25%;
 }
 
diff --git a/admin/tool/dataprivacy/templates/purposes.mustache b/admin/tool/dataprivacy/templates/purposes.mustache
index 396ac82a408..e331f7f811f 100644
--- a/admin/tool/dataprivacy/templates/purposes.mustache
+++ b/admin/tool/dataprivacy/templates/purposes.mustache
@@ -67,8 +67,7 @@
         <caption class="accesshide">{{#str}}purposeslist, tool_dataprivacy{{/str}}</caption>
         <thead>
             <tr>
-                <th scope="col" class="col-name">{{#str}}name{{/str}}</th>
-                <th scope="col" class="col-description">{{#str}}description{{/str}}</th>
+                <th scope="col" class="col-name-description">{{#str}}name{{/str}}</th>
                 <th scope="col">{{#str}}lawfulbases, tool_dataprivacy{{/str}}</th>
                 <th scope="col">{{#str}}sensitivedatareasons, tool_dataprivacy{{/str}}</th>
                 <th scope="col">{{#str}}retentionperiod, tool_dataprivacy{{/str}}</th>
@@ -79,10 +78,18 @@
         <tbody>
             {{#purposes}}
             <tr data-purposeid="{{id}}">
-                <td>{{{name}}}</td>
-                <td>{{{description}}}</td>
                 <td>
-                    <ul>
+                    <dl>
+                        <dt>
+                            {{{name}}}
+                        </dt>
+                        <dd>
+                            {{{description}}}
+                        </dd>
+                    </dl>
+                </td>
+                <td>
+                    <ul class="list-unstyled">
                         {{#formattedlawfulbases}}
                             <li>
                                 <span>{{name}}{{# pix }} i/info, core, {{description}} {{/ pix }}</span>
@@ -91,7 +98,7 @@
                     </ul>
                 </td>
                 <td>
-                    <ul>
+                    <ul class="list-unstyled">
                         {{#formattedsensitivedatareasons}}
                             <li>
                                 <span>{{name}}{{# pix }} i/info, core, {{description}} {{/ pix }}</span>