From 0f13ec8f9b14cf756f852aa74e66fab5cdb252cf Mon Sep 17 00:00:00 2001 From: skodak Date: Mon, 8 Jan 2007 20:30:38 +0000 Subject: [PATCH] MDL-8105 some more icon class fixes including new .iconhelp for help and docs icon --- .../admin_bookmarks/block_admin_bookmarks.php | 2 +- blocks/loancalc/block_loancalc.php | 6 +-- course/format/lams/format.php | 4 +- course/search.php | 12 ++--- filter/algebra/filter.php | 10 ++-- filter/tex/filter.php | 10 ++-- install.php | 9 ++-- lang/en_utf8/docs/teacher.html | 6 +-- lang/en_utf8/help/emoticons.html | 40 ++++++++-------- lang/en_utf8/help/richtext.html | 48 +++++++++---------- lang/en_utf8/help/text.html | 40 ++++++++-------- lib/editor/htmlarea/popups/dlg_ins_smile.php | 8 ++-- lib/weblib.php | 14 +++--- mod/data/field/picture/field.class.php | 4 +- mod/glossary/config.html | 4 +- mod/glossary/view.php | 2 +- mod/quiz/locallib.php | 2 +- mod/wiki/ewiki/plugins/moodle/downloads.php | 2 +- theme/standard/styles_layout.css | 22 +++++++-- 19 files changed, 131 insertions(+), 114 deletions(-) diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php index 7cb5d87a74..e177b7c1dd 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 .= ' ' . $visiblename . '
' . "\n"; + $this->tempcontent .= ' ' . $visiblename . '
' . "\n"; } function get_content() { diff --git a/blocks/loancalc/block_loancalc.php b/blocks/loancalc/block_loancalc.php index 4a3c7f3778..aaa338bbea 100644 --- a/blocks/loancalc/block_loancalc.php +++ b/blocks/loancalc/block_loancalc.php @@ -160,21 +160,21 @@ function comp(v) { // general entry point for all cases - calculate + calculate '.get_string('repaymentamount','block_loancalc').' - calculate + calculate '.get_string('loanterm','block_loancalc').' - calculate + calculate '.get_string('interestrate','block_loancalc').' diff --git a/course/format/lams/format.php b/course/format/lams/format.php index fdcc0a7848..d6cfc8655d 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 'Open Author'; + //echo 'Open Author'; print_simple_box_start('right'); 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 'Open Monitor'; + //echo 'Open Monitor'; print_simple_box_start('right'); echo ''.get_string("openmonitor", "lams").''; print_simple_box_end(); diff --git a/course/search.php b/course/search.php index bbafea3cea..3fe51d48c3 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 1f6739c5a7..0d5e347736 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 .= "\"".s($origtex)."\"slasharguments) { // Use this method if possible for better caching $output .= "$CFG->wwwroot/$CFG->algebrafilterdir/pix.php/$imagefile"; } else { $output .= "$CFG->wwwroot/$CFG->algebrafilterdir/pix.php?file=$imagefile"; } - $output .= "\" style=\"vertical-align:$align\" />"; + $output .= "\" $style />"; $output .= ""; } else { $output .= "Error: must pass URL or course"; diff --git a/filter/tex/filter.php b/filter/tex/filter.php index 6e1ba73fd2..e8b0709e0b 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 .= "\"".s($origtex)."\"slasharguments) { // Use this method if possible for better caching $output .= "$CFG->wwwroot/$CFG->texfilterdir/pix.php/$imagefile"; } else { $output .= "$CFG->wwwroot/$CFG->texfilterdir/pix.php?file=$imagefile"; } - $output .= "\" style=\"vertical-align:$align\" />"; + $output .= "\" $style />"; $output .= ""; } else { $output .= "Error: must pass URL or course"; diff --git a/install.php b/install.php index 9802989d1f..0aae084621 100644 --- a/install.php +++ b/install.php @@ -584,7 +584,7 @@ if (isset($_GET['help'])) { echo '
' . get_string('databasesettingssub_mssql', 'install'); /// Link to mssql installation page echo '

'; - echo 'Docs'; + echo 'Docs'; echo get_string('moodledocslink', 'install') . '

'; echo '
'; @@ -598,14 +598,14 @@ if (isset($_GET['help'])) { echo '
'. get_string('databasesettingssub_odbc_mssql', 'install'); /// Link to mssql installation page echo '

'; - echo 'Docs'; + echo 'Docs'; echo get_string('moodledocslink', 'install') . '

'; echo '
'; echo '
' . get_string('databasesettingssub_oci8po', 'install'); /// Link to oracle installation page echo '

'; - echo 'Docs'; + echo 'Docs'; echo get_string('moodledocslink', 'install') . '

'; echo '
'; } else { @@ -981,8 +981,7 @@ function install_helpbutton($url, $title='') { $title = get_string('help'); } echo ""; - echo "\"$title\"";"; echo "\n"; } diff --git a/lang/en_utf8/docs/teacher.html b/lang/en_utf8/docs/teacher.html index 29572e31a7..3ff640c84b 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 help +

- the help icon will provide you with a popup help window

-

  - the open-eye +

  - the open-eye icon will let you hide something from students

-

  - the closed-eye +

  - the 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 bee0cedd8e..a793dde87c 100644 --- a/lang/en_utf8/help/emoticons.html +++ b/lang/en_utf8/help/emoticons.html @@ -5,52 +5,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -59,52 +59,52 @@
smile :-)
big grin :-D
wink ;-)
mixed :-/
thoughtful V-.
tongue out :-P
cool B-)
approve ^-)
wide eyes 8-)
surprise 8-o
- + - + - + - + - + - + - + - + - + - + diff --git a/lang/en_utf8/help/richtext.html b/lang/en_utf8/help/richtext.html index 649dd85d68..455b4bd912 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 @@
sad :-(
shy 8-.
blush :-I
kisses :-X
clown :o)
black eye P-|
angry 8-[
dead xx-P
sleepy |-.
evil }-]
- + - + - + - + - + - + - + - + - + - + @@ -103,52 +103,52 @@
smile :-)
big grin :-D
wink ;-)
mixed :-/
thoughtful V-.
tongue out :-P
cool B-)
approve ^-)
wide eyes 8-)
surprise 8-o
- + - + - + - + - + - + - + - + - + - + diff --git a/lang/en_utf8/help/text.html b/lang/en_utf8/help/text.html index c537754dda..2eca397c8b 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
sad :-(
shy 8-.
blush :-I
kisses :-X
clown :o)
black eye P-|
angry 8-[
dead xx-P
sleepy |-.
evil }-]
- + - + - + - + - + - + - + - + - + - + @@ -65,52 +65,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
- + - + - + - + - + - + - + - + - + - + diff --git a/lib/editor/htmlarea/popups/dlg_ins_smile.php b/lib/editor/htmlarea/popups/dlg_ins_smile.php index 8ace906949..0ced0282ab 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 ""; + echo ""; echo ""; echo ""; echo ""; @@ -103,8 +103,8 @@ function cancel() { $name = $fullnames[$image]; $icon = $emoticons[$image]; echo ''; - echo ""; + echo ""; echo ""; echo ""; echo ""; diff --git a/lib/weblib.php b/lib/weblib.php index 441a4ac7a2..034384ddeb 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 = ''.$strscales.''; + $linkobject = ''.$strscales.''; $output .= link_to_popup_window ('/course/scales.php?id='. $courseid .'&list=true', 'ratingscales', $linkobject, 400, 500, $strscales, 'none', true); @@ -4489,7 +4489,7 @@ function print_scale_menu($courseid, $name, $current, $return=false) { $strscales = get_string('scales'); $output .= choose_from_menu(get_scales_menu($courseid), $name, $current, '', '', 0, true); - $linkobject = ''.$strscales.''; + $linkobject = ''.$strscales.''; $output .= link_to_popup_window ('/course/scales.php?id='. $courseid .'&list=true', 'ratingscales', $linkobject, 400, 500, $strscales, 'none', true); if ($return) { @@ -4514,7 +4514,7 @@ function print_scale_menu_helpbutton($courseid, $scale, $return=false) { $output = ''; $strscales = get_string('scales'); - $linkobject = ''.$scale->name.''; + $linkobject = ''.$scale->name.''; $output .= link_to_popup_window ('/course/scales.php?id='. $courseid .'&list=true&scaleid='. $scale->id, 'ratingscale', $linkobject, 400, 500, $scale->name, 'none', true); if ($return) { @@ -4675,7 +4675,7 @@ function editorhelpbutton(){ $alttag = join (', ', $titles); $paramstring = join('&', $urlparams); - $linkobject = ''.$alttag.''; + $linkobject = ''.$alttag.''; return link_to_popup_window(s('/lib/form/editorhelp.php?'.$paramstring), $alttag, $linkobject, 400, 500, $alttag, 'none', true); } @@ -4724,7 +4724,7 @@ function helpbutton ($page, $title='', $module='moodle', $image=true, $linktext= if ($imagetext) { $linkobject .= $imagetext; } else { - $linkobject .= ''.$tooltip.''; } } else { @@ -4786,7 +4786,7 @@ function editorshortcutshelpbutton() { global $CFG; $imagetext = ''. - get_string('editorshortcutkeys').''; + 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 .= '' .$text. ''; + $str .= '' .$text. ''; return $str; } diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php index 6335079635..4603881165 100755 --- a/mod/data/field/picture/field.class.php +++ b/mod/data/field/picture/field.class.php @@ -104,11 +104,11 @@ class data_field_picture extends data_field_file { $width = $this->field->param4 ? ' width="'.s($this->field->param4).'" ' : ' '; $height = $this->field->param5 ? ' height="'.s($this->field->param5).'" ' : ' '; $str = ''.s($alt).''; + $width.$height.' src="'.$thumbnailsource.'" alt="'.s($alt).'" title="'.s($title).'" style="border:0px" />'; } else { $width = $this->field->param1 ? ' width="'.s($this->field->param1).'" ':' '; $height = $this->field->param2 ? ' height="'.s($this->field->param2).'" ':' '; - $str = ''.s($alt).''; + $str = ''.s($alt).''; } return $str; } diff --git a/mod/glossary/config.html b/mod/glossary/config.html index 7c4953da52..e3d295c14a 100644 --- a/mod/glossary/config.html +++ b/mod/glossary/config.html @@ -220,7 +220,7 @@ $recformat = get_record('glossary_formats','id',$formatid); echo ''; echo ''; - $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">\"".get_string("edit")."\""; + $eicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=edit\">\"".get_string("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\">\"$vtitle\""; + $vicon = "wwwroot/mod/glossary/formats.php?id=$formatid&mode=visible\">\"$vtitle\""; echo ''; echo ''; diff --git a/mod/glossary/view.php b/mod/glossary/view.php index 88aac4fea9..a1531d9219 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 c474a700bb..274f9bb9f7 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 " - \"$strpreview\""; + \"$strpreview\""; } diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php index a90fa55b6f..e9ce98f6d1 100644 --- a/mod/wiki/ewiki/plugins/moodle/downloads.php +++ b/mod/wiki/ewiki/plugins/moodle/downloads.php @@ -334,7 +334,7 @@ function ewiki_entry_downloads($row, $show_section=0, $fullinfo=false) { $info->id = $id; $info->size = $p_size; - $info->icon = ($p_icon ? '['.$p_icon_t.'] ' : ''); + $info->icon = ($p_icon ? '['.$p_icon_t.'] ' : ''); $info->time = $p_time; $info->hits = $p_hits; $info->section = ($show_section ? ewiki_t('dwnl_section') . ": $p_section
" : ''); diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index 056e7a4416..1cde6d2fb8 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -294,21 +294,35 @@ form.popupform { } img.icon { - vertical-align: middle; - margin-right: 4px; + vertical-align:middle; + margin-right:4px; width:16px; height:16px; border:0px; } img.iconsmall { - vertical-align: middle; - margin-right: 1px; + vertical-align:middle; + margin-right:1px; width:11px; height:11px; border:0px; } +img.iconhelp { + vertical-align:middle; + margin-right:4px; + width:17px; + height:17px; + border:0px; +} + +img.iconkbhelp { + width:49px; + height:17px; + border:0px; +} + /*Accessibility: text 'seen' by screen readers but not visual users. Fixed for RTL languages, example Farsi. */ .accesshide { position:absolute; -- 2.39.5
sad :-(
shy 8-.
blush :-I
kisses :-X
clown :o)
black eye P-|
angry 8-[
dead xx-P
sleepy |-.
evil }-]
\"$name\"\"$name\"$name$icon
\"$name\"\"$name\"$name$icon
' . $formatname . '' . $eicon . '  ' . $vicon . '