diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index 7cb5d87a74a..e177b7c1dd7 100644
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -20,7 +20,7 @@ class block_admin_bookmarks extends block_base {
}
function create_item($visiblename,$link,$icon) {
- $this->tempcontent .= '
'.get_string('repaymentamount','block_loancalc').'
'.get_string('loanterm','block_loancalc').'
'.get_string('interestrate','block_loancalc').'
diff --git a/course/format/lams/format.php b/course/format/lams/format.php
index fdcc0a78488..d6cfc8655dc 100644
--- a/course/format/lams/format.php
+++ b/course/format/lams/format.php
@@ -136,7 +136,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
'&'.$LAMSCONSTANTS->param_hash.'='.$hash.
'&'.$LAMSCONSTANTS->param_courseid.'='.$course->id;
echo '';
- //echo ''.get_string("openauthor", "lams").' ';
print_simple_box_end();
@@ -152,7 +152,7 @@ if ($thissection->summary or $thissection->sequence or isediting($course->id)) {
'&'.$LAMSCONSTANTS->param_hash.'='.$hash.
'&'.$LAMSCONSTANTS->param_courseid.'='.$course->id;
- //echo ''.get_string("openmonitor", "lams").' ';
print_simple_box_end();
diff --git a/course/search.php b/course/search.php
index bbafea3cea9..3fe51d48c31 100644
--- a/course/search.php
+++ b/course/search.php
@@ -193,7 +193,7 @@
// checks whether user can update course settings
if (has_capability('moodle/course:update', $coursecontext)) {
echo "wwwroot/course/edit.php?id=$course->id\"> ";
+ " src=\"$pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"".get_string("settings")."\"> ";
}
// checks whether user can do role assignment
@@ -205,30 +205,30 @@
// checks whether user can delete course
if (has_capability('moodle/course:delete', $coursecontext)) {
echo "id\"> ";
+ " src=\"$pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"".get_string("delete")."\"> ";
}
// checks whether user can change visibility
if (has_capability('moodle/course:visibility', $coursecontext)) {
if (!empty($course->visible)) {
echo "id&sesskey=$USER->sesskey\"> ";
+ " src=\"$pixpath/t/hide.gif\" class=\"iconsmall\" alt=\"".get_string("hide")."\"> ";
} else {
echo "id&sesskey=$USER->sesskey\"> ";
+ " src=\"$pixpath/t/show.gif\" class=\"iconsmall\" alt=\"".get_string("show")."\"> ";
}
}
// checks whether user can do site backup
if (has_capability('moodle/site:backup', $coursecontext)) {
echo "id\"> ";
+ " src=\"$pixpath/t/backup.gif\" class=\"iconsmall\" alt=\"".get_string("backup")."\"> ";
}
// checks whether user can do restore
if (has_capability('moodle/site:restore', $coursecontext)) {
echo "id&wdir=/backupdata\"> ";
+ " src=\"$pixpath/t/restore.gif\" class=\"iconsmall\" alt=\"".get_string("restore")."\"> ";
}
echo " ";
diff --git a/filter/algebra/filter.php b/filter/algebra/filter.php
index 1f6739c5a74..0d5e3477365 100644
--- a/filter/algebra/filter.php
+++ b/filter/algebra/filter.php
@@ -53,6 +53,7 @@ function string_file_picture_algebra($imagefile, $tex= "", $height="", $width=""
$output = "";
$origtex = $tex;
+ $style = 'style="border:0px; vertical-align:'.$align.';';
if ($tex) {
$tex = str_replace('&','&',$tex);
$tex = str_replace('<','<',$tex);
@@ -62,11 +63,12 @@ function string_file_picture_algebra($imagefile, $tex= "", $height="", $width=""
$title = "title=\"$tex\"";
}
if ($height) {
- $height = "height=\"$height\"";
+ $style .= " height:{$height}px;";
}
if ($width) {
- $width = "width=\"$width\"";
+ $style .= " width:{$width}px;";
}
+ $style .= '"';
if ($imagefile) {
if (!file_exists("$CFG->dataroot/$CFG->algebrafilterdir/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$output .= "wwwroot/$CFG->algebrafilterdir/algebradebug.php\">";
@@ -77,13 +79,13 @@ function string_file_picture_algebra($imagefile, $tex= "", $height="", $width=""
$output .= urlencode($tex) . "', 'popup', 'menubar=0,location=0,scrollbars,";
$output .= "resizable,width=300,height=240', 0);\">";
}
- $output .= " ";
} else {
$output .= "Error: must pass URL or course";
diff --git a/filter/tex/filter.php b/filter/tex/filter.php
index 6e1ba73fd20..e8b0709e0bb 100644
--- a/filter/tex/filter.php
+++ b/filter/tex/filter.php
@@ -46,6 +46,7 @@ function string_file_picture_tex($imagefile, $tex= "", $height="", $width="", $a
$output = "";
$origtex = $tex;
+ $style = 'style="border:0px; vertical-align:'.$align.';';
if ($tex) {
$tex = str_replace('&','&',$tex);
$tex = str_replace('<','<',$tex);
@@ -55,11 +56,12 @@ function string_file_picture_tex($imagefile, $tex= "", $height="", $width="", $a
$title = "title=\"$tex\"";
}
if ($height) {
- $height = "height=\"$height\"";
+ $style .= " height:{$height}px;";
}
if ($width) {
- $width = "width=\"$width\"";
+ $style .= " width:{$width}px;";
}
+ $style .= '"';
if ($imagefile) {
if (!file_exists("$CFG->dataroot/$CFG->texfilterdir/$imagefile") && has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM, SITEID))) {
$output .= "wwwroot/$CFG->texfilterdir/texdebug.php\">";
@@ -70,13 +72,13 @@ function string_file_picture_tex($imagefile, $tex= "", $height="", $width="", $a
$output .= urlencode($tex) . "', 'popup', 'menubar=0,location=0,scrollbars,";
$output .= "resizable,width=300,height=240', 0);\">";
}
- $output .= " ";
} else {
$output .= "Error: must pass URL or course";
diff --git a/install.php b/install.php
index 9802989d1fb..0aae0846216 100644
--- a/install.php
+++ b/install.php
@@ -584,7 +584,7 @@ if (isset($_GET['help'])) {
echo '';
@@ -598,14 +598,14 @@ if (isset($_GET['help'])) {
echo '';
echo '';
} else {
@@ -981,8 +981,7 @@ function install_helpbutton($url, $title='') {
$title = get_string('help');
}
echo "";
- echo " \n";
}
diff --git a/lang/en_utf8/docs/teacher.html b/lang/en_utf8/docs/teacher.html
index 29572e31a7f..3ff640c84b7 100644
--- a/lang/en_utf8/docs/teacher.html
+++ b/lang/en_utf8/docs/teacher.html
@@ -36,11 +36,11 @@
edit icon
lets you edit whatever it is next to.
- help
+ help
icon will provide you with a popup help window
- open-eye
+ open-eye
icon will let you hide something from students
- closed-eye
+ closed-eye
icon will make a hidden item available
diff --git a/lang/en_utf8/help/emoticons.html b/lang/en_utf8/help/emoticons.html
index bee0cedd8e2..a793dde87c5 100644
--- a/lang/en_utf8/help/emoticons.html
+++ b/lang/en_utf8/help/emoticons.html
@@ -5,52 +5,52 @@
- smile
:-)
- big grin
:-D
- wink
;-)
- mixed
:-/
- thoughtful
V-.
- tongue out
:-P
- cool
B-)
- approve
^-)
- wide eyes
8-)
- surprise
8-o
@@ -59,52 +59,52 @@
- sad
:-(
- shy
8-.
- blush
:-I
- kisses
:-X
- clown
:o)
- black eye
P-|
- angry
8-[
- dead
xx-P
- sleepy
|-.
- evil
}-]
diff --git a/lang/en_utf8/help/richtext.html b/lang/en_utf8/help/richtext.html
index 649dd85d681..455b4bd912b 100644
--- a/lang/en_utf8/help/richtext.html
+++ b/lang/en_utf8/help/richtext.html
@@ -24,23 +24,23 @@
menus in your web browser (or Control-C and Control-V).
-Inserting images
+Inserting images
If you have images that are already published on a web site and accessible via a URL, you can include these images in your texts using the "Insert Image" button.
-Inserting Tables
+Inserting Tables
To add layout to your texts, you can use the "Insert Tables" button in the toolbar.
-Inserting Links
+Inserting Links
To make a new link, first type the text that you want to be a link. Then select it and click the link button in the toolbar. Type the URL you want to link to and it's done!
-Inserting smilies (emoticons)
+Inserting smilies (emoticons)
To embed these small icons in your text, click on the smiley icon in the toolbar. A dialog will pop up that allows you to select from the following smiley icons. (Alternatively, you can just type the corresponding code straight into your text and it will be converted later when your text is displayed).
@@ -49,52 +49,52 @@
- smile
:-)
- big grin
:-D
- wink
;-)
- mixed
:-/
- thoughtful
V-.
- tongue out
:-P
- cool
B-)
- approve
^-)
- wide eyes
8-)
- surprise
8-o
@@ -103,52 +103,52 @@
- sad
:-(
- shy
8-.
- blush
:-I
- kisses
:-X
- clown
:o)
- black eye
P-|
- angry
8-[
- dead
xx-P
- sleepy
|-.
- evil
}-]
diff --git a/lang/en_utf8/help/text.html b/lang/en_utf8/help/text.html
index c537754ddaa..2eca397c8b3 100644
--- a/lang/en_utf8/help/text.html
+++ b/lang/en_utf8/help/text.html
@@ -11,52 +11,52 @@ Writing text in Moodle works pretty much the way you would expect, but you also
- smile
:-)
- big grin
:-D
- wink
;-)
- mixed
:-/
- thoughtful
V-.
- tongue out
:-P
- cool
B-)
- approve
^-)
- wide eyes
8-)
- surprise
8-o
@@ -65,52 +65,52 @@ Writing text in Moodle works pretty much the way you would expect, but you also
- sad
:-(
- shy
8-.
- blush
:-I
- kisses
:-X
- clown
:o)
- black eye
P-|
- angry
8-[
- dead
xx-P
- sleepy
|-.
- evil
}-]
diff --git a/lib/editor/htmlarea/popups/dlg_ins_smile.php b/lib/editor/htmlarea/popups/dlg_ins_smile.php
index 8ace9069492..0ced0282abd 100644
--- a/lib/editor/htmlarea/popups/dlg_ins_smile.php
+++ b/lib/editor/htmlarea/popups/dlg_ins_smile.php
@@ -84,8 +84,8 @@ function cancel() {
$name = $fullnames[$image];
$icon = $emoticons[$image];
echo '';
- echo "$name ";
echo "$icon ";
echo " ";
@@ -103,8 +103,8 @@ function cancel() {
$name = $fullnames[$image];
$icon = $emoticons[$image];
echo '';
- echo "$name ";
echo "$icon ";
echo " ";
diff --git a/lib/weblib.php b/lib/weblib.php
index 441a4ac7a2f..034384ddebb 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -4461,7 +4461,7 @@ function print_grade_menu($courseid, $name, $current, $includenograde=true, $ret
}
$output .= choose_from_menu($grades, $name, $current, '', '', 0, true);
- $linkobject = '';
echo '' . $formatname . ' ';
- $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\"> ";
+ $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\"> ";
if ( $recformat->visible ) {
$vtitle = get_string("hide");
$vicon = "hide.gif";
@@ -228,7 +228,7 @@
$vtitle = get_string("show");
$vicon = "show.gif";
}
- $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible\"> ";
+ $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible\"> ";
echo '' . $eicon . ' ' . $vicon . ' ';
echo ' ';
diff --git a/mod/glossary/view.php b/mod/glossary/view.php
index 88aac4fea9d..a1531d9219e 100644
--- a/mod/glossary/view.php
+++ b/mod/glossary/view.php
@@ -252,7 +252,7 @@
$printicon = '';
if ( $isuserframe and $mode != 'search') {
if (has_capability('mod/glossary:manageentries', $context) or $glossary->allowprintview) {
- $printicon = " id&mode=$mode&hook=$hook&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\"> ";
+ $printicon = " id&mode=$mode&hook=$hook&sortkey=$sortkey&sortorder=$sortorder&offset=$offset\"> ";
}
}
print_heading(format_string($glossary->name).$printicon);
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index c474a700bb6..274f9bb9f7c 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -609,7 +609,7 @@ function quiz_get_question_review($quiz, $question) {
$quiz_id = $quiz->id ? '&quizid=' . $quiz->id : '';
return "
- ";
+
';
+ //echo '
';
+ echo '![\"$title\"";](\"./pix/help.gif\" "\\"$title\\"")
";
echo "\n";
}
diff --git a/lang/en_utf8/docs/teacher.html b/lang/en_utf8/docs/teacher.html
index 29572e31a7f..3ff640c84b7 100644
--- a/lang/en_utf8/docs/teacher.html
+++ b/lang/en_utf8/docs/teacher.html
@@ -36,11 +36,11 @@
- the edit icon lets you edit whatever it is next to.
- the open-eye +
- the closed-eye +
/![\"$name\"](\"$pixpath/$image.gif\")
';
+ get_string('editorshortcutkeys').'" class="iconkbhelp" />';
return helpbutton('editorshortcuts', get_string('editorshortcutkeys'), 'moodle', true, false, '', true, $imagetext);
}
@@ -5569,7 +5569,7 @@ function page_doc_link($text='', $iconpath='') {
}
// alt left blank intentionally to prevent repetition in screenreaders
- $str .= '![\"".get_string("edit")."\"](\"../pix/t/edit.gif\")
![\"".](\"print.gif\")
![\"$strpreview\"](\"../../pix/t/preview.gif\")