Merge branch 'MDL-62977_master' of git://github.com/markn86/moodle

diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index f3fe838..b4e1230 100644 (file)
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -1451,10 +1451,12 @@ function wiki_print_edit_form_default_fields($format, $pageid, $version = -1, $u
 
     echo "</fieldset>";
 
-    echo '<input class="wiki_button" type="submit" name="editoption" value="' . get_string('save', 'wiki') . '"/>';
-    echo '<input class="wiki_button" type="submit" name="editoption" value="' . get_string('upload', 'wiki') . '"/>';
-    echo '<input class="wiki_button" type="submit" name="editoption" value="' . get_string('preview') . '"/>';
-    echo '<input class="wiki_button" type="submit" name="editoption" value="' . get_string('cancel') . '" />';
+    echo '<input class="wiki_button btn btn-secondary" type="submit" name="editoption" value="'
+        . get_string('save', 'wiki') . '" />';
+    echo '<input class="wiki_button btn btn-secondary" type="submit" name="editoption" value="'
+        . get_string('upload', 'wiki') . '" />';
+    echo '<input class="wiki_button btn btn-secondary" type="submit" name="editoption" value="' . get_string('preview') . '" />';
+    echo '<input class="wiki_button btn btn-secondary" type="submit" name="editoption" value="' . get_string('cancel') . '" />';
 }
 
 /**

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index a43090d..b5caacb 100644 (file)
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -497,7 +497,7 @@ class page_wiki_edit extends page_wiki {
 
                 $form = '<form method="post" action="' . $CFG->wwwroot . '/mod/wiki/overridelocks.php?' . $params . '">';
                 $form .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-                $form .= '<input type="submit" value="' . get_string('overridelocks', 'wiki') . '" />';
+                $form .= '<input type="submit" class="btn btn-secondary" value="' . get_string('overridelocks', 'wiki') . '" />';
                 $form .= '</form>';
 
                 print $OUTPUT->box($form, 'generalbox boxwidthnormal boxaligncenter');
@@ -1894,10 +1894,10 @@ class page_wiki_restoreversion extends page_wiki {
         echo html_writer::tag('div', get_string('restoreconfirm', 'wiki', $version->version));
         echo $OUTPUT->container_start(false, 'wiki_restoreform');
         echo '<form class="wiki_restore_yes" action="' . $restoreurl . '" method="post" id="restoreversion">';
-        echo '<div><input type="submit" name="confirm" value="' . get_string('yes') . '" /></div>';
+        echo '<div><input type="submit" class="btn btn-secondary" name="confirm" value="' . get_string('yes') . '" /></div>';
         echo '</form>';
         echo '<form class="wiki_restore_no" action="' . $return . '" method="post">';
-        echo '<div><input type="submit" name="norestore" value="' . get_string('no') . '" /></div>';
+        echo '<div><input type="submit" class="btn btn-secondary" name="norestore" value="' . get_string('no') . '" /></div>';
         echo '</form>';
         echo $OUTPUT->container_end();
         echo $OUTPUT->container_end();
@@ -1964,10 +1964,11 @@ class page_wiki_deletecomment extends page_wiki {
         echo html_writer::tag('p', $strdeletecheckfull);
         echo $OUTPUT->container_start(false, 'wiki_deletecommentform');
         echo '<form class="wiki_deletecomment_yes" action="' . $deleteurl . '" method="post" id="deletecomment">';
-        echo '<div><input type="submit" name="confirmdeletecomment" value="' . get_string('yes') . '" /></div>';
+        echo '<div><input type="submit" class="btn btn-secondary" name="confirmdeletecomment" value="'
+            . get_string('yes') . '" /></div>';
         echo '</form>';
         echo '<form class="wiki_deletecomment_no" action="' . $return . '" method="post">';
-        echo '<div><input type="submit" name="norestore" value="' . get_string('no') . '" /></div>';
+        echo '<div><input type="submit" class="btn btn-secondary" name="norestore" value="' . get_string('no') . '" /></div>';
         echo '</form>';
         echo $OUTPUT->container_end();
         echo $OUTPUT->container_end();