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(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('deleteallnotifications', 'activity'),
'confirm' => get_string('reallydeleteallnotifications', 'activity'),
),
......
......@@ -24,7 +24,7 @@ $elements = get_notification_settings_elements($USER);
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('save'),
);
......
......@@ -26,7 +26,7 @@ $deleteform = pieform(array(
'pluginname' => 'account',
'elements' => array(
'submit' => array(
'class' => 'btn btn-default',
'class' => 'btn-default',
'type' => 'submit',
'value' => get_string('deleteaccount', 'mahara', display_username($USER), full_name($USER)),
),
......
......@@ -110,7 +110,7 @@ if ($blogcount != 1 && $prefs->multipleblogs == 1) {
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('save')
);
......
......@@ -206,7 +206,7 @@ if (!empty($institutions) &&
'defaultvalue' => $USER->studentid,
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('sendrequest'),
),
......
......@@ -34,7 +34,7 @@ $reloadform = pieform(array(
'reload' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('install', 'admin'),
),
),
......
......@@ -45,7 +45,7 @@ $newform = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('add'),
),
),
......@@ -78,7 +78,7 @@ foreach ($iframesources as $url => $name) {
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary btn-sm',
'class' => 'btn-primary btn-sm',
'value' => get_string('save'),
),
);
......@@ -100,7 +100,7 @@ foreach ($iframesources as $url => $name) {
'elements' => array(
'submit' => array(
'type' => 'button',
'class' => 'btn btn-default btn-sm',
'class' => 'btn-default btn-sm',
'usebuttontag' => true,
'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(
'elements' => array(
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('yes'), get_string('no')),
'goto' => get_config('wwwroot') . 'admin/groups/groups.php',
)
......
......@@ -30,7 +30,7 @@ $optionform = pieform(array(
'defaultvalue' => get_config('allowgroupcategories'),
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('submit'),
),
......
......@@ -43,7 +43,7 @@ $searchform = pieform(array(
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-primary input-group-btn',
'class' => 'btn-primary input-group-btn',
'value' => get_string('search'),
)
),
......
......@@ -37,7 +37,7 @@ $quotasform = pieform(array(
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-primary no-label',
'class' => 'btn-primary ',
'value' => get_string('save'),
),
'description' => array(
......@@ -94,7 +94,7 @@ $groupadminsform = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('save'),
),
),
......
......@@ -81,7 +81,7 @@ $form = array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('uploadgroupcsv', 'admin')
)
)
......
......@@ -56,7 +56,7 @@ $form = array(
'readonly' => TRUE,
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('uploadgroupmemberscsv', 'admin')
)
......
......@@ -54,7 +54,7 @@ $closeform = pieform(array(
'submit' => array(
'type' => 'submit',
'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(
),
),
'submit' => array(
'class' => 'mtl btn btn-success',
'class' => 'mtl btn-success',
'type' => 'submit',
'value' => get_string('savechanges', 'admin')
),
......
......@@ -66,7 +66,7 @@ $elements = array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('licensesave', 'admin'),
),
);
......
......@@ -285,7 +285,7 @@ foreach ($all as $k => $v) {
);
}
$footerelements['submit'] = array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('savechanges', 'admin')
);
......
......@@ -98,7 +98,7 @@ $networkingform = pieform(
'class' => 'btn-group',
'elements' => array (
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'name' => 'submit',
'type' => 'button',
'usebuttontag' => true,
......@@ -106,7 +106,7 @@ $networkingform = pieform(
'value' => 'submit'
),
'deletesubmit' => array(
'class' => 'btn btn-default',
'class' => 'btn-default',
'name' => 'submit', // must be called submit so we can access it's value
'type' => 'button',
'usebuttontag' => true,
......
......@@ -774,7 +774,7 @@ $siteoptionform = array(
$siteoptionform['elements']['submit'] = array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('updatesiteoptions', 'admin')
);
......
......@@ -65,7 +65,7 @@ $form = pieform(array(
)
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('savechanges', 'admin')
),
......
......@@ -118,7 +118,7 @@ $elements = array(
'submit' => array(
'type' => 'submit',
'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) {
$form['elements']['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('submit'), get_string('cancel')),
'goto' => 'addauthority.php?c=1'
);
......
......@@ -45,7 +45,7 @@ $form = pieform(array(
)
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('submit')
)
......
......@@ -101,7 +101,7 @@ $suspendform = pieform(array(
'suspend' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default input-group-btn no-label',
'class' => 'btn-default input-group-btn no-label',
'value' => get_string('Suspend', 'admin'),
)
)
......@@ -132,7 +132,7 @@ if (count($options) > 1) {
'changeauth' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default input-group-btn no-label',
'class' => 'btn-default input-group-btn no-label',
'value' => get_string('changeauthmethod', 'admin')
)
)
......@@ -158,7 +158,7 @@ if (is_using_probation()) {
),
'setprobation' => array(
'type' => 'submit',
'class' => 'btn btn-primary',
'class' => 'btn-primary',
'confirm' => get_string('probationbulkconfirm', 'admin'),
'value' => get_string('probationbulkset', 'admin'),
)
......@@ -176,7 +176,7 @@ $deleteform = pieform(array(
'delete' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default no-label',
'class' => 'btn-default no-label',
'confirm' => get_string('confirmdeleteusers', 'admin'),
'value' => '<span class="icon icon-lg icon-user-times prs text-danger"></span>' . get_string('deleteusers', 'admin'),
),
......
......@@ -58,7 +58,7 @@ $form = array(
'value' => $institution,
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('submit')
)
......
......@@ -99,7 +99,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('savechanges', 'admin')
),
)
......
......@@ -189,7 +189,7 @@ if ($institution || $add) {
),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('yes'), get_string('no'))
)
)
......@@ -579,7 +579,7 @@ if ($institution || $add) {
$elements['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('submit'), get_string('cancel'))
);
......@@ -628,7 +628,7 @@ else {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-primary input-group-btn',
'class' => 'btn-primary input-group-btn',
'value' => get_string('search'),
)
),
......@@ -1070,7 +1070,7 @@ if ($institution && $institution != 'mahara') {
'submit' => array(
'type' => 'button',
'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'),
),
)
......@@ -1092,7 +1092,7 @@ if ($institution && $institution != 'mahara') {
'submit' => array(
'type' => 'button',
'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'),
'description' => get_string('unsuspendinstitutiondescription','admin'),
),
......
......@@ -59,7 +59,7 @@ $form = array(
'value' => $institution,
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => get_string('submit')
)
......
......@@ -150,7 +150,7 @@ $userlistform = array(
'rules' => array('regex' => '/^[a-z]+$/')
),
'submit' => array(
'class' => 'btn btn-success',
'class' => 'btn-success',
'type' => 'submit',
'value' => $submittext
)
......@@ -168,14 +168,14 @@ if ($usertype == 'lastinstitution') {
if ($usertype == 'requesters') {
$userlistform['elements']['reject'] = array(
'type' => 'submit',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => get_string('declinerequests', 'admin'),
);
}
if (($usertype == 'nonmembers' || $usertype == 'lastinstitution') && $USER->get('admin')) {
$userlistform['elements']['add'] = array(
'type' => 'submit',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => get_string('addmembers', 'admin'),
);
}
......
......@@ -156,7 +156,7 @@ $elements['institution'] = array(
);
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('submit')
);
......
......@@ -42,7 +42,7 @@ $form = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('submit')
)
)
......
......@@ -131,7 +131,7 @@ $form = array(
'submit' => array(
'type' => 'submit',
'value' => get_string('uploadcsv', 'admin'),
'class' => 'btn btn-success'
'class' => 'btn-success'
)
)
);
......
......@@ -81,7 +81,7 @@ $elements['annotationid'] = array(
$elements['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => $goto,
);
......
......@@ -1132,7 +1132,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
}
$form['elements']['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('placeannotationfeedback', 'artefact.annotation'), get_string('cancel')),
'goto' => '/' . $view->get_url(false),
);
......@@ -1161,7 +1161,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-link btn-xs quiet',
'class' => 'btn-link btn-xs quiet',
'name' => 'make_annotation_feedback_public_submit',
'value' => '<span class="icon icon-lock text-default prs"></span>' . get_string('makepublic', 'artefact.annotation'),
),
......@@ -1191,7 +1191,7 @@ class ArtefactTypeAnnotationfeedback extends ArtefactType {
'type' => 'button',
'usebuttontag' => true,
'value' => get_string('delete'),
'class' => 'btn btn-default',
'class' => 'btn-default',
'elementtitle' => get_string('delete'),
'confirm' => get_string('reallydeletethisannotationfeedback', 'artefact.annotation'),
'name' => 'delete_annotation_feedback_submit',
......
......@@ -448,7 +448,7 @@ class ArtefactTypeBlog extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'class' => 'btn-default btn-sm',
'alt' => get_string('deletespecific', 'mahara', $title),
'elementtitle' => get_string('delete'),
'confirm' => $confirm,
......@@ -966,7 +966,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
),'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm publish',
'class' => 'btn-default btn-sm publish',
'value' => $strchangepoststatus,
),
),
......@@ -991,7 +991,7 @@ class ArtefactTypeBlogPost extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'class' => 'btn-default btn-sm',
'elementtitle' => get_string('delete'),
'confirm' => get_string('deleteblogpost?', 'artefact.blog'),
'value' => '<span class="icon icon-trash text-danger"></span><span class="btn-title pls">' .get_string('delete') . '</span>',
......
......@@ -57,7 +57,7 @@ $form = pieform(array(
'licensing_advanced' => license_form_el_advanced(null),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(
get_string('createblog', 'artefact.blog'),
get_string('cancel', 'artefact.blog')
......
......@@ -162,7 +162,7 @@ $form = pieform(array(
),
'submitpost' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('savepost', 'artefact.blog'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/blog/view/index.php?id=' . $blog,
)
......
......@@ -75,7 +75,7 @@ $form = pieform(array(
'licensing_advanced' => license_form_el_advanced($blog),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(
get_string('savesettings', 'artefact.blog'),
get_string('cancel', 'artefact.blog')
......
......@@ -81,7 +81,7 @@ if (get_config('licensemetadata')) {
}
$elements['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => $goto,
);
......
......@@ -805,7 +805,7 @@ class ArtefactTypeComment extends ArtefactType {
}
$form['elements']['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('Comment', 'artefact.comment'), get_string('cancel')),
);
return $form;
......@@ -821,7 +821,7 @@ class ArtefactTypeComment extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-link btn-xs',
'class' => 'btn-link btn-xs',
'name' => 'make_public_submit',
'value' => '<span class="icon icon-lock text-default prs"></span>' . get_string('makepublic', 'artefact.comment'),
),
......@@ -840,7 +840,7 @@ class ArtefactTypeComment extends ArtefactType {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-sm',
'class' => 'btn-default btn-sm',
'value' => '<span class="icon icon-trash icon-lg text-danger"></span> <span class="sr-only">' . get_string('delete') . '</span>',
'confirm' => get_string('reallydeletethiscomment', 'artefact.comment'),
'name' => 'delete_comment_submit',
......
......@@ -56,7 +56,7 @@ $uploadform = pieform(array(
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('upload')
)
)
......
......@@ -116,7 +116,7 @@ $form = array(
),
'submitnote' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => $goto,
),
......
......@@ -172,7 +172,7 @@ $elements = array(
'submit' => array(
'type' => 'submit',
'value' => get_string('saveprofile','artefact.internal'),
'class' => 'btn btn-success'
'class' => 'btn-success'
)
);
// Don't include fieldset if 'socialprofile' is not installed
......
......@@ -217,7 +217,7 @@ function deletenote_form($id, $notedata) {
'submit' => array(
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn btn-default btn-xs last',
'class' => 'btn-default btn-xs last',
'elementtitle' => get_string('delete'),
'value' => '<span class="icon icon-trash text-danger icon-lg"></span> ',
),
......