From d06735751e7cd960606b9b0f671ab02c26650e1c Mon Sep 17 00:00:00 2001 From: Jen Zajac Date: Wed, 16 Sep 2015 12:49:07 +1200 Subject: [PATCH] Replace btn-success with btn-primary throughout behatnotneeded Bug #1465107 Change-Id: I27492cbc38416fd4790e1e62ec8090c19602d171 --- htdocs/account/activity/index.php | 2 +- htdocs/account/activity/preferences/index.php | 2 +- htdocs/account/index.php | 2 +- htdocs/account/institutions.php | 2 +- htdocs/admin/extensions/filter.php | 2 +- htdocs/admin/extensions/iframesites.php | 2 +- htdocs/admin/extensions/pluginconfig.php | 2 +- htdocs/admin/groups/groupcategories.php | 2 +- htdocs/admin/groups/manage.php | 2 +- htdocs/admin/groups/uploadcsv.php | 2 +- htdocs/admin/groups/uploadmemberscsv.php | 2 +- htdocs/admin/index.php | 2 +- htdocs/admin/site/cookieconsent.php | 2 +- htdocs/admin/site/font/delete.php | 2 +- htdocs/admin/site/font/install.php | 2 +- htdocs/admin/site/font/installgwf.php | 2 +- htdocs/admin/site/license-edit.php | 2 +- htdocs/admin/site/menu.php | 2 +- htdocs/admin/site/networking.php | 4 +- htdocs/admin/site/options.php | 2 +- htdocs/admin/site/pages.php | 2 +- htdocs/admin/users/add.php | 2 +- htdocs/admin/users/addauthority.php | 2 +- htdocs/admin/users/admins.php | 2 +- htdocs/admin/users/changeuser.php | 2 +- htdocs/admin/users/edit.php | 6 +- htdocs/admin/users/institutionadmins.php | 2 +- htdocs/admin/users/institutionpages.php | 2 +- htdocs/admin/users/institutions.php | 2 +- htdocs/admin/users/institutionstaff.php | 2 +- htdocs/admin/users/institutionusers.php | 2 +- htdocs/admin/users/progressbar.php | 2 +- htdocs/admin/users/staff.php | 2 +- htdocs/admin/users/uploadcsv.php | 2 +- htdocs/artefact/annotation/edit.php | 2 +- htdocs/artefact/blog/new/index.php | 2 +- htdocs/artefact/blog/post.php | 2 +- htdocs/artefact/blog/settings/index.php | 2 +- htdocs/artefact/comment/edit.php | 2 +- htdocs/artefact/file/extract.php | 2 +- htdocs/artefact/file/profileicons.php | 2 +- htdocs/artefact/internal/editnote.php | 2 +- htdocs/artefact/internal/index.php | 2 +- htdocs/artefact/internal/socialprofile.php | 2 +- htdocs/artefact/plans/lib.php | 4 +- htdocs/artefact/resume/editcomposite.php | 2 +- htdocs/artefact/resume/editgoalsandskills.php | 2 +- htdocs/artefact/resume/index.php | 2 +- htdocs/artefact/resume/lib.php | 6 +- htdocs/artefact/resume/license.php | 2 +- htdocs/auth/browserid/lib.php | 2 +- htdocs/auth/lib.php | 4 +- htdocs/auth/saml/index.php | 2 +- htdocs/auth/saml/lib.php | 2 +- htdocs/collection/edit.php | 2 +- htdocs/contact.php | 2 +- htdocs/edittags.php | 2 +- htdocs/export/index.php | 2 +- htdocs/group/changerole.php | 2 +- htdocs/group/edit.php | 2 +- htdocs/group/inviteusers.php | 2 +- htdocs/group/leave.php | 2 +- htdocs/group/requestjoin.php | 2 +- htdocs/import/index.php | 2 +- htdocs/interaction/delete.php | 2 +- htdocs/interaction/edit.php | 2 +- htdocs/interaction/forum/deletepost.php | 2 +- htdocs/interaction/forum/editpost.php | 2 +- htdocs/interaction/forum/edittopic.php | 2 +- htdocs/interaction/forum/reportpost.php | 2 +- htdocs/js/mahara.js | 2 +- .../forms/accountprefs.addremovecolumns.html | 2 +- .../help/forms/adduser.addremovecolumns.html | 2 +- .../forms/uploadcsv.addremovecolumns.html | 2 +- htdocs/lib/registration.php | 2 +- htdocs/lib/user.php | 2 +- htdocs/lib/view.php | 2 +- .../sendmessage.php | 2 +- htdocs/skin/design.php | 2 +- htdocs/skin/import.php | 2 +- .../artefact/file/templates/form/editfile.tpl | 2 +- .../file/templates/form/filebrowser.tpl | 301 +++++++++--------- .../artefact/plans/templates/plans.tpl | 2 +- .../interaction/forum/templates/view.tpl | 2 +- .../raw/templates/account/activity/index.tpl | 2 +- .../theme/raw/templates/admin/installgpl.tpl | 2 +- .../templates/admin/users/noinstitutions.tpl | 2 +- .../admin/users/noinstitutionsstats.tpl | 2 +- .../theme/raw/templates/collection/views.tpl | 2 +- htdocs/theme/raw/templates/selfsearch.tpl | 8 +- .../raw/templates/sideblocks/selfsearch.tpl | 2 +- htdocs/theme/raw/templates/skin/sitefonts.tpl | 4 +- .../theme/raw/templates/view/changetheme.tpl | 2 +- htdocs/user/denyrequest.php | 2 +- htdocs/view/access.php | 2 +- htdocs/view/edit.php | 2 +- htdocs/view/layout.php | 2 +- htdocs/view/urls.php | 2 +- htdocs/webservice/admin/index.php | 2 +- htdocs/webservice/admin/oauthv1sregister.php | 2 +- 100 files changed, 259 insertions(+), 262 deletions(-) diff --git a/htdocs/account/activity/index.php b/htdocs/account/activity/index.php index d87907f6d3..43d986b78c 100644 --- a/htdocs/account/activity/index.php +++ b/htdocs/account/activity/index.php @@ -78,7 +78,7 @@ $deleteall = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('deleteallnotifications', 'activity'), 'confirm' => get_string('reallydeleteallnotifications', 'activity'), ), diff --git a/htdocs/account/activity/preferences/index.php b/htdocs/account/activity/preferences/index.php index 80dc47f8fe..0dbd4c9c09 100644 --- a/htdocs/account/activity/preferences/index.php +++ b/htdocs/account/activity/preferences/index.php @@ -24,7 +24,7 @@ $elements = get_notification_settings_elements($USER); $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); diff --git a/htdocs/account/index.php b/htdocs/account/index.php index 360b9ba2f1..d7d8bbc536 100644 --- a/htdocs/account/index.php +++ b/htdocs/account/index.php @@ -110,7 +110,7 @@ if ($blogcount != 1 && $prefs->multipleblogs == 1) { $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save') ); diff --git a/htdocs/account/institutions.php b/htdocs/account/institutions.php index bb292cf9d9..f82dffd27d 100644 --- a/htdocs/account/institutions.php +++ b/htdocs/account/institutions.php @@ -206,7 +206,7 @@ if (!empty($institutions) && 'defaultvalue' => $USER->studentid, ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('sendrequest'), ), diff --git a/htdocs/admin/extensions/filter.php b/htdocs/admin/extensions/filter.php index 98a85d2e10..382857fe7d 100644 --- a/htdocs/admin/extensions/filter.php +++ b/htdocs/admin/extensions/filter.php @@ -34,7 +34,7 @@ $reloadform = pieform(array( 'reload' => array( 'type' => 'button', 'usebuttontag' => true, - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('install', 'admin'), ), ), diff --git a/htdocs/admin/extensions/iframesites.php b/htdocs/admin/extensions/iframesites.php index 627c760949..1882075dfc 100644 --- a/htdocs/admin/extensions/iframesites.php +++ b/htdocs/admin/extensions/iframesites.php @@ -45,7 +45,7 @@ $newform = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('add'), ), ), diff --git a/htdocs/admin/extensions/pluginconfig.php b/htdocs/admin/extensions/pluginconfig.php index f5b5814eb9..2c2a6f6d1c 100644 --- a/htdocs/admin/extensions/pluginconfig.php +++ b/htdocs/admin/extensions/pluginconfig.php @@ -73,7 +73,7 @@ $form['elements']['type'] = array( ); $form['elements']['save'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); diff --git a/htdocs/admin/groups/groupcategories.php b/htdocs/admin/groups/groupcategories.php index a56f68d6cd..da5a1f568c 100644 --- a/htdocs/admin/groups/groupcategories.php +++ b/htdocs/admin/groups/groupcategories.php @@ -30,7 +30,7 @@ $optionform = pieform(array( 'defaultvalue' => get_config('allowgroupcategories'), ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('submit'), ), diff --git a/htdocs/admin/groups/manage.php b/htdocs/admin/groups/manage.php index b6f1cc9775..2dd06adfff 100644 --- a/htdocs/admin/groups/manage.php +++ b/htdocs/admin/groups/manage.php @@ -94,7 +94,7 @@ $groupadminsform = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ), ), diff --git a/htdocs/admin/groups/uploadcsv.php b/htdocs/admin/groups/uploadcsv.php index 8a71fec2f5..267a725d5d 100644 --- a/htdocs/admin/groups/uploadcsv.php +++ b/htdocs/admin/groups/uploadcsv.php @@ -81,7 +81,7 @@ $form = array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('uploadgroupcsv', 'admin') ) ) diff --git a/htdocs/admin/groups/uploadmemberscsv.php b/htdocs/admin/groups/uploadmemberscsv.php index a5e90b3617..44fdabb3d0 100644 --- a/htdocs/admin/groups/uploadmemberscsv.php +++ b/htdocs/admin/groups/uploadmemberscsv.php @@ -56,7 +56,7 @@ $form = array( 'readonly' => TRUE, ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('uploadgroupmemberscsv', 'admin') ) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index 0860f91928..a1d5380b06 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -55,7 +55,7 @@ $closeform = pieform(array( 'submit' => array( 'type' => 'submit', 'value' => get_string($closed ? 'Open' : 'Close', 'admin'), - 'class' => $closed ? 'btn-success' : 'btn-default' + 'class' => $closed ? 'btn-primary' : 'btn-default' ), ), )); diff --git a/htdocs/admin/site/cookieconsent.php b/htdocs/admin/site/cookieconsent.php index 7fd512cd9a..113e8d7e07 100644 --- a/htdocs/admin/site/cookieconsent.php +++ b/htdocs/admin/site/cookieconsent.php @@ -169,7 +169,7 @@ $form = pieform(array( ), ), 'submit' => array( - 'class' => 'mtl btn-success', + 'class' => 'mtl btn-primary', 'type' => 'submit', 'value' => get_string('savechanges', 'admin') ), diff --git a/htdocs/admin/site/font/delete.php b/htdocs/admin/site/font/delete.php index 508e7d26dc..ae93117a2f 100644 --- a/htdocs/admin/site/font/delete.php +++ b/htdocs/admin/site/font/delete.php @@ -64,7 +64,7 @@ $form = pieform(array( 'submit' => array( 'type' => 'submitcancel', 'title' => $submittitle, - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('yes'), get_string('no')), 'goto' => get_config('wwwroot') . 'admin/site/fonts.php', ) diff --git a/htdocs/admin/site/font/install.php b/htdocs/admin/site/font/install.php index 2c0163aa6b..bb7fbb2257 100644 --- a/htdocs/admin/site/font/install.php +++ b/htdocs/admin/site/font/install.php @@ -134,7 +134,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('installfont', 'skin'), get_string('cancel', 'mahara')), 'goto' => get_config('wwwroot') . 'admin/site/fonts.php', ), diff --git a/htdocs/admin/site/font/installgwf.php b/htdocs/admin/site/font/installgwf.php index 1cf37a4fa5..8681d845cb 100644 --- a/htdocs/admin/site/font/installgwf.php +++ b/htdocs/admin/site/font/installgwf.php @@ -48,7 +48,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class'=> 'btn-success', + 'class'=> 'btn-primary', 'value' => array(get_string('installgwfont', 'skin'), get_string('cancel', 'mahara')), 'goto' => get_config('wwwroot') . 'admin/site/fonts.php', ), diff --git a/htdocs/admin/site/license-edit.php b/htdocs/admin/site/license-edit.php index b2a03fe0d0..64d81af631 100644 --- a/htdocs/admin/site/license-edit.php +++ b/htdocs/admin/site/license-edit.php @@ -66,7 +66,7 @@ $elements = array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('licensesave', 'admin'), ), ); diff --git a/htdocs/admin/site/menu.php b/htdocs/admin/site/menu.php index 5889d65d91..21c2676dd5 100644 --- a/htdocs/admin/site/menu.php +++ b/htdocs/admin/site/menu.php @@ -285,7 +285,7 @@ foreach ($all as $k => $v) { ); } $footerelements['submit'] = array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('savechanges', 'admin') ); diff --git a/htdocs/admin/site/networking.php b/htdocs/admin/site/networking.php index e5452ac155..1456b30d2d 100644 --- a/htdocs/admin/site/networking.php +++ b/htdocs/admin/site/networking.php @@ -98,8 +98,8 @@ $networkingform = pieform( 'class' => 'btn-group', 'elements' => array ( 'submit' => array( - 'class' => 'btn-success', - 'name' => 'submit', + 'class' => 'btn-primary', + 'name' => 'submit', 'type' => 'button', 'usebuttontag' => true, 'content' => get_string('savechanges','admin'), diff --git a/htdocs/admin/site/options.php b/htdocs/admin/site/options.php index 56905d4390..eaa1f5a292 100644 --- a/htdocs/admin/site/options.php +++ b/htdocs/admin/site/options.php @@ -767,7 +767,7 @@ $siteoptionform = array( $siteoptionform['elements']['submit'] = array( 'type' => 'button', 'usebuttontag' => true, - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('updatesiteoptions', 'admin') ); diff --git a/htdocs/admin/site/pages.php b/htdocs/admin/site/pages.php index 7377db8f7f..6ea5b2bc27 100644 --- a/htdocs/admin/site/pages.php +++ b/htdocs/admin/site/pages.php @@ -65,7 +65,7 @@ $form = pieform(array( ) ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('savechanges', 'admin') ), diff --git a/htdocs/admin/users/add.php b/htdocs/admin/users/add.php index 7be936ed68..5e7f921291 100644 --- a/htdocs/admin/users/add.php +++ b/htdocs/admin/users/add.php @@ -119,7 +119,7 @@ $elements = array( 'submit' => array( 'type' => 'submit', 'value' => get_string('createuser', 'admin'), - 'class' => 'btn-success btn-lg btn-block mtm', + 'class' => 'btn-primary btn-lg btn-block mtm', ), ); diff --git a/htdocs/admin/users/addauthority.php b/htdocs/admin/users/addauthority.php index 258cc525a6..680704a4d3 100644 --- a/htdocs/admin/users/addauthority.php +++ b/htdocs/admin/users/addauthority.php @@ -79,7 +79,7 @@ if ($institution && $plugin) { $form['elements']['submit'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('submit'), get_string('cancel')), 'goto' => 'addauthority.php?c=1' ); diff --git a/htdocs/admin/users/admins.php b/htdocs/admin/users/admins.php index 1f2e092c0b..9817edb1a5 100644 --- a/htdocs/admin/users/admins.php +++ b/htdocs/admin/users/admins.php @@ -45,7 +45,7 @@ $form = pieform(array( ) ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('submit') ) diff --git a/htdocs/admin/users/changeuser.php b/htdocs/admin/users/changeuser.php index 38226fb8d0..c4639f9d01 100644 --- a/htdocs/admin/users/changeuser.php +++ b/htdocs/admin/users/changeuser.php @@ -91,7 +91,7 @@ $form = array( 'submit' => array( 'type' => 'submit', 'value' => get_string('masquerade', 'admin'), - 'class' => 'btn-success' + 'class' => 'btn-primary' ), ), ); diff --git a/htdocs/admin/users/edit.php b/htdocs/admin/users/edit.php index 0a7361cb79..4014c9db86 100644 --- a/htdocs/admin/users/edit.php +++ b/htdocs/admin/users/edit.php @@ -251,7 +251,7 @@ $elements['tags'] = array( $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success mbm', + 'class' => 'btn-primary mbm', 'value' => get_string('savechanges','admin'), ); @@ -765,7 +765,7 @@ foreach ($institutions as $i) { $i->institution.'_submit' => array( 'type' => 'submit', 'value' => get_string('update'), - 'class' => 'btn-success' + 'class' => 'btn-primary' ), $i->institution.'_remove' => array( 'type' => 'submit', @@ -802,7 +802,7 @@ if ($USER->get('admin') ); $elements['add'] = array( 'type' => 'submit', - 'class' => 'btn-success mbs', + 'class' => 'btn-primary mbs', 'value' => get_string('addusertoinstitution', 'admin'), ); } diff --git a/htdocs/admin/users/institutionadmins.php b/htdocs/admin/users/institutionadmins.php index cf04802f94..6267116a4d 100644 --- a/htdocs/admin/users/institutionadmins.php +++ b/htdocs/admin/users/institutionadmins.php @@ -58,7 +58,7 @@ $form = array( 'value' => $institution, ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('submit') ) diff --git a/htdocs/admin/users/institutionpages.php b/htdocs/admin/users/institutionpages.php index bdcba158dd..b3b1c36c2c 100644 --- a/htdocs/admin/users/institutionpages.php +++ b/htdocs/admin/users/institutionpages.php @@ -99,7 +99,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('savechanges', 'admin') ), ) diff --git a/htdocs/admin/users/institutions.php b/htdocs/admin/users/institutions.php index 51d3758c03..f1f6517d94 100644 --- a/htdocs/admin/users/institutions.php +++ b/htdocs/admin/users/institutions.php @@ -587,7 +587,7 @@ if ($institution || $add) { $elements['submit'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('submit'), get_string('cancel')) ); diff --git a/htdocs/admin/users/institutionstaff.php b/htdocs/admin/users/institutionstaff.php index 21fd9c6c59..4d3b21c85d 100644 --- a/htdocs/admin/users/institutionstaff.php +++ b/htdocs/admin/users/institutionstaff.php @@ -59,7 +59,7 @@ $form = array( 'value' => $institution, ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('submit') ) diff --git a/htdocs/admin/users/institutionusers.php b/htdocs/admin/users/institutionusers.php index e3dcf4f216..75f09e3c74 100644 --- a/htdocs/admin/users/institutionusers.php +++ b/htdocs/admin/users/institutionusers.php @@ -150,7 +150,7 @@ $userlistform = array( 'rules' => array('regex' => '/^[a-z]+$/') ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => $submittext ) diff --git a/htdocs/admin/users/progressbar.php b/htdocs/admin/users/progressbar.php index 485d062950..d682880d2b 100644 --- a/htdocs/admin/users/progressbar.php +++ b/htdocs/admin/users/progressbar.php @@ -156,7 +156,7 @@ $elements['institution'] = array( ); $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('submit') ); diff --git a/htdocs/admin/users/staff.php b/htdocs/admin/users/staff.php index 732e558d88..ab4af04d6d 100644 --- a/htdocs/admin/users/staff.php +++ b/htdocs/admin/users/staff.php @@ -42,7 +42,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('submit') ) ) diff --git a/htdocs/admin/users/uploadcsv.php b/htdocs/admin/users/uploadcsv.php index d6d8a90ace..a1aaf2fb38 100644 --- a/htdocs/admin/users/uploadcsv.php +++ b/htdocs/admin/users/uploadcsv.php @@ -134,7 +134,7 @@ $form = array( 'submit' => array( 'type' => 'submit', 'value' => get_string('uploadcsv', 'admin'), - 'class' => 'btn-success' + 'class' => 'btn-primary' ) ) ); diff --git a/htdocs/artefact/annotation/edit.php b/htdocs/artefact/annotation/edit.php index 7e4d282e5c..568fcd7823 100644 --- a/htdocs/artefact/annotation/edit.php +++ b/htdocs/artefact/annotation/edit.php @@ -81,7 +81,7 @@ $elements['annotationid'] = array( $elements['submit'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => $goto, ); diff --git a/htdocs/artefact/blog/new/index.php b/htdocs/artefact/blog/new/index.php index 5ead6ee64f..8817abe7fd 100644 --- a/htdocs/artefact/blog/new/index.php +++ b/htdocs/artefact/blog/new/index.php @@ -91,7 +91,7 @@ $form = array( 'licensing_advanced' => license_form_el_advanced(null), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array( get_string('createblog', 'artefact.blog'), get_string('cancel', 'artefact.blog') diff --git a/htdocs/artefact/blog/post.php b/htdocs/artefact/blog/post.php index d2236bef2c..b7122ed0d6 100644 --- a/htdocs/artefact/blog/post.php +++ b/htdocs/artefact/blog/post.php @@ -185,7 +185,7 @@ $form = pieform(array( ), 'submitpost' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('savepost', 'artefact.blog'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'artefact/blog/view/index.php?id=' . $blog, ) diff --git a/htdocs/artefact/blog/settings/index.php b/htdocs/artefact/blog/settings/index.php index 6af8f7760a..8f7f53dfb6 100644 --- a/htdocs/artefact/blog/settings/index.php +++ b/htdocs/artefact/blog/settings/index.php @@ -94,7 +94,7 @@ $form = pieform(array( 'licensing_advanced' => license_form_el_advanced($blog), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array( get_string('savesettings', 'artefact.blog'), get_string('cancel', 'artefact.blog') diff --git a/htdocs/artefact/comment/edit.php b/htdocs/artefact/comment/edit.php index b7ca14d3e2..659cbd917c 100644 --- a/htdocs/artefact/comment/edit.php +++ b/htdocs/artefact/comment/edit.php @@ -81,7 +81,7 @@ if (get_config('licensemetadata')) { } $elements['submit'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => $goto, ); diff --git a/htdocs/artefact/file/extract.php b/htdocs/artefact/file/extract.php index 9ca94af631..e3b720eb74 100644 --- a/htdocs/artefact/file/extract.php +++ b/htdocs/artefact/file/extract.php @@ -96,7 +96,7 @@ if ($zipinfo) { ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn btn-success', + 'class' => 'btn btn-primary', 'value' => array(get_string('Decompress', 'artefact.file'), get_string('cancel')), 'goto' => $goto, ) diff --git a/htdocs/artefact/file/profileicons.php b/htdocs/artefact/file/profileicons.php index 1f9f46f54f..7d76f1abec 100644 --- a/htdocs/artefact/file/profileicons.php +++ b/htdocs/artefact/file/profileicons.php @@ -56,7 +56,7 @@ $uploadform = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('upload') ) ) diff --git a/htdocs/artefact/internal/editnote.php b/htdocs/artefact/internal/editnote.php index f1889617da..6856381258 100644 --- a/htdocs/artefact/internal/editnote.php +++ b/htdocs/artefact/internal/editnote.php @@ -116,7 +116,7 @@ $form = array( ), 'submitnote' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => $goto, ), diff --git a/htdocs/artefact/internal/index.php b/htdocs/artefact/internal/index.php index b76bbd532b..9620d9021a 100644 --- a/htdocs/artefact/internal/index.php +++ b/htdocs/artefact/internal/index.php @@ -172,7 +172,7 @@ $elements = array( 'submit' => array( 'type' => 'submit', 'value' => get_string('saveprofile','artefact.internal'), - 'class' => 'btn-success' + 'class' => 'btn-primary' ) ); // Don't include fieldset if 'socialprofile' is not installed diff --git a/htdocs/artefact/internal/socialprofile.php b/htdocs/artefact/internal/socialprofile.php index b306900394..e9383df6f5 100644 --- a/htdocs/artefact/internal/socialprofile.php +++ b/htdocs/artefact/internal/socialprofile.php @@ -123,7 +123,7 @@ else { ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'artefact/internal/index.php?fs=social', ), diff --git a/htdocs/artefact/plans/lib.php b/htdocs/artefact/plans/lib.php index 182b328b96..b6bad5d94c 100644 --- a/htdocs/artefact/plans/lib.php +++ b/htdocs/artefact/plans/lib.php @@ -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-success', + 'class' => 'btn-primary', '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-success', + 'class' => 'btn-primary', 'value' => array(get_string('savetask','artefact.plans'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'artefact/plans/plan.php?id=' . $parent, ); diff --git a/htdocs/artefact/resume/editcomposite.php b/htdocs/artefact/resume/editcomposite.php index 53fa51e0d5..24ccc0f7ac 100644 --- a/htdocs/artefact/resume/editcomposite.php +++ b/htdocs/artefact/resume/editcomposite.php @@ -76,7 +76,7 @@ $elements['filebrowser'] = array( // Add other necessary pieform elements $elements['submitform'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'artefact/resume/' . $tabs[$type] . '.php', ); diff --git a/htdocs/artefact/resume/editgoalsandskills.php b/htdocs/artefact/resume/editgoalsandskills.php index da8b765bbc..9c50dfff93 100644 --- a/htdocs/artefact/resume/editgoalsandskills.php +++ b/htdocs/artefact/resume/editgoalsandskills.php @@ -108,7 +108,7 @@ $form = pieform(array( ), 'submitform' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'artefact/resume/goalsandskills.php', ), diff --git a/htdocs/artefact/resume/index.php b/htdocs/artefact/resume/index.php index 3d551289db..9b720e3e18 100644 --- a/htdocs/artefact/resume/index.php +++ b/htdocs/artefact/resume/index.php @@ -111,7 +111,7 @@ $personalinformationform = pieform(array( 'save' => array( 'type' => 'submit', 'value' => get_string('save'), - 'class' => 'btn-success' + 'class' => 'btn-primary' ), ), ), diff --git a/htdocs/artefact/resume/lib.php b/htdocs/artefact/resume/lib.php index 9ff65d076e..e211d8f374 100644 --- a/htdocs/artefact/resume/lib.php +++ b/htdocs/artefact/resume/lib.php @@ -1176,7 +1176,7 @@ EOF; $elements = call_static_method(generate_artefact_class_name($compositetype), 'get_addform_elements'); $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); $elements['compositetype'] = array( @@ -2092,13 +2092,13 @@ function simple_resumefield_form($defaults, $goto, $options = array()) { ), $t . 'submit' => array( 'type' => 'submitcancel', - 'class' => 'js-hidden btn-success', + 'class' => 'js-hidden btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => get_config('wwwroot') . $goto, ), $t . 'edit' => array( 'type' => 'button', - 'class' => 'nojs-hidden-block openedit btn-success', + 'class' => 'nojs-hidden-block openedit btn-primary', 'value' => get_string('edit'), ), ), diff --git a/htdocs/artefact/resume/license.php b/htdocs/artefact/resume/license.php index 30459d674e..e0b22b50f7 100644 --- a/htdocs/artefact/resume/license.php +++ b/htdocs/artefact/resume/license.php @@ -41,7 +41,7 @@ $form = array( 'license_advanced' => license_form_el_advanced($personalinformation), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save') ), ), diff --git a/htdocs/auth/browserid/lib.php b/htdocs/auth/browserid/lib.php index 093fb4be3b..8d3926ef4a 100644 --- a/htdocs/auth/browserid/lib.php +++ b/htdocs/auth/browserid/lib.php @@ -239,7 +239,7 @@ class PluginAuthBrowserid extends PluginAuth { public static function login_form_elements() { return array( 'loginbrowserid' => array( - 'value' => '
' . get_string('login', 'auth.browserid') . '
' + 'value' => '
' . get_string('login', 'auth.browserid') . '
' ) ); } diff --git a/htdocs/auth/lib.php b/htdocs/auth/lib.php index 5393f50b2c..b599c70e00 100644 --- a/htdocs/auth/lib.php +++ b/htdocs/auth/lib.php @@ -903,7 +903,7 @@ function auth_check_required_fields() { else { $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('submit') ); @@ -1268,7 +1268,7 @@ function auth_get_login_form_elements() { ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success btn-block', + 'class' => 'btn-primary btn-block', 'value' => get_string('login') ), 'register' => array( diff --git a/htdocs/auth/saml/index.php b/htdocs/auth/saml/index.php index 6e266f380f..0865c7b187 100644 --- a/htdocs/auth/saml/index.php +++ b/htdocs/auth/saml/index.php @@ -392,7 +392,7 @@ function saml_auth_generate_login_form() { ) ), 'submit' => array( - 'class' => 'btn-success btn-block', + 'class' => 'btn-primary btn-block', 'type' => 'submit', 'value' => get_string('login') ), diff --git a/htdocs/auth/saml/lib.php b/htdocs/auth/saml/lib.php index 6fa9d40c5d..613d14fb34 100644 --- a/htdocs/auth/saml/lib.php +++ b/htdocs/auth/saml/lib.php @@ -607,7 +607,7 @@ class PluginAuthSaml extends PluginAuth { public static function login_form_elements() { $elements = array( 'loginsaml' => array( - 'value' => '
' . get_string('login', 'auth.saml') . '
' + 'value' => '
' . get_string('login', 'auth.saml') . '
' ) ); return $elements; diff --git a/htdocs/collection/edit.php b/htdocs/collection/edit.php index 2272d56da9..956cd19157 100644 --- a/htdocs/collection/edit.php +++ b/htdocs/collection/edit.php @@ -100,7 +100,7 @@ else { } $elements['submit'] = array( 'type' => $type, - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => $submitstr, 'confirm' => $confirm, ); diff --git a/htdocs/contact.php b/htdocs/contact.php index 6e175d8227..ea3865ec4c 100644 --- a/htdocs/contact.php +++ b/htdocs/contact.php @@ -72,7 +72,7 @@ $elements['userid'] = array( $elements['submit'] = array( 'type' => 'submit', 'value' => get_string('sendmessage'), - 'class' => 'btn-success submit' + 'class' => 'btn-primary submit' ); $contactform = pieform(array( diff --git a/htdocs/edittags.php b/htdocs/edittags.php index 6544353a84..eef6f19d23 100644 --- a/htdocs/edittags.php +++ b/htdocs/edittags.php @@ -31,7 +31,7 @@ if ($tag = param_variable('tag', null)) { ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('submit'), ), ), diff --git a/htdocs/export/index.php b/htdocs/export/index.php index 4586c1c1a3..de64df269d 100644 --- a/htdocs/export/index.php +++ b/htdocs/export/index.php @@ -103,7 +103,7 @@ else { $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('generateexport', 'export'), ); diff --git a/htdocs/group/changerole.php b/htdocs/group/changerole.php index 31ceed34bd..6da59a2d41 100644 --- a/htdocs/group/changerole.php +++ b/htdocs/group/changerole.php @@ -65,7 +65,7 @@ $changeform = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success btn sm', + 'class' => 'btn-primary btn sm', 'value' => get_string('submit'), ) ) diff --git a/htdocs/group/edit.php b/htdocs/group/edit.php index d58c46750c..4c8c5ed549 100644 --- a/htdocs/group/edit.php +++ b/htdocs/group/edit.php @@ -111,7 +111,7 @@ $form = array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('savegroup', 'group'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'group/mygroups.php', ), diff --git a/htdocs/group/inviteusers.php b/htdocs/group/inviteusers.php index b9b5e4217e..922c0f42d9 100644 --- a/htdocs/group/inviteusers.php +++ b/htdocs/group/inviteusers.php @@ -55,7 +55,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('submit'), ) ) diff --git a/htdocs/group/leave.php b/htdocs/group/leave.php index 742433c9a1..614d0f2807 100644 --- a/htdocs/group/leave.php +++ b/htdocs/group/leave.php @@ -39,7 +39,7 @@ $form = pieform(array( 'method' => 'post', 'elements' => array( 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submitcancel', 'value' => array(get_string('yes'), get_string('no')), 'goto' => $goto diff --git a/htdocs/group/requestjoin.php b/htdocs/group/requestjoin.php index 5386b45d72..c3aeda3761 100644 --- a/htdocs/group/requestjoin.php +++ b/htdocs/group/requestjoin.php @@ -43,7 +43,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('request', 'group'), get_string('cancel')), 'goto' => $goto ), diff --git a/htdocs/import/index.php b/htdocs/import/index.php index 84b1d91336..0cc103d2db 100644 --- a/htdocs/import/index.php +++ b/htdocs/import/index.php @@ -163,7 +163,7 @@ function print_upload_form() { ) ), 'submit' => array( - 'class' => 'btn-success', + 'class' => 'btn-primary', 'type' => 'submit', 'value' => get_string('Import', 'import'), ), diff --git a/htdocs/interaction/delete.php b/htdocs/interaction/delete.php index ef171bbdfb..cc9bc4b5b9 100644 --- a/htdocs/interaction/delete.php +++ b/htdocs/interaction/delete.php @@ -44,7 +44,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('yes'), get_string('no')), 'goto' => get_config('wwwroot') . 'interaction/' .$instance->get('plugin') . ($returnto == 'index' ? '/index.php?group=' . $instance->get('group') : '/view.php?id=' . $instance->get('id')), diff --git a/htdocs/interaction/edit.php b/htdocs/interaction/edit.php index b6af755950..386af55778 100644 --- a/htdocs/interaction/edit.php +++ b/htdocs/interaction/edit.php @@ -51,7 +51,7 @@ $elements = array_merge( array( 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'interaction/' . $plugin . (isset($instance) && $returnto != 'index' ? '/view.php?id=' . $instance->get('id') : '/index.php?group=' . $groupid), diff --git a/htdocs/interaction/forum/deletepost.php b/htdocs/interaction/forum/deletepost.php index 25048f50c1..18a6abdf6a 100644 --- a/htdocs/interaction/forum/deletepost.php +++ b/htdocs/interaction/forum/deletepost.php @@ -73,7 +73,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('yes'), get_string('no')), 'goto' => get_config('wwwroot') . 'interaction/forum/topic.php?id=' . $post->topic . '&post=' . $postid ), diff --git a/htdocs/interaction/forum/editpost.php b/htdocs/interaction/forum/editpost.php index 93b532a8af..93b26c79e4 100644 --- a/htdocs/interaction/forum/editpost.php +++ b/htdocs/interaction/forum/editpost.php @@ -149,7 +149,7 @@ $editform = array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array( isset($post) ? get_string('save') : get_string('Post','interaction.forum'), get_string('cancel') diff --git a/htdocs/interaction/forum/edittopic.php b/htdocs/interaction/forum/edittopic.php index 1c16f65f1e..e073ecd6cf 100644 --- a/htdocs/interaction/forum/edittopic.php +++ b/htdocs/interaction/forum/edittopic.php @@ -145,7 +145,7 @@ $editform = array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array( isset($topic) ? get_string('save') : get_string('Post','interaction.forum'), get_string('cancel') diff --git a/htdocs/interaction/forum/reportpost.php b/htdocs/interaction/forum/reportpost.php index c2204ff033..19bf6532c0 100644 --- a/htdocs/interaction/forum/reportpost.php +++ b/htdocs/interaction/forum/reportpost.php @@ -68,7 +68,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('notifyadministrator', 'interaction.forum'), get_string('cancel')), 'goto' => get_config('wwwroot') . 'interaction/forum/topic.php?id=' . $post->topic . '&post=' . $postid ), diff --git a/htdocs/js/mahara.js b/htdocs/js/mahara.js index 8ae55543af..648a899738 100644 --- a/htdocs/js/mahara.js +++ b/htdocs/js/mahara.js @@ -132,7 +132,7 @@ function globalErrorHandler(data) { function show_login_form(submit) { if($('ajax-login-form') == null) { var loginForm = DIV({id: 'ajax-login-form', 'class': 'modal-dialog'}); - loginForm.innerHTML = '

' + get_string('login') + '

« ' + get_string('home') + '<\/a>
' + get_string('sessiontimedout') + '
<\/td><\/tr>
<\/td><\/tr>
<\/td><\/tr>
<\/td><\/tr>
<\/td><\/tr><\/tbody><\/table>
<\/div><\/form> - {/if} -
- - {if $config.resizeonuploaduseroption} -
- {str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight} - - - {contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'} -
- {/if} - -
- -
- -
-
- {* filebrowser.js may add a submit button in here even if config.submitbutton is off *} - - {if $config.submitbutton} - - {/if} - - -
-
- - {$licenseform|safe} - - {/if} - - - {if $config.upload} -
- {str tag="cannoteditfolder" section=artefact.file} -
- {/if} - - - {if $config.edit} - - - {/if} - - - {if $config.createfolder} -
-
- - - - - - - -
- {/if} - -
-

- {include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid} -

- -
- {include file="artefact:file:form/filelist.tpl" prefix=$prefix filelist=$filelist folderdownload=$folderdownload folderparams=$folderparams editable=$config.edit selectable=$config.select highlight=$highlight edit=$edit querybase=$querybase groupinfo=$groupinfo owner=$tabs.owner ownerid=$tabs.ownerid selectfolders=$config.selectfolders showtags=$config.showtags editmeta=$config.editmeta} -
-
- - {* Edit form used when js is available *} - {if $edit <= 0} - - - {include file="artefact:file:form/editfile.tpl" prefix=$prefix groupinfo=$groupinfo} - - - {/if} - {if $tabs} - - {/if} + {if $config.select && !$config.alwaysopen} + + {/if} + + {if $tabs} + + + + +
+ {include file="artefact:file:form/ownertabs.tpl" tabs=$tabs prefix=$prefix querybase=$querybase} +
+ +
+
+ {if $tabs.subtabs} + {include file="artefact:file:form/ownersubtabs.tpl" tabs=$tabs prefix=$prefix querybase=$querybase} + {/if} +
+ {/if} + + {if $config.upload} +
+ {* config.uploadagreement: disable the file chooser unless the agreement is checked *} + {* config.simpleupload: the form only contains a file chooser *} + {* config.submitbutton: add submit button even if js is enabled & don't start uploading as soon as a file is chosen *} + + + +
+ + {if $config.uploadagreement} +
+ + + {$agreementtext|clean_html|safe} +
+ {/if} + +
+ + + ({str tag=maxuploadsize section=artefact.file} {$maxuploadsize}) + + {if $config.uploadagreement} + + {/if} +
+ + {if $config.resizeonuploaduseroption} +
+ {str tag='resizeonuploadenablefilebrowser1' section='artefact.file' arg1=$resizeonuploadmaxwidth arg2=$resizeonuploadmaxheight} + + + {contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'} +
+ {/if} + +
+ +
+ +
+
+ {* filebrowser.js may add a submit button in here even if config.submitbutton is off *} + + {if $config.submitbutton} + + {/if} + + +
+
+ + {$licenseform|safe} +
+ {/if} + + {if $config.upload} +
+ {str tag="cannoteditfolder" section=artefact.file} +
+ {/if} + + {if $config.edit} + + + {/if} + + {if $config.createfolder} +
+
+ + + + + + + +
+ {/if} + +
+

+ {include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid} +

+ +
+ {include file="artefact:file:form/filelist.tpl" prefix=$prefix filelist=$filelist folderdownload=$folderdownload folderparams=$folderparams editable=$config.edit selectable=$config.select highlight=$highlight edit=$edit querybase=$querybase groupinfo=$groupinfo owner=$tabs.owner ownerid=$tabs.ownerid selectfolders=$config.selectfolders showtags=$config.showtags editmeta=$config.editmeta} +
+
+ + {* Edit form used when js is available *} + {if $edit <= 0} + + + {include file="artefact:file:form/editfile.tpl" prefix=$prefix groupinfo=$groupinfo} + + + {/if} + {if $tabs} +
+ {/if} {if $config.select} diff --git a/htdocs/theme/raw/plugintype/artefact/plans/templates/plans.tpl b/htdocs/theme/raw/plugintype/artefact/plans/templates/plans.tpl index 6adaffad74..4165f297b7 100644 --- a/htdocs/theme/raw/plugintype/artefact/plans/templates/plans.tpl +++ b/htdocs/theme/raw/plugintype/artefact/plans/templates/plans.tpl @@ -1,7 +1,7 @@ {include file="header.tpl"}
- {str section="artefact.plans" tag="newtask"} + {str section="artefact.plans" tag="newtask"}
{if !$tasks.data}
{$strnotasksaddone|safe}
diff --git a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl index 754d72b884..b8eebba5a8 100644 --- a/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl +++ b/htdocs/theme/raw/plugintype/interaction/forum/templates/view.tpl @@ -127,7 +127,7 @@ {/if} - {if $moderator} diff --git a/htdocs/theme/raw/templates/account/activity/index.tpl b/htdocs/theme/raw/templates/account/activity/index.tpl index 7d2bb319ff..d15e11fa07 100644 --- a/htdocs/theme/raw/templates/account/activity/index.tpl +++ b/htdocs/theme/raw/templates/account/activity/index.tpl @@ -44,7 +44,7 @@
- +
{$activitylist.pagination|safe} diff --git a/htdocs/theme/raw/templates/admin/installgpl.tpl b/htdocs/theme/raw/templates/admin/installgpl.tpl index bcd2db69e3..28a36e5b46 100644 --- a/htdocs/theme/raw/templates/admin/installgpl.tpl +++ b/htdocs/theme/raw/templates/admin/installgpl.tpl @@ -19,6 +19,6 @@ along with this program. If not, see Before you install Mahara, you may want to check out the release notes for this release. -
+
{include file='admin/upgradefooter.tpl'} diff --git a/htdocs/theme/raw/templates/admin/users/noinstitutions.tpl b/htdocs/theme/raw/templates/admin/users/noinstitutions.tpl index 69bf3b7899..d04341cc31 100644 --- a/htdocs/theme/raw/templates/admin/users/noinstitutions.tpl +++ b/htdocs/theme/raw/templates/admin/users/noinstitutions.tpl @@ -5,7 +5,7 @@

{str tag="noinstitutionsdescription" section="admin"}

- +
diff --git a/htdocs/theme/raw/templates/admin/users/noinstitutionsstats.tpl b/htdocs/theme/raw/templates/admin/users/noinstitutionsstats.tpl index 9517e77cc4..65accfe7ad 100644 --- a/htdocs/theme/raw/templates/admin/users/noinstitutionsstats.tpl +++ b/htdocs/theme/raw/templates/admin/users/noinstitutionsstats.tpl @@ -6,7 +6,7 @@ {if $CANCREATEINST}
- +
{/if} diff --git a/htdocs/theme/raw/templates/collection/views.tpl b/htdocs/theme/raw/templates/collection/views.tpl index e4a8113487..ee26e630e8 100644 --- a/htdocs/theme/raw/templates/collection/views.tpl +++ b/htdocs/theme/raw/templates/collection/views.tpl @@ -75,7 +75,7 @@
- {str tag=done} + {str tag=done}
{include file="footer.tpl"} diff --git a/htdocs/theme/raw/templates/selfsearch.tpl b/htdocs/theme/raw/templates/selfsearch.tpl index db97ea220d..2f63e6d47b 100644 --- a/htdocs/theme/raw/templates/selfsearch.tpl +++ b/htdocs/theme/raw/templates/selfsearch.tpl @@ -5,14 +5,14 @@
- +
- -
+
+

{str tag="Results"}

-
+ {include file="footer.tpl"} diff --git a/htdocs/theme/raw/templates/sideblocks/selfsearch.tpl b/htdocs/theme/raw/templates/sideblocks/selfsearch.tpl index 8a232d0ffd..9081fc6dc6 100644 --- a/htdocs/theme/raw/templates/sideblocks/selfsearch.tpl +++ b/htdocs/theme/raw/templates/sideblocks/selfsearch.tpl @@ -4,7 +4,7 @@ - + diff --git a/htdocs/theme/raw/templates/skin/sitefonts.tpl b/htdocs/theme/raw/templates/skin/sitefonts.tpl index 16900bab60..f7a9738429 100644 --- a/htdocs/theme/raw/templates/skin/sitefonts.tpl +++ b/htdocs/theme/raw/templates/skin/sitefonts.tpl @@ -2,10 +2,10 @@
- +
- +

{str tag=sitefontsdescription section=skin}

diff --git a/htdocs/theme/raw/templates/view/changetheme.tpl b/htdocs/theme/raw/templates/view/changetheme.tpl index a996313f84..86a55f0f3a 100644 --- a/htdocs/theme/raw/templates/view/changetheme.tpl +++ b/htdocs/theme/raw/templates/view/changetheme.tpl @@ -12,7 +12,7 @@ {/foreach} - +
diff --git a/htdocs/user/denyrequest.php b/htdocs/user/denyrequest.php index e66a4120b1..5cc2a56762 100644 --- a/htdocs/user/denyrequest.php +++ b/htdocs/user/denyrequest.php @@ -53,7 +53,7 @@ $form = pieform(array( ), 'submit' => array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('denyfriendrequestlower', 'group'), get_string('cancel')), 'goto' => $goto, ) diff --git a/htdocs/view/access.php b/htdocs/view/access.php index eecae87ceb..37ad7cbf50 100644 --- a/htdocs/view/access.php +++ b/htdocs/view/access.php @@ -312,7 +312,7 @@ $form['elements']['more']['elements']['stopdate'] = array( $form['elements']['submit'] = array( 'type' => 'submitcancel', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => array(get_string('save'), get_string('cancel')), ); diff --git a/htdocs/view/edit.php b/htdocs/view/edit.php index 8d8fc06e4e..b725b31705 100644 --- a/htdocs/view/edit.php +++ b/htdocs/view/edit.php @@ -182,7 +182,7 @@ if (get_config('allowanonymouspages')) { $editview['elements']['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); diff --git a/htdocs/view/layout.php b/htdocs/view/layout.php index 1c1b9f3439..4d3c84c2cc 100644 --- a/htdocs/view/layout.php +++ b/htdocs/view/layout.php @@ -144,7 +144,7 @@ $elements['layoutfallback'] = array( ); $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); diff --git a/htdocs/view/urls.php b/htdocs/view/urls.php index b5b8513ce7..956f8f580e 100644 --- a/htdocs/view/urls.php +++ b/htdocs/view/urls.php @@ -113,7 +113,7 @@ for ($i = 0; $i < count($records); $i++) { } $elements['submit'] = array( 'type' => 'submit', - 'class' => 'btn-success', + 'class' => 'btn-primary', 'value' => get_string('save'), ); $editurls[$i] = array( diff --git a/htdocs/webservice/admin/index.php b/htdocs/webservice/admin/index.php index f4a5366d7a..2a9b679d51 100644 --- a/htdocs/webservice/admin/index.php +++ b/htdocs/webservice/admin/index.php @@ -554,7 +554,7 @@ function service_fg_edit_form() { 'action' => array('type' => 'hidden', 'value' => 'add'), 'submit' => array( 'type' => 'submit', - 'class' => 'submit btn-success last', + 'class' => 'submit btn-primary last', 'value' => get_string('add') ), ), diff --git a/htdocs/webservice/admin/oauthv1sregister.php b/htdocs/webservice/admin/oauthv1sregister.php index 7ba8c135e8..d2064e273a 100644 --- a/htdocs/webservice/admin/oauthv1sregister.php +++ b/htdocs/webservice/admin/oauthv1sregister.php @@ -251,7 +251,7 @@ function webservice_server_edit_form($dbserver, $sopts, $iopts) { 'type' => 'submitcancel', 'value' => array(get_string('save'), get_string('back')), 'goto' => get_config('wwwroot') . 'webservice/admin/oauthv1sregister.php', - 'class' => 'btn-success mts', + 'class' => 'btn-primary mts', ); $elements = array( -- GitLab