Skip to content

Commit e5e09f3

Browse files
committed
MOBILE-2019 config: Add privacy policy
1 parent 81e73e1 commit e5e09f3

File tree

5 files changed

+12
-2
lines changed

5 files changed

+12
-2
lines changed

upgrade.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ information provided here is intended especially for developers.
2020
ionic state restore
2121
* mm-rich-text-editor now admits a new parameter adjust-height (default: true). It admits an HTML DOM Id string or boolean. Specifying it will adjust height of the editor to the selected element. If true it will adjust to the whole page and false will use height parameter instead.
2222
* Generators on stores are deprecated. Using generators will make Android < 4.4 fail. Use keyPath instead. They will be automatically generated if needed. DB Functions query, update and where are not allowed using compoung indexes see JSdoc DB functions on db.js for more info.
23+
* A new field has been added to config.json: privacypolicy.
2324

2425
=== 3.2 ===
2526

www/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
"customurlscheme": "moodlemobile",
1414
"siteurl": "",
1515
"skipssoconfirmation": "false",
16-
"forcedefaultlanguage": "false"
16+
"forcedefaultlanguage": "false",
17+
"privacypolicy": "https://moodle.org/mod/page/view.php?id=8148"
1718
}

www/core/components/settings/controllers/about.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ angular.module('mm.core.settings')
2727
$scope.versionname = mmCoreConfigConstants.versionname;
2828
$scope.appname = mmCoreConfigConstants.appname;
2929
$scope.versioncode = mmCoreConfigConstants.versioncode;
30+
$scope.privacyPolicy = mmCoreConfigConstants.privacypolicy;
3031

3132
$scope.navigator = $window.navigator;
3233
if ($window.location && $window.location.href) {

www/core/components/settings/lang/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"navigatorlanguage": "Navigator language",
4141
"navigatoruseragent": "Navigator userAgent",
4242
"networkstatus": "Internet connection status",
43+
"privacypolicy": "Privacy policy",
4344
"processorsettings": "Processor settings",
4445
"reportinbackground": "Report errors automatically",
4546
"settings": "Settings",

www/core/components/settings/templates/about.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ <h2>{{appname}} {{versionname}}</h2>
1111
<h2>Apache 2.0</h2>
1212
<p><a href="http://www.apache.org/licenses/LICENSE-2.0" mm-link auto-login="no">http://www.apache.org/licenses/LICENSE-2.0</a></p>
1313
</li>
14+
<li class="item item-divider" ng-if="privacyPolicy">
15+
<p>{{ 'mm.settings.privacypolicy' | translate }}</p>
16+
</li>
17+
<li class="item item-text-wrap" ng-if="privacyPolicy">
18+
<p><a ng-href="{{ privacyPolicy }}" mm-link auto-login="no">{{ privacyPolicy }}</a></p>
19+
</li>
1420
<li class="item item-divider">
1521
<p>{{ 'mm.settings.deviceinfo' | translate }}</p>
1622
</li>
@@ -24,7 +30,7 @@ <h2>Apache 2.0</h2>
2430
</li>
2531
<li class="item item-text-wrap" ng-if="filesystemroot">
2632
<p class="item-heading">{{ 'mm.settings.filesystemroot' | translate}}</p>
27-
<a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a>
33+
<p><a ng-if="fsclickable" ng-href="{{filesystemroot}}" mm-link auto-login="no">{{ filesystemroot }}</a></p>
2834
<p ng-if="!fsclickable">{{ filesystemroot }}</p>
2935
</li>
3036
<li class="item item-text-wrap" ng-if="navigator && navigator.userAgent">

0 commit comments

Comments
 (0)