L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-62395-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-10-09 23:06:47 +02:00
parent 957c839884 4db4682464
commit 3d92367a80
3 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/dataprivacy/styles.css
+9 -1
View File
@@ -35,4 +35,12 @@ dd a.contactdpo {
.context-level-view {
margin: 1em;
}
}
[data-region="purposes"] .col-name-description {
width: 25%;
}
[data-region="categories"] .col-description {
width: 50%;
}
admin/tool/dataprivacy/templates/categories.mustache
+2 -2
View File
@@ -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>
admin/tool/dataprivacy/templates/purposes.mustache
+25 -18
View File
@@ -63,26 +63,33 @@
{{#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-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>
<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">
<ul>
<td>
<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>
@@ -90,8 +97,8 @@
{{/formattedlawfulbases}}
</ul>
</td>
<td class="col-md-2">
<ul>
<td>
<ul class="list-unstyled">
{{#formattedsensitivedatareasons}}
<li>
<span>{{name}}{{# pix }} i/info, core, {{description}} {{/ pix }}</span>
@@ -99,8 +106,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 +115,7 @@
{{#str}}no{{/str}}
{{/protected}}
</td>
<td class="col-md-1">
<td>
{{#actions}}
{{> core/action_menu}}
{{/actions}}