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

Merge "Adjusting more checkboxes to switchboxes for consistency (Bug 1482447)"

parents a39e5d8d 0e7b8f3a
...@@ -56,7 +56,7 @@ $form = array( ...@@ -56,7 +56,7 @@ $form = array(
) )
), ),
'emailusers' => array( 'emailusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('emailusersaboutnewaccount', 'admin'), 'title' => get_string('emailusersaboutnewaccount', 'admin'),
'description' => get_string('emailusersaboutnewaccountdescription', 'admin'), 'description' => get_string('emailusersaboutnewaccountdescription', 'admin'),
'defaultvalue' => true, 'defaultvalue' => true,
...@@ -90,7 +90,6 @@ function bulkimport_validate(Pieform $form, $values) { ...@@ -90,7 +90,6 @@ function bulkimport_validate(Pieform $form, $values) {
} }
require_once('csvfile.php'); require_once('csvfile.php');
$zipfile = $values['file']; $zipfile = $values['file'];
if (!is_file($zipfile)) { if (!is_file($zipfile)) {
$form->set_error('file', get_string('importfilenotafile', 'admin')); $form->set_error('file', get_string('importfilenotafile', 'admin'));
......
...@@ -98,19 +98,22 @@ $form = array( ...@@ -98,19 +98,22 @@ $form = array(
) )
), ),
'forcepasswordchange' => array( 'forcepasswordchange' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('forceuserstochangepassword', 'admin'), 'title' => get_string('forceuserstochangepassword', 'admin'),
'description' => get_string('forceuserstochangepassworddescription', 'admin'), 'description' => get_string('forceuserstochangepassworddescription', 'admin'),
'defaultvalue' => true, 'defaultvalue' => true,
), ),
'emailusers' => array( 'emailusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('emailusersaboutnewaccount', 'admin'), 'title' => get_string('emailusersaboutnewaccount', 'admin'),
'description' => get_string('emailusersaboutnewaccountdescription', 'admin'), 'description' => get_string('emailusersaboutnewaccountdescription', 'admin'),
'defaultvalue' => true, 'defaultvalue' => true,
), ),
'updateusers' => array( 'updateusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('updateusers', 'admin'), 'title' => get_string('updateusers', 'admin'),
'description' => get_string('updateusersdescription', 'admin'), 'description' => get_string('updateusersdescription', 'admin'),
'defaultvalue' => false, 'defaultvalue' => false,
......
...@@ -145,8 +145,8 @@ class PluginBlocktypeFolder extends PluginBlocktype { ...@@ -145,8 +145,8 @@ class PluginBlocktypeFolder extends PluginBlocktype {
); );
if (get_config_plugin('blocktype', 'folder', 'folderdownloadzip')) { if (get_config_plugin('blocktype', 'folder', 'folderdownloadzip')) {
$elements['folderdownloadzip'] = array( $elements['folderdownloadzip'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'labelhtml' => get_string('downloadfolderzipblock', 'artefact.file'), 'title' => get_string('downloadfolderzipblock', 'artefact.file'),
'description' => get_string('downloadfolderzipdescriptionblock', 'artefact.file'), 'description' => get_string('downloadfolderzipdescriptionblock', 'artefact.file'),
'defaultvalue' => (get_config_plugin('blocktype', 'folder', 'folderdownloadzip') ? (isset($configdata['folderdownloadzip']) ? $configdata['folderdownloadzip'] : 0) : 0), 'defaultvalue' => (get_config_plugin('blocktype', 'folder', 'folderdownloadzip') ? (isset($configdata['folderdownloadzip']) ? $configdata['folderdownloadzip'] : 0) : 0),
); );
......
...@@ -99,7 +99,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype { ...@@ -99,7 +99,7 @@ class PluginBlocktypeSocialprofile extends PluginBlocktype {
) )
), ),
'displayemail' => array( 'displayemail' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'labelhtml' => '<span class="pseudolabel">' . get_string('displaydefaultemail', 'blocktype.internal/socialprofile') . '</span>', 'labelhtml' => '<span class="pseudolabel">' . get_string('displaydefaultemail', 'blocktype.internal/socialprofile') . '</span>',
'defaultvalue' => (!empty($configdata['displayemail']) ? $configdata['displayemail'] : 0), 'defaultvalue' => (!empty($configdata['displayemail']) ? $configdata['displayemail'] : 0),
), ),
......
...@@ -145,7 +145,8 @@ class PluginAuthBrowserid extends PluginAuth { ...@@ -145,7 +145,8 @@ class PluginAuthBrowserid extends PluginAuth {
'value' => 'browserid', 'value' => 'browserid',
), ),
'weautocreateusers' => array( 'weautocreateusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('weautocreateusers', 'auth'), 'title' => get_string('weautocreateusers', 'auth'),
'defaultvalue' => self::$default_config['weautocreateusers'], 'defaultvalue' => self::$default_config['weautocreateusers'],
'help' => true 'help' => true
......
...@@ -1762,18 +1762,20 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1762,18 +1762,20 @@ class PluginAuthLdap extends PluginAuth {
'help' => true, 'help' => true,
), ),
'starttls' => array( 'starttls' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('starttls', 'auth.ldap'), 'title' => get_string('starttls', 'auth.ldap'),
'defaultvalue' => self::$default_config['starttls'], 'defaultvalue' => self::$default_config['starttls'],
), ),
'updateuserinfoonlogin' => array( 'updateuserinfoonlogin' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('updateuserinfoonlogin', 'auth.ldap'), 'title' => get_string('updateuserinfoonlogin', 'auth.ldap'),
'defaultvalue' => self::$default_config['updateuserinfoonlogin'], 'defaultvalue' => self::$default_config['updateuserinfoonlogin'],
'help' => true, 'help' => true,
), ),
'weautocreateusers' => array( 'weautocreateusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('weautocreateusers', 'auth.ldap'), 'title' => get_string('weautocreateusers', 'auth.ldap'),
'defaultvalue' => self::$default_config['weautocreateusers'], 'defaultvalue' => self::$default_config['weautocreateusers'],
'help' => true, 'help' => true,
...@@ -1815,18 +1817,18 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1815,18 +1817,18 @@ class PluginAuthLdap extends PluginAuth {
'collapsed' => (!self::$default_config['syncuserscron']), 'collapsed' => (!self::$default_config['syncuserscron']),
'elements' => array( 'elements' => array(
'syncuserscron' => array( 'syncuserscron' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncuserscron', 'auth.ldap'), 'title' => get_string('syncuserscron', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncuserscron'], 'defaultvalue' => self::$default_config['syncuserscron'],
), ),
'syncusersupdate' => array( 'syncusersupdate' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncusersupdate', 'auth.ldap'), 'title' => get_string('syncusersupdate', 'auth.ldap'),
'defaultvalue' => self::$default_config['syncusersupdate'], 'defaultvalue' => self::$default_config['syncusersupdate'],
), ),
'syncuserscreate' => array( 'syncuserscreate' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncuserscreate', 'auth.ldap'), 'title' => get_string('syncuserscreate', 'auth.ldap'),
'defaultvalue' => self::$default_config['syncuserscreate'], 'defaultvalue' => self::$default_config['syncuserscreate'],
), ),
...@@ -1856,13 +1858,13 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1856,13 +1858,13 @@ class PluginAuthLdap extends PluginAuth {
'collapsed' => (!self::$default_config['syncgroupscron']), 'collapsed' => (!self::$default_config['syncgroupscron']),
'elements' => array( 'elements' => array(
'syncgroupscron' => array( 'syncgroupscron' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncgroupscron', 'auth.ldap'), 'title' => get_string('syncgroupscron', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncgroupscron'], 'defaultvalue' => self::$default_config['syncgroupscron'],
), ),
'syncgroupsautocreate' => array( 'syncgroupsautocreate' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncgroupsautocreate', 'auth.ldap'), 'title' => get_string('syncgroupsautocreate', 'auth.ldap'),
'defaultvalue' => self::$default_config['syncgroupsautocreate'], 'defaultvalue' => self::$default_config['syncgroupsautocreate'],
), ),
...@@ -1889,7 +1891,7 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1889,7 +1891,7 @@ class PluginAuthLdap extends PluginAuth {
'value' => '<hr />', 'value' => '<hr />',
), ),
'syncgroupsbyclass' => array( 'syncgroupsbyclass' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('syncgroupsbyclass', 'auth.ldap'), 'title' => get_string('syncgroupsbyclass', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncgroupsbyclass'], 'defaultvalue' => self::$default_config['syncgroupsbyclass'],
...@@ -1913,13 +1915,15 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1913,13 +1915,15 @@ class PluginAuthLdap extends PluginAuth {
'defaultvalue' => self::$default_config['syncgroupsmemberattribute'], 'defaultvalue' => self::$default_config['syncgroupsmemberattribute'],
), ),
'syncgroupsmemberattributeisdn' => array( 'syncgroupsmemberattributeisdn' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('syncgroupsmemberattributeisdn', 'auth.ldap'), 'title' => get_string('syncgroupsmemberattributeisdn', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncgroupsmemberattributeisdn'], 'defaultvalue' => self::$default_config['syncgroupsmemberattributeisdn'],
), ),
'syncgroupsnestedgroups' => array( 'syncgroupsnestedgroups' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('syncgroupsnestedgroups', 'auth.ldap'), 'title' => get_string('syncgroupsnestedgroups', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncgroupsnestedgroups'], 'defaultvalue' => self::$default_config['syncgroupsnestedgroups'],
...@@ -1944,7 +1948,8 @@ class PluginAuthLdap extends PluginAuth { ...@@ -1944,7 +1948,8 @@ class PluginAuthLdap extends PluginAuth {
'value' => '<hr />', 'value' => '<hr />',
), ),
'syncgroupsbyuserfield' => array( 'syncgroupsbyuserfield' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('syncgroupsbyuserfield', 'auth.ldap'), 'title' => get_string('syncgroupsbyuserfield', 'auth.ldap'),
'help' => true, 'help' => true,
'defaultvalue' => self::$default_config['syncgroupsbyuserfield'], 'defaultvalue' => self::$default_config['syncgroupsbyuserfield'],
......
...@@ -401,7 +401,8 @@ class PluginAuthSaml extends PluginAuth { ...@@ -401,7 +401,8 @@ class PluginAuthSaml extends PluginAuth {
'help' => true, 'help' => true,
), ),
'institutionregex' => array( 'institutionregex' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('institutionregex', 'auth.saml'), 'title' => get_string('institutionregex', 'auth.saml'),
'defaultvalue' => self::$default_config['institutionregex'], 'defaultvalue' => self::$default_config['institutionregex'],
'help' => true, 'help' => true,
...@@ -416,26 +417,30 @@ class PluginAuthSaml extends PluginAuth { ...@@ -416,26 +417,30 @@ class PluginAuthSaml extends PluginAuth {
'help' => true, 'help' => true,
), ),
'remoteuser' => array( 'remoteuser' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('remoteuser', 'auth.saml'), 'title' => get_string('remoteuser', 'auth.saml'),
'defaultvalue' => self::$default_config['remoteuser'], 'defaultvalue' => self::$default_config['remoteuser'],
'help' => true, 'help' => true,
), ),
'loginlink' => array( 'loginlink' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('loginlink', 'auth.saml'), 'title' => get_string('loginlink', 'auth.saml'),
'defaultvalue' => self::$default_config['loginlink'], 'defaultvalue' => self::$default_config['loginlink'],
'disabled' => (self::$default_config['remoteuser'] ? false : true), 'disabled' => (self::$default_config['remoteuser'] ? false : true),
'help' => true, 'help' => true,
), ),
'updateuserinfoonlogin' => array( 'updateuserinfoonlogin' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('updateuserinfoonlogin', 'auth.saml'), 'title' => get_string('updateuserinfoonlogin', 'auth.saml'),
'defaultvalue' => self::$default_config['updateuserinfoonlogin'], 'defaultvalue' => self::$default_config['updateuserinfoonlogin'],
'help' => true, 'help' => true,
), ),
'weautocreateusers' => array( 'weautocreateusers' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'switchtext' => 'yesno',
'title' => get_string('weautocreateusers', 'auth.saml'), 'title' => get_string('weautocreateusers', 'auth.saml'),
'defaultvalue' => self::$default_config['weautocreateusers'], 'defaultvalue' => self::$default_config['weautocreateusers'],
'help' => true, 'help' => true,
......
...@@ -806,28 +806,28 @@ class PluginAuthXmlrpc extends PluginAuth { ...@@ -806,28 +806,28 @@ class PluginAuthXmlrpc extends PluginAuth {
); );
$elements['updateuserinfoonlogin'] = array( $elements['updateuserinfoonlogin'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('updateuserinfoonlogin', 'auth'), 'title' => get_string('updateuserinfoonlogin', 'auth'),
'defaultvalue' => self::$default_config['updateuserinfoonlogin'], 'defaultvalue' => self::$default_config['updateuserinfoonlogin'],
'help' => true 'help' => true
); );
$elements['weautocreateusers'] = array( $elements['weautocreateusers'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('weautocreateusers', 'auth'), 'title' => get_string('weautocreateusers', 'auth'),
'defaultvalue' => self::$default_config['weautocreateusers'], 'defaultvalue' => self::$default_config['weautocreateusers'],
'help' => true 'help' => true
); );
$elements['theyautocreateusers'] = array( $elements['theyautocreateusers'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('theyautocreateusers', 'auth'), 'title' => get_string('theyautocreateusers', 'auth'),
'defaultvalue' => self::$default_config['theyautocreateusers'], 'defaultvalue' => self::$default_config['theyautocreateusers'],
'help' => true 'help' => true
); );
$elements['weimportcontent'] = array( $elements['weimportcontent'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('weimportcontent', 'auth'), 'title' => get_string('weimportcontent', 'auth'),
'defaultvalue' => self::$default_config['weimportcontent'], 'defaultvalue' => self::$default_config['weimportcontent'],
'help' => true, 'help' => true,
......
...@@ -166,7 +166,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype { ...@@ -166,7 +166,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype {
), ),
), ),
'insecuresslmode' => array( 'insecuresslmode' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('insecuresslmode', 'blocktype.externalfeed'), 'title' => get_string('insecuresslmode', 'blocktype.externalfeed'),
'description' => get_string('insecuresslmodedesc', 'blocktype.externalfeed'), 'description' => get_string('insecuresslmodedesc', 'blocktype.externalfeed'),
'defaultvalue' => (bool)$insecuresslmode, 'defaultvalue' => (bool)$insecuresslmode,
...@@ -195,7 +195,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype { ...@@ -195,7 +195,7 @@ class PluginBlocktypeExternalfeed extends SystemBlocktype {
'maxvalue' => 20, 'maxvalue' => 20,
), ),
'full' => array( 'full' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('showfeeditemsinfull', 'blocktype.externalfeed'), 'title' => get_string('showfeeditemsinfull', 'blocktype.externalfeed'),
'description' => get_string('showfeeditemsinfulldesc', 'blocktype.externalfeed'), 'description' => get_string('showfeeditemsinfulldesc', 'blocktype.externalfeed'),
'defaultvalue' => (bool)$full, 'defaultvalue' => (bool)$full,
......
...@@ -140,7 +140,7 @@ class PluginBlocktypeInbox extends SystemBlocktype { ...@@ -140,7 +140,7 @@ class PluginBlocktypeInbox extends SystemBlocktype {
$title = get_string('type' . $type->name, 'activity'); $title = get_string('type' . $type->name, 'activity');
} }
$elements['types']['elements'][$type->name] = array( $elements['types']['elements'][$type->name] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => $title, 'title' => $title,
'defaultvalue' => isset($configdata[$type->name]) ? $configdata[$type->name] : 0, 'defaultvalue' => isset($configdata[$type->name]) ? $configdata[$type->name] : 0,
); );
......
...@@ -160,7 +160,7 @@ class PluginBlocktypeWall extends SystemBlocktype { ...@@ -160,7 +160,7 @@ class PluginBlocktypeWall extends SystemBlocktype {
'value' => get_string('maxcharacters', 'blocktype.wall', get_config_plugin('blocktype', 'wall', 'defaultpostsizelimit')) 'value' => get_string('maxcharacters', 'blocktype.wall', get_config_plugin('blocktype', 'wall', 'defaultpostsizelimit'))
), ),
'private' => array( 'private' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('makeyourpostprivate', 'blocktype.wall'), 'title' => get_string('makeyourpostprivate', 'blocktype.wall'),
), ),
'instance' => array( 'instance' => array(
......
...@@ -55,11 +55,10 @@ $elements = array( ...@@ -55,11 +55,10 @@ $elements = array(
'defaultvalue' => 'all', 'defaultvalue' => 'all',
), ),
'includefeedback' => array( 'includefeedback' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'class' => 'checkbox last', 'class' => 'last',
'title' => get_string('includefeedback', 'export'), 'title' => get_string('includefeedback', 'export'),
'description' => get_string('includefeedbackdescription', 'export'), 'description' => get_string('includefeedbackdescription', 'export'),
'separator' => '</div><div>',
'defaultvalue' => 1, 'defaultvalue' => 1,
), ),
); );
......
...@@ -466,7 +466,7 @@ class Collection { ...@@ -466,7 +466,7 @@ class Collection {
'help' => true, 'help' => true,
), ),
'navigation' => array( 'navigation' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('viewnavigation','collection'), 'title' => get_string('viewnavigation','collection'),
'description' => get_string('viewnavigationdesc','collection'), 'description' => get_string('viewnavigationdesc','collection'),
'defaultvalue' => 1, 'defaultvalue' => 1,
......
...@@ -159,7 +159,7 @@ class ImageBrowser { ...@@ -159,7 +159,7 @@ class ImageBrowser {
) )
), ),
'constrain' => array ( 'constrain' => array (
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string ( 'constrain' ), 'title' => get_string ( 'constrain' ),
'defaultvalue' => true 'defaultvalue' => true
), ),
......
...@@ -56,7 +56,7 @@ EOF; ...@@ -56,7 +56,7 @@ EOF;
) )
), ),
'sendweeklyupdates' => array( 'sendweeklyupdates' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('sendweeklyupdates', 'admin'), 'title' => get_string('sendweeklyupdates', 'admin'),
'defaultvalue' => true, 'defaultvalue' => true,
), ),
......
...@@ -88,7 +88,7 @@ $searchform['elements']['submit'] = array( ...@@ -88,7 +88,7 @@ $searchform['elements']['submit'] = array(
'value' => get_string('search'), 'value' => get_string('search'),
); );
$searchform['elements']['tagsonly'] = array( $searchform['elements']['tagsonly'] = array(
'type' => 'checkbox', 'type' => 'switchbox',
'value' => (isset($options['tagsonly']) && $options['tagsonly'] == true) ? true : false, 'value' => (isset($options['tagsonly']) && $options['tagsonly'] == true) ? true : false,
'title' => get_string('tagsonly', 'search.elasticsearch'), 'title' => get_string('tagsonly', 'search.elasticsearch'),
); );
......
...@@ -326,7 +326,7 @@ $elements['viewheader'] = array( ...@@ -326,7 +326,7 @@ $elements['viewheader'] = array(
), ),
), ),
'header_link_normal_underline' => array( 'header_link_normal_underline' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('linkunderlined', 'skin'), 'title' => get_string('linkunderlined', 'skin'),
'defaultvalue' => (isset($viewskin['header_link_normal_underline']) and intval($viewskin['header_link_normal_underline']) == 1 ? 'checked' : ''), 'defaultvalue' => (isset($viewskin['header_link_normal_underline']) and intval($viewskin['header_link_normal_underline']) == 1 ? 'checked' : ''),
), ),
...@@ -340,7 +340,7 @@ $elements['viewheader'] = array( ...@@ -340,7 +340,7 @@ $elements['viewheader'] = array(
), ),
), ),
'header_link_hover_underline' => array( 'header_link_hover_underline' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('linkunderlined', 'skin'), 'title' => get_string('linkunderlined', 'skin'),
'defaultvalue' => (isset($viewskin['header_link_hover_underline']) and intval($viewskin['header_link_hover_underline']) == 1 ? 'checked' : ''), 'defaultvalue' => (isset($viewskin['header_link_hover_underline']) and intval($viewskin['header_link_hover_underline']) == 1 ? 'checked' : ''),
), ),
...@@ -432,7 +432,7 @@ $elements['viewcontent'] = array( ...@@ -432,7 +432,7 @@ $elements['viewcontent'] = array(
), ),
), ),
'view_link_normal_underline' => array( 'view_link_normal_underline' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('linkunderlined', 'skin'), 'title' => get_string('linkunderlined', 'skin'),
'defaultvalue' => (isset($viewskin['view_link_normal_underline']) and intval($viewskin['view_link_normal_underline']) == 1 ? 'checked' : ''), 'defaultvalue' => (isset($viewskin['view_link_normal_underline']) and intval($viewskin['view_link_normal_underline']) == 1 ? 'checked' : ''),
), ),
...@@ -446,7 +446,7 @@ $elements['viewcontent'] = array( ...@@ -446,7 +446,7 @@ $elements['viewcontent'] = array(
), ),
), ),
'view_link_hover_underline' => array( 'view_link_hover_underline' => array(
'type' => 'checkbox', 'type' => 'switchbox',
'title' => get_string('linkunderlined', 'skin'), 'title' => get_string('linkunderlined', 'skin'),
'defaultvalue' => (isset($viewskin['view_link_hover_underline']) and intval($viewskin['view_link_hover_underline']) == 1 ? 'checked' : ''), 'defaultvalue' => (isset($viewskin['view_link_hover_underline']) and intval($viewskin['view_link_hover_underline']) == 1 ? 'checked' : ''),
), ),
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -67,6 +67,9 @@ ...@@ -67,6 +67,9 @@
label { label {
min-width: 100px; min-width: 100px;
} }
.form-switch label {
min-width: auto;
}
} }