Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
a800416b
Commit
a800416b
authored
Sep 19, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Sep 19, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1844073: Make GDPR statements and agreeing on them clearer"
parents
3b1ee970
94471697
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
10 deletions
+21
-10
htdocs/auth/lib.php
htdocs/auth/lib.php
+2
-1
htdocs/lang/en.utf8/admin.php
htdocs/lang/en.utf8/admin.php
+1
-0
htdocs/lang/en.utf8/mahara.php
htdocs/lang/en.utf8/mahara.php
+2
-1
htdocs/theme/raw/sass/_custom.scss
htdocs/theme/raw/sass/_custom.scss
+5
-0
htdocs/theme/raw/templates/privacy_modal.tpl
htdocs/theme/raw/templates/privacy_modal.tpl
+9
-7
htdocs/theme/raw/templates/privacy_panel_begin.tpl
htdocs/theme/raw/templates/privacy_panel_begin.tpl
+2
-1
No files found.
htdocs/auth/lib.php
View file @
a800416b
...
...
@@ -1071,11 +1071,12 @@ function privacy_form($ignoreagreevalue = false, $ignoreformswitch = false) {
'value'
=>
$privacy
->
id
,
);
if
(
!
$ignoreformswitch
)
{
$description
=
get_string
(
'register'
.
$privacy
->
type
,
'admin'
);
$elements
[
$privacy
->
institution
.
$privacy
->
type
]
=
array
(
'type'
=>
'switchbox'
,
'title'
=>
get_string
(
'privacyagreement'
,
'admin'
,
get_string
(
$privacy
->
type
.
'lowcase'
,
'admin'
)),
'description'
=>
$privacy
->
agreed
?
get_string
(
'privacyagreedto'
,
'admin'
,
get_string
(
$privacy
->
type
.
'lowcase'
,
'admin'
),
format_date
(
strtotime
(
$privacy
->
agreedtime
)))
:
''
,
get_string
(
$privacy
->
type
.
'lowcase'
,
'admin'
),
format_date
(
strtotime
(
$privacy
->
agreedtime
)))
:
$description
,
'defaultvalue'
=>
$privacy
->
agreed
?
true
:
false
,
'disabled'
=>
(
$privacy
->
agreed
&&
$ignoreagreevalue
)
?
true
:
false
,
'required'
=>
true
,
...
...
htdocs/lang/en.utf8/admin.php
View file @
a800416b
...
...
@@ -1481,6 +1481,7 @@ $string['hasrefused'] = 'has refused the privacy statement';
$string
[
'privacylowcase'
]
=
'privacy statement'
;
$string
[
'termsandconditionslowcase'
]
=
'terms and conditions'
;
$string
[
'hasrefused'
]
=
'has refused the %s'
;
$string
[
'suspendaccount'
]
=
'Suspend account'
;
$string
[
'privacyandtotheterms'
]
=
'privacy statement and to the terms and conditions'
;
$string
[
'privacyandtheterms'
]
=
'privacy statement and the terms and conditions'
;
$string
[
'consentdate'
]
=
'Date of consent / rejection'
;
...
...
htdocs/lang/en.utf8/mahara.php
View file @
a800416b
...
...
@@ -479,7 +479,8 @@ $string['accountinactivewarninghtml1'] = '<p>Dear %s,</p>
<p>Regards,<br>
%s site administrator</p>'
;
$string
[
'accountsuspended'
]
=
'Your account has been suspended as of %s.<br />The reason for your suspension is: %s'
;
$string
[
'accountsuspended'
]
=
'Your account has been suspended as of %s.
The reason for your suspension is: %s'
;
$string
[
'youraccounthasbeensuspended'
]
=
'Your account has been suspended.'
;
$string
[
'youraccounthasbeenunsuspended'
]
=
'Your account has been unsuspended.'
;
$string
[
'changepasswordinfo'
]
=
'You are required to change your password before you can proceed.'
;
...
...
htdocs/theme/raw/sass/_custom.scss
View file @
a800416b
...
...
@@ -872,3 +872,8 @@ a.online-users {
.controls
.btn-group
{
z-index
:
1
;
}
.consentbutton
div
,
.consentbutton
span
.description
{
padding
:
0px
!
important
;
}
htdocs/theme/raw/templates/privacy_modal.tpl
View file @
a800416b
...
...
@@ -3,7 +3,7 @@
<div
class=
"modal-dialog"
>
<div
class=
"modal-content"
>
<div
class=
"modal-header"
>
<button
type=
"button"
class=
"btn close"
data-dismiss=
"modal"
aria-label=
"
{
str
tag
=
Close
}
"
><span
aria-hidden=
"true"
>
×
</span></button>
<button
id=
"close-button"
type=
"button"
class=
"btn close"
data-dismiss=
"modal"
aria-label=
"
{
str
tag
=
Close
}
"
><span
aria-hidden=
"true"
>
×
</span></button>
<h4
class=
"modal-title"
>
{
str
tag
=
refuseprivacy
section
=
admin
}
</h4>
...
...
@@ -14,9 +14,11 @@
<textarea
id=
"reason"
rows=
"4"
cols=
"65"
placeholder=
"
{
str
tag
=
enterreason
section
=
admin
}
"
></textarea>
</p>
<p>
{
str
tag
=
confirmprivacyrefusal
section
=
admin
}
</p>
<div
class=
"btn-group"
>
<button
id=
"confirm-no-button"
type=
"button"
class=
"btn btn-secondary"
>
{
str
tag
=
"yes"
}
</button>
<button
id=
"back-button"
type=
"button"
class=
"btn btn-secondary"
>
{
str
tag
=
"no"
}
</button>
<div
class=
"default submitcancel form-group"
>
<button
id=
"suspend-account-btn"
class=
"btn-primary button btn"
>
{
str
tag
=
suspendaccount
section
=
admin
}
</button>
<button
id=
"back-button"
type=
"submit"
class=
"btn-secondary submitcancel cancel"
>
{
str
tag
=
"cancel"
}
</button>
</div>
</div>
</div>
...
...
@@ -37,7 +39,7 @@
}
});
$j
(
"
#
confirm-no-butto
n
"
).
on
(
'
click
'
,
function
()
{
$j
(
"
#
suspend-account-bt
n
"
).
on
(
'
click
'
,
function
()
{
acceptprivacy
=
true
;
$j
(
"
#privacy-confirm-form
"
).
modal
(
'
hide
'
);
formAbortProcessing
(
$j
(
"
#agreetoprivacy_submit
"
));
...
...
@@ -50,13 +52,13 @@
},
0
);
});
$j
(
"
#back-button
"
).
on
(
'
click
'
,
function
()
{
$j
(
"
#back-button
, #close-button
"
).
on
(
'
click
'
,
function
()
{
formAbortProcessing
(
$j
(
"
#agreetoprivacy_submit
"
));
$j
(
"
#privacy-confirm-form
"
).
modal
(
'
hide
'
);
});
$
(
'
.modal
'
).
on
(
'
shown.bs.modal
'
,
function
()
{
$
(
'
#
confirm-no-butto
n
'
).
trigger
(
"
focus
"
);
$
(
'
#
suspend-account-bt
n
'
).
trigger
(
"
focus
"
);
});
$
(
'
.modal
'
).
on
(
'
d-none.bs.modal
'
,
function
()
{
if
(
!
acceptprivacy
)
{
...
...
htdocs/theme/raw/templates/privacy_panel_begin.tpl
View file @
a800416b
...
...
@@ -9,7 +9,6 @@
<fieldset
class=
"pieform-fieldset last collapsible"
>
<legend>
<h4>
<a
{
if
$institutionprivacy
}
href=
"#dropdowninstprivacy"
...
...
@@ -44,3 +43,5 @@
{
$privacy
->
content
|
safe
}
</div>
{/
if
}
</div>
<div
class=
"fieldset-body consentbutton collapse
{
if
(!(
$privacy
->
agreed
&&
$ignoreagreevalue
)
||
$ignoreformswitch
)
}
show
{/
if
}
"
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment