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

Merge branch 'MDL-62852-master' of git://github.com/sarjona/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2018-07-25 16:38:47 +08:00
parent a77beeb245 7b3a113776
commit 6830ae12c7
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/policy/classes/output/page_viewalldoc.php
+1
View File
@@ -102,6 +102,7 @@ class page_viewalldoc implements renderable, templatable {
array_walk($data->policies, function($item, $key) { array_walk($data->policies, function($item, $key) {
$item->policytypestr = get_string('policydoctype'.$item->type, 'tool_policy'); $item->policytypestr = get_string('policydoctype'.$item->type, 'tool_policy');
$item->policyaudiencestr = get_string('policydocaudience'.$item->audience, 'tool_policy');
}); });
return $data; return $data;
admin/tool/policy/lang/en/tool_policy.php
+1
View File
@@ -84,6 +84,7 @@ $string['inactivatingconfirm'] = '<p>You are about to inactivate policy <em>\'{$
$string['inactivatingconfirmyes'] = 'Inactivate'; $string['inactivatingconfirmyes'] = 'Inactivate';
$string['invalidversionid'] = 'There is no policy with this identifier!'; $string['invalidversionid'] = 'There is no policy with this identifier!';
$string['irevokethepolicy'] = 'Withdraw user consent'; $string['irevokethepolicy'] = 'Withdraw user consent';
$string['listactivepolicies'] = 'List of active policies';
$string['minorchange'] = 'Minor change'; $string['minorchange'] = 'Minor change';
$string['minorchangeinfo'] = 'A minor change does not alter the meaning of the policy. Users are not required to agree to the policy again if the edit is marked as a minor change.'; $string['minorchangeinfo'] = 'A minor change does not alter the meaning of the policy. Users are not required to agree to the policy again if the edit is marked as a minor change.';
$string['managepolicies'] = 'Manage policies'; $string['managepolicies'] = 'Manage policies';
admin/tool/policy/templates/page_viewalldoc.mustache
+25 -9
View File
@@ -36,26 +36,42 @@
"name": "Terms &amp; conditions", "name": "Terms &amp; conditions",
"summary": "Policy <u>summary</u>", "summary": "Policy <u>summary</u>",
"content": "Policy <em>content</em>", "content": "Policy <em>content</em>",
"policytypestr": "Site policy" "policytypestr": "Site policy",
"policyaudiencestr": "All users"
}, },
{ {
"id": "5", "id": "5",
"name": "Privacy", "name": "Privacy",
"summary": "We keep your information private", "summary": "We keep your information private",
"content": "Very private", "content": "Very private",
"policytypestr": "Privacy policy" "policytypestr": "Privacy policy",
"policyaudiencestr": "Authenticated users"
} }
] ]
} }
}} }}
<a id="top"></a> <a id="top"></a>
<div id="policies_index" class="m-b-3"> <div id="policies_index">
<ul> <h1>{{# str }} listactivepolicies, tool_policy {{/ str }}</h1>
<table class="table">
<thead>
<tr>
<th scope="col">{{# str }}policydocname, tool_policy {{/ str }}</th>
<th scope="col">{{# str }}policydoctype, tool_policy {{/ str }}</th>
<th scope="col">{{# str }}policydocaudience, tool_policy {{/ str }}</th>
</tr>
</thead>
<tbody>
{{#policies }} {{#policies }}
<li><a href="#policy-{{id}}">{{{name}}} ({{{policytypestr}}})</a></li> <tr>
<td><a href="#policy-{{id}}">{{{name}}}</a></td>
<td>{{{ policytypestr }}}</td>
<td>{{{ policyaudiencestr }}}</td>
</tr>
{{/policies }} {{/policies }}
</ul> </tbody>
</table>
</div> </div>
{{^policies }} {{^policies }}
@@ -66,14 +82,14 @@
<hr> <hr>
<div class="policy_version m-b-3"> <div class="policy_version m-b-3">
<div class="clearfix m-t-2"> <div class="clearfix m-t-2">
<h1><a id="policy-{{id}}">{{{name}}}</a></h1> <h2><a id="policy-{{id}}">{{{name}}}</a></h2>
</div> </div>
<div class="policy_document_summary clearfix m-b-1"> <div class="policy_document_summary clearfix m-b-1">
<h2>{{# str }} policydocsummary, tool_policy {{/ str }}</h2> <h3>{{# str }} policydocsummary, tool_policy {{/ str }}</h3>
{{{summary}}} {{{summary}}}
</div> </div>
<div class="policy_document_content m-t-2"> <div class="policy_document_content m-t-2">
<h2>{{# str }} policydoccontent, tool_policy {{/ str }}</h2> <h3>{{# str }} policydoccontent, tool_policy {{/ str }}</h3>
{{{content}}} {{{content}}}
</div> </div>
<div class="pull-right"> <div class="pull-right">