Commit 10934688 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Cookie Consent: Change checkboxes to switchboxes (Bug 1431569)"

parents 5c684362 a18fccf0
......@@ -34,7 +34,7 @@ $form = pieform(array(
'pluginname' => 'admin',
'elements' => array(
'enabled' => array(
'type' => 'checkbox',
'type' => 'switchbox',
'title' => get_string('cookieconsentenable','cookieconsent'),
'defaultvalue' => $enabled,
),
......@@ -128,9 +128,9 @@ $form = pieform(array(
),
),
'hideprivacytab' => array(
'type' => 'checkbox',
'type' => 'switchbox',
'title' => get_string('hideprivacytab','cookieconsent'),
'description' => get_string('hideprivacytabdesc','cookieconsent'),
'description' => get_string('hideprivacytabdesc1','cookieconsent'),
'defaultvalue' => (!empty($configdata['hideprivacytab']) ? hsc($configdata['hideprivacytab']) : false),
),
),
......@@ -142,21 +142,21 @@ $form = pieform(array(
'legend' => get_string('featureoptions', 'cookieconsent'),
'elements' => array(
'refreshonconsent' => array(
'type' => 'checkbox',
'type' => 'switchbox',
'title' => get_string('pagerefresh','cookieconsent'),
'description' => get_string('pagerefreshdesc','cookieconsent'),
'description' => get_string('pagerefreshdesc1','cookieconsent'),
'defaultvalue' => (!empty($configdata['refreshonconsent']) ? hsc($configdata['refreshonconsent']) : false),
),
'ignoredonottrack' => array(
'type' => 'checkbox',
'type' => 'switchbox',
'title' => get_string('ignoredonottrack','cookieconsent'),
'description' => get_string('ignoredonottrackdesc','cookieconsent'),
'description' => get_string('ignoredonottrackdesc1','cookieconsent'),
'defaultvalue' => (!empty($configdata['ignoredonottrack']) ? hsc($configdata['ignoredonottrack']) : false),
),
'usessl' => array(
'type' => 'checkbox',
'type' => 'switchbox',
'title' => get_string('usessl','cookieconsent'),
'description' => get_string('usessldesc','cookieconsent'),
'description' => get_string('usessldesc1','cookieconsent'),
'defaultvalue' => (!empty($configdata['usessl']) ? hsc($configdata['usessl']) : false),
),
),
......
......@@ -112,15 +112,15 @@ $string['tabpositionbottomleft'] = 'Bottom left';
$string['tabpositionverticalleft'] = 'Left side';
$string['tabpositionverticalright'] = 'Right side';
$string['hideprivacytab'] = 'Hide privacy settings tab';
$string['hideprivacytabdesc'] = 'If you plan to use your own privacy settings link in-line (e.g. in your theme\'s template), you may wish to disable the standard privacy settings tab.';
$string['hideprivacytabdesc1'] = 'If you plan to use your own privacy settings link in-line (e.g. in your theme\'s template), you may wish to turn off the standard privacy settings tab.';
$string['featureoptions'] = 'Feature options';
$string['pagerefresh'] = 'Page refresh';
$string['pagerefreshdesc'] = 'If you have a server-side application that needs to be aware of the consent to cookies, selecting this option will cause the page to be reloaded after consent has been given.';
$string['pagerefreshdesc1'] = 'If you have a server-side application that needs to be aware of the consent to cookies, turning this option on will cause the page to be reloaded after consent has been given.';
$string['ignoredonottrack'] = 'Ignore "do not track"';
$string['ignoredonottrackdesc'] = 'Enabling this setting will mean Cookie Consent ignores any "do not track" headers from the visitor\'s browser.';
$string['ignoredonottrackdesc1'] = 'Turning this option on will mean Cookie Consent ignores any "do not track" headers from the visitor\'s browser.';
$string['usessl'] = 'Use SSL';
$string['usessldesc'] = 'If any of the pages Cookie Consent appears on use SSL, you will need to select this option.';
$string['usessldesc1'] = 'If any of the pages Cookie Consent appears on use SSL, you will need to turn this option on.';
/* ===== COOKIE CONSENT strings ===== */
/* ----- General ----- */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment