Commit 8df87b1d authored by Naomi Guyer's avatar Naomi Guyer Committed by Robert Lyon

More bootstrap tidy up fixes (BUG 1465107)

Change-Id: I6bbd0edde9b09c7a01cc0e36fa5bfe55972a14e8
parent 3586cf12
...@@ -78,7 +78,7 @@ $deleteall = pieform(array( ...@@ -78,7 +78,7 @@ $deleteall = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('deleteallnotifications', 'activity'), 'value' => get_string('deleteallnotifications', 'activity'),
'confirm' => get_string('reallydeleteallnotifications', 'activity'), 'confirm' => get_string('reallydeleteallnotifications', 'activity'),
), ),
......
...@@ -24,7 +24,7 @@ $elements = get_notification_settings_elements($USER); ...@@ -24,7 +24,7 @@ $elements = get_notification_settings_elements($USER);
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('save'), 'value' => get_string('save'),
); );
......
...@@ -26,7 +26,7 @@ $deleteform = pieform(array( ...@@ -26,7 +26,7 @@ $deleteform = pieform(array(
'pluginname' => 'account', 'pluginname' => 'account',
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'class' => 'btn btn-default', 'class' => 'btn-default',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('deleteaccount', 'mahara', display_username($USER), full_name($USER)), 'value' => get_string('deleteaccount', 'mahara', display_username($USER), full_name($USER)),
), ),
......
...@@ -110,7 +110,7 @@ if ($blogcount != 1 && $prefs->multipleblogs == 1) { ...@@ -110,7 +110,7 @@ if ($blogcount != 1 && $prefs->multipleblogs == 1) {
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('save') 'value' => get_string('save')
); );
......
...@@ -206,7 +206,7 @@ if (!empty($institutions) && ...@@ -206,7 +206,7 @@ if (!empty($institutions) &&
'defaultvalue' => $USER->studentid, 'defaultvalue' => $USER->studentid,
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('sendrequest'), 'value' => get_string('sendrequest'),
), ),
......
...@@ -34,7 +34,7 @@ $reloadform = pieform(array( ...@@ -34,7 +34,7 @@ $reloadform = pieform(array(
'reload' => array( 'reload' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('install', 'admin'), 'value' => get_string('install', 'admin'),
), ),
), ),
......
...@@ -45,7 +45,7 @@ $newform = pieform(array( ...@@ -45,7 +45,7 @@ $newform = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('add'), 'value' => get_string('add'),
), ),
), ),
...@@ -78,7 +78,7 @@ foreach ($iframesources as $url => $name) { ...@@ -78,7 +78,7 @@ foreach ($iframesources as $url => $name) {
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-primary btn-sm', 'class' => 'btn-primary btn-sm',
'value' => get_string('save'), 'value' => get_string('save'),
), ),
); );
...@@ -100,7 +100,7 @@ foreach ($iframesources as $url => $name) { ...@@ -100,7 +100,7 @@ foreach ($iframesources as $url => $name) {
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'class' => 'btn btn-default btn-sm', 'class' => 'btn-default btn-sm',
'usebuttontag' => true, 'usebuttontag' => true,
'value' => '<span class="icon icon-trash icon-lg text-danger"></span><span class="sr-only">'. get_string('delete') . '</span>', 'value' => '<span class="icon icon-trash icon-lg text-danger"></span><span class="sr-only">'. get_string('delete') . '</span>',
......
...@@ -29,7 +29,7 @@ $form = pieform(array( ...@@ -29,7 +29,7 @@ $form = pieform(array(
'elements' => array( 'elements' => array(
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-default', 'class' => 'btn-default',
'value' => array(get_string('yes'), get_string('no')), 'value' => array(get_string('yes'), get_string('no')),
'goto' => get_config('wwwroot') . 'admin/groups/groups.php', 'goto' => get_config('wwwroot') . 'admin/groups/groups.php',
) )
......
...@@ -30,7 +30,7 @@ $optionform = pieform(array( ...@@ -30,7 +30,7 @@ $optionform = pieform(array(
'defaultvalue' => get_config('allowgroupcategories'), 'defaultvalue' => get_config('allowgroupcategories'),
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('submit'), 'value' => get_string('submit'),
), ),
......
...@@ -43,7 +43,7 @@ $searchform = pieform(array( ...@@ -43,7 +43,7 @@ $searchform = pieform(array(
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-primary input-group-btn', 'class' => 'btn-primary input-group-btn',
'value' => get_string('search'), 'value' => get_string('search'),
) )
), ),
......
...@@ -37,7 +37,7 @@ $quotasform = pieform(array( ...@@ -37,7 +37,7 @@ $quotasform = pieform(array(
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-primary no-label', 'class' => 'btn-primary ',
'value' => get_string('save'), 'value' => get_string('save'),
), ),
'description' => array( 'description' => array(
...@@ -94,7 +94,7 @@ $groupadminsform = pieform(array( ...@@ -94,7 +94,7 @@ $groupadminsform = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('save'), 'value' => get_string('save'),
), ),
), ),
......
...@@ -81,7 +81,7 @@ $form = array( ...@@ -81,7 +81,7 @@ $form = array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('uploadgroupcsv', 'admin') 'value' => get_string('uploadgroupcsv', 'admin')
) )
) )
......
...@@ -56,7 +56,7 @@ $form = array( ...@@ -56,7 +56,7 @@ $form = array(
'readonly' => TRUE, 'readonly' => TRUE,
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('uploadgroupmemberscsv', 'admin') 'value' => get_string('uploadgroupmemberscsv', 'admin')
) )
......
...@@ -54,7 +54,7 @@ $closeform = pieform(array( ...@@ -54,7 +54,7 @@ $closeform = pieform(array(
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'value' => get_string($closed ? 'Open' : 'Close', 'admin'), 'value' => get_string($closed ? 'Open' : 'Close', 'admin'),
'class' => $closed ? 'btn btn-success' : 'btn btn-default' 'class' => $closed ? 'btn-success' : 'btn-default'
), ),
), ),
)); ));
......
...@@ -169,7 +169,7 @@ $form = pieform(array( ...@@ -169,7 +169,7 @@ $form = pieform(array(
), ),
), ),
'submit' => array( 'submit' => array(
'class' => 'mtl btn btn-success', 'class' => 'mtl btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
), ),
......
...@@ -66,7 +66,7 @@ $elements = array( ...@@ -66,7 +66,7 @@ $elements = array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('licensesave', 'admin'), 'value' => get_string('licensesave', 'admin'),
), ),
); );
......
...@@ -285,7 +285,7 @@ foreach ($all as $k => $v) { ...@@ -285,7 +285,7 @@ foreach ($all as $k => $v) {
); );
} }
$footerelements['submit'] = array( $footerelements['submit'] = array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
); );
......
...@@ -98,7 +98,7 @@ $networkingform = pieform( ...@@ -98,7 +98,7 @@ $networkingform = pieform(
'class' => 'btn-group', 'class' => 'btn-group',
'elements' => array ( 'elements' => array (
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'name' => 'submit', 'name' => 'submit',
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
...@@ -106,7 +106,7 @@ $networkingform = pieform( ...@@ -106,7 +106,7 @@ $networkingform = pieform(
'value' => 'submit' 'value' => 'submit'
), ),
'deletesubmit' => array( 'deletesubmit' => array(
'class' => 'btn btn-default', 'class' => 'btn-default',
'name' => 'submit', // must be called submit so we can access it's value 'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
......
...@@ -774,7 +774,7 @@ $siteoptionform = array( ...@@ -774,7 +774,7 @@ $siteoptionform = array(
$siteoptionform['elements']['submit'] = array( $siteoptionform['elements']['submit'] = array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('updatesiteoptions', 'admin') 'value' => get_string('updatesiteoptions', 'admin')
); );
......
...@@ -65,7 +65,7 @@ $form = pieform(array( ...@@ -65,7 +65,7 @@ $form = pieform(array(
) )
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
), ),
......
...@@ -118,7 +118,7 @@ $elements = array( ...@@ -118,7 +118,7 @@ $elements = array(
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'value' => get_string('createuser', 'admin'), 'value' => get_string('createuser', 'admin'),
'class' => 'btn btn-success btn-lg btn-block mtm', 'class' => 'btn-success btn-lg btn-block mtm',
), ),
); );
......
...@@ -79,7 +79,7 @@ if ($institution && $plugin) { ...@@ -79,7 +79,7 @@ if ($institution && $plugin) {
$form['elements']['submit'] = array( $form['elements']['submit'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => array(get_string('submit'), get_string('cancel')), 'value' => array(get_string('submit'), get_string('cancel')),
'goto' => 'addauthority.php?c=1' 'goto' => 'addauthority.php?c=1'
); );
......
...@@ -45,7 +45,7 @@ $form = pieform(array( ...@@ -45,7 +45,7 @@ $form = pieform(array(
) )
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('submit') 'value' => get_string('submit')
) )
......
...@@ -101,7 +101,7 @@ $suspendform = pieform(array( ...@@ -101,7 +101,7 @@ $suspendform = pieform(array(
'suspend' => array( 'suspend' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-default input-group-btn no-label', 'class' => 'btn-default input-group-btn no-label',
'value' => get_string('Suspend', 'admin'), 'value' => get_string('Suspend', 'admin'),
) )
) )
...@@ -132,7 +132,7 @@ if (count($options) > 1) { ...@@ -132,7 +132,7 @@ if (count($options) > 1) {
'changeauth' => array( 'changeauth' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-default input-group-btn no-label', 'class' => 'btn-default input-group-btn no-label',
'value' => get_string('changeauthmethod', 'admin') 'value' => get_string('changeauthmethod', 'admin')
) )
) )
...@@ -158,7 +158,7 @@ if (is_using_probation()) { ...@@ -158,7 +158,7 @@ if (is_using_probation()) {
), ),
'setprobation' => array( 'setprobation' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-primary', 'class' => 'btn-primary',
'confirm' => get_string('probationbulkconfirm', 'admin'), 'confirm' => get_string('probationbulkconfirm', 'admin'),
'value' => get_string('probationbulkset', 'admin'), 'value' => get_string('probationbulkset', 'admin'),
) )
...@@ -176,7 +176,7 @@ $deleteform = pieform(array( ...@@ -176,7 +176,7 @@ $deleteform = pieform(array(
'delete' => array( 'delete' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-default no-label', 'class' => 'btn-default no-label',
'confirm' => get_string('confirmdeleteusers', 'admin'), 'confirm' => get_string('confirmdeleteusers', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times prs text-danger"></span>' . get_string('deleteusers', 'admin'), 'value' => '<span class="icon icon-lg icon-user-times prs text-danger"></span>' . get_string('deleteusers', 'admin'),
), ),
......
...@@ -58,7 +58,7 @@ $form = array( ...@@ -58,7 +58,7 @@ $form = array(
'value' => $institution, 'value' => $institution,
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('submit') 'value' => get_string('submit')
) )
......
...@@ -99,7 +99,7 @@ $form = pieform(array( ...@@ -99,7 +99,7 @@ $form = pieform(array(
), ),
'submit' => array( 'submit' => array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => get_string('savechanges', 'admin') 'value' => get_string('savechanges', 'admin')
), ),
) )
......
...@@ -189,7 +189,7 @@ if ($institution || $add) { ...@@ -189,7 +189,7 @@ if ($institution || $add) {
), ),
'submit' => array( 'submit' => array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-default', 'class' => 'btn-default',
'value' => array(get_string('yes'), get_string('no')) 'value' => array(get_string('yes'), get_string('no'))
) )
) )
...@@ -579,7 +579,7 @@ if ($institution || $add) { ...@@ -579,7 +579,7 @@ if ($institution || $add) {
$elements['submit'] = array( $elements['submit'] = array(
'type' => 'submitcancel', 'type' => 'submitcancel',
'class' => 'btn btn-success', 'class' => 'btn-success',
'value' => array(get_string('submit'), get_string('cancel')) 'value' => array(get_string('submit'), get_string('cancel'))
); );
...@@ -628,7 +628,7 @@ else { ...@@ -628,7 +628,7 @@ else {
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-primary input-group-btn', 'class' => 'btn-primary input-group-btn',
'value' => get_string('search'), 'value' => get_string('search'),
) )
), ),
...@@ -1070,7 +1070,7 @@ if ($institution && $institution != 'mahara') { ...@@ -1070,7 +1070,7 @@ if ($institution && $institution != 'mahara') {
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-danger icon-ban prm"></span>' . get_string('suspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-danger icon-ban prm"></span>' . get_string('suspendinstitution','admin'),
), ),
) )
...@@ -1092,7 +1092,7 @@ if ($institution && $institution != 'mahara') { ...@@ -1092,7 +1092,7 @@ if ($institution && $institution != 'mahara') {
'submit' => array( 'submit' => array(
'type' => 'button', 'type' => 'button',
'usebuttontag' => true, 'usebuttontag' => true,
'class' => 'btn btn-default', 'class' => 'btn-default',
'value' => '<span class="icon icon-lg text-success icon-check prm"></span>' . get_string('unsuspendinstitution','admin'), 'value' => '<span class="icon icon-lg text-success icon-check prm"></span>' . get_string('unsuspendinstitution','admin'),
'description' => get_string('unsuspendinstitutiondescription','admin'), 'description' => get_string('unsuspendinstitutiondescription','admin'),
), ),
......
...@@ -59,7 +59,7 @@ $form = array( ...@@ -59,7 +59,7 @@ $form = array(
'value' => $institution, 'value' => $institution,
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => get_string('submit') 'value' => get_string('submit')
) )
......
...@@ -150,7 +150,7 @@ $userlistform = array( ...@@ -150,7 +150,7 @@ $userlistform = array(
'rules' => array('regex' => '/^[a-z]+$/') 'rules' => array('regex' => '/^[a-z]+$/')
), ),
'submit' => array( 'submit' => array(
'class' => 'btn btn-success', 'class' => 'btn-success',
'type' => 'submit', 'type' => 'submit',
'value' => $submittext 'value' => $submittext
) )
...@@ -168,14 +168,14 @@ if ($usertype == 'lastinstitution') { ...@@ -168,14 +168,14 @@ if ($usertype == 'lastinstitution') {
if ($usertype == 'requesters') { if ($usertype == 'requesters') {
$userlistform['elements']['reject'] = array( $userlistform['elements']['reject'] = array(
'type' => 'submit', 'type' => 'submit',
'class' => 'btn btn-default', 'class' => 'btn-default',
'value' => get_string('declinerequests', 'admin'), 'value' => get_string('declinerequests', 'admin'),
); );
} }
if (($usertype == 'nonmembers' || $usertype == 'lastinstitution') && $USER->get('admin')) {