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

More bootstrap tidy up fixes (BUG 1465107)

Change-Id: I6bbd0edde9b09c7a01cc0e36fa5bfe55972a14e8
parent 3586cf12
......@@ -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> ',
),
......
......@@ -56,7 +56,7 @@ if ($delete) {
'elements' => array(
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('deleteprofile','artefact.internal'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/internal/index.php?fs=social',
),
......@@ -122,7 +122,7 @@ else {
),
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/internal/index.php?fs=social',
),
......
......@@ -33,7 +33,7 @@ $deleteform = array(
'elements' => array(
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('deleteplan','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/plans/index.php',
),
......
......@@ -33,7 +33,7 @@ $deleteform = array(
'elements' => array(
'submit' => array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('deletetask','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . '/artefact/plans/plan.php?id='.$todelete->get('parent'),
),
......
......@@ -205,7 +205,7 @@ class ArtefactTypePlan extends ArtefactType {
$elements = call_static_method(generate_artefact_class_name('plan'), 'get_planform_elements', $plan);
$elements['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('saveplan','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/plans/index.php',
);
......@@ -446,7 +446,7 @@ class ArtefactTypeTask extends ArtefactType {
$elements = call_static_method(generate_artefact_class_name('task'), 'get_taskform_elements', $parent, $task);
$elements['submit'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('savetask','artefact.plans'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/plans/plan.php?id=' . $parent,
);
......
......@@ -76,7 +76,7 @@ $elements['filebrowser'] = array(
// Add other necessary pieform elements
$elements['submitform'] = array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/resume/' . $tabs[$type] . '.php',
);
......
......@@ -109,7 +109,7 @@ $form = pieform(array(
),
'submitform' => array(
'type' => 'submitcancel',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . 'artefact/resume/goalsandskills.php',
),
......
......@@ -28,7 +28,6 @@ if (!PluginArtefactResume::is_active()) {
$defaults = array(
'coverletter' => array(
'default' => '',
'fshelp' => true,
),
);
$coverletterform = pieform(simple_resumefield_form($defaults, 'artefact/resume/index.php', array(
......@@ -48,6 +47,7 @@ $personalinformationform = pieform(array(
'pluginname' => 'resume',
'jsform' => true,
'method' => 'post',
'class' => 'form-group-nested',
'elements' => array(
'personalinfomation' => array(
'type' => 'fieldset',
......@@ -111,7 +111,7 @@ $personalinformationform = pieform(array(
'save' => array(
'type' => 'submit',
'value' => get_string('save'),
'class' => 'btn btn-success'
'class' => 'btn-success'
),
),
),
......
......@@ -1173,7 +1173,7 @@ EOF;
$elements = call_static_method(generate_artefact_class_name($compositetype), 'get_addform_elements');
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('save'),
);
$elements['compositetype'] = array(
......@@ -2043,6 +2043,7 @@ function simple_resumefield_form($defaults, $goto, $options = array()) {
'plugintype' => 'artefact',
'pluginname' => 'resume',
'jsform' => true,
'class' => 'form-group-nested',
'successcallback' => 'simple_resumefield_submit',
'jssuccesscallback' => 'simple_resumefield_success',
'jserrorcallback' => 'simple_resumefield_error',
......@@ -2088,13 +2089,13 @@ function simple_resumefield_form($defaults, $goto, $options = array()) {
),
$t . 'submit' => array(
'type' => 'submitcancel',
'class' => 'js-hidden btn btn-success',
'class' => 'js-hidden btn-success',
'value' => array(get_string('save'), get_string('cancel')),
'goto' => get_config('wwwroot') . $goto,
),
$t . 'edit' => array(
'type' => 'button',
'class' => 'nojs-hidden-block openedit btn btn-success',
'class' => 'nojs-hidden-block openedit btn-success',
'value' => get_string('edit'),
),
),
......
......@@ -41,7 +41,7 @@ $form = array(
'license_advanced' => license_form_el_advanced($personalinformation),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('save')
),
),
......
......@@ -903,7 +903,7 @@ function auth_check_required_fields() {
else {
$elements['submit'] = array(
'type' => 'submit',
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => get_string('submit')
);
......@@ -1273,14 +1273,13 @@ function auth_get_login_form_elements() {
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-success btn-block mts mbl',
'class' => 'btn-success btn-block mts mbl',
'value' => get_string('login')
),
'register' => array(
'type' => 'markup',
'value' => '<div id="login-helplinks" class=" text-small">' . $registerlink
. '<a href="' . get_config('wwwroot') . 'forgotpass.php">' . get_string('lostusernamepassword') . '</a></div>'
),
);
$elements = array(
......
......@@ -392,7 +392,7 @@ function saml_auth_generate_login_form() {
)
),
'submit' => array(
'class' => 'btn btn-success btn-block mts mbl',
'class' => 'btn-success btn-block mts mbl',
'type' => 'submit',
'value' => get_string('login')
),
......
......@@ -1089,7 +1089,7 @@ class BlockInstance {
// Add submit/cancel buttons
$elements['action_configureblockinstance_id_' . $this->get('id')] = array(
'type' => 'submitcancel',
'class' => 'btn btn-default',
'class' => 'btn-default',
'value' => array(get_string('save'), $cancel),
'goto' => View::make_base_url(),
);
......
......@@ -112,8 +112,10 @@ class PluginBlocktypeMyfriends extends SystemBlocktype {
'renderer' => 'div',
'elements' => array(
'add' => array(
'type' => 'submit',
'value' => get_string('addtomyfriends', 'group')
'type' => 'button',
'usebuttontag' => true,
'class' => 'btn-default',
'value' => '<span class="icon icon-user-plus icon-lg prs"></span>' .get_string('addtomyfriends', 'group')
),
'id' => array(
'type' => 'hidden',
......
......@@ -173,7 +173,7 @@ class PluginBlocktypeWall extends SystemBlocktype {
),
'submit' => array(
'type' => 'submit',
'class' => 'btn btn-primary',
'class' => 'btn-primary',
'value' => get_string('Post', 'blocktype.wall'),
),
),
......
......@@ -64,7 +64,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' => $baseurl,
),
......
......@@ -90,7 +90,7 @@ if ($copy) {
else {
$type = 'submitcancel';
if ($new) {
$submitstr = array('submit' => get_string('next') . ': ' . get_string('editviews', 'collection'), 'cancel' => get_string('cancel'));
$submitstr = array('button' => get_string('next') . ': ' . get_string('editviews', 'collection'), 'cancel' => get_string('cancel'));
$confirm = array('cancel' => get_string('confirmcancelcreatingcollection','collection'));
}
else {
......@@ -100,7 +100,7 @@ else {
}
$elements['submit'] = array(
'type' => $type,
'class' => 'btn btn-success',
'class' => 'btn-success',
'value' => $submitstr,
'confirm' => $confirm,
);
......
Markdown is supported
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