From: ikawhero Date: Tue, 18 Jan 2005 09:46:01 +0000 (+0000) Subject: General tidy up of code, changes for XHTML and accessibility compatibility. X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2e708fa0966312bc6fd36c3699ec79cf396b03da;p=moodle.git General tidy up of code, changes for XHTML and accessibility compatibility. --- diff --git a/mod/resource/lib.php b/mod/resource/lib.php index 794b9f29e5..908a0dc6ad 100644 --- a/mod/resource/lib.php +++ b/mod/resource/lib.php @@ -32,18 +32,18 @@ if (!isset($CFG->resource_parametersettings)) { set_config("resource_parametersettings", "0"); } -$RESOURCE_WINDOW_OPTIONS = array("resizable", "scrollbars", "directories", "location", - "menubar", "toolbar", "status", "height", "width"); +$RESOURCE_WINDOW_OPTIONS = array('resizable', 'scrollbars', 'directories', 'location', + 'menubar', 'toolbar', 'status', 'height', 'width'); foreach ($RESOURCE_WINDOW_OPTIONS as $popupoption) { $popupoption = "resource_popup$popupoption"; if (!isset($CFG->$popupoption)) { - if ($popupoption == "resource_popupheight") { + if ($popupoption == 'resource_popupheight') { set_config($popupoption, 450); - } else if ($popupoption == "resource_popupwidth") { + } else if ($popupoption == 'resource_popupwidth') { set_config($popupoption, 620); } else { - set_config($popupoption, "checked"); + set_config($popupoption, 'checked'); } } } diff --git a/mod/resource/type/common.html b/mod/resource/type/common.html index 980e016c8b..8b8eb8af39 100644 --- a/mod/resource/type/common.html +++ b/mod/resource/type/common.html @@ -11,19 +11,17 @@ - + - - + - + - - + + $optionname = $optionvalue; } else if ($optionvalue) { - $window->$optionname = "checked=\"checked\""; + $window->$optionname = 'checked="checked"'; } } } } else { foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) { $defaultvalue = "resource_popup$optionname"; - $window->$optionname = $CFG->$defaultvalue; + + if ($optionname == 'height' or $optionname == 'width') { + $window->$optionname = $CFG->$defaultvalue; + } else if ($CFG->$defaultvalue) { + $window->$optionname = 'checked="checked"'; + } } $windowtype = ($CFG->resource_popup) ? 'popup' : 'page'; diff --git a/mod/resource/type/html/html.html b/mod/resource/type/html/html.html index 445c2bee59..08db9bb531 100644 --- a/mod/resource/type/html/html.html +++ b/mod/resource/type/html/html.html @@ -31,12 +31,10 @@ -

:


- + :

-
+

- - + +

:

: " />

:

- + 		:

- 		summary); ?> diff --git a/mod/resource/type/file/file.html b/mod/resource/type/file/file.html index 548f2b85d2..32f75e0b1f 100644 --- a/mod/resource/type/file/file.html +++ b/mod/resource/type/file/file.html @@ -31,12 +31,12 @@ -

:

+ : 		reference\" alt=\"reference\" />
"; - button_to_popup_window ("/files/index.php?id=$form->course&choose=form.reference", "coursefiles", $strchooseafile, 500, 750, $strchooseafile); + echo "reference\" alt=\"reference\" />
"; + button_to_popup_window ("/files/index.php?id=$form->course&choose=form.reference", "coursefiles", $strchooseafile, 500, 750, $strchooseafile); echo "resource_websearch', 'websearch', 'menubar=1,location=1,directories=1,toolbar=1,scrollbars,resizable,width=800,height=600');\" />\n"; ?> @@ -46,7 +46,7 @@

:

:

:

:

alltext); ?> @@ -46,7 +44,7 @@

:

: ]; var allitems = []; - + onclick="return lockoptions('form', 'windowpopup[1]', popupitems);" /> - "> +
- + onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" />
@@ -86,19 +84,19 @@ if ($name == "height" or $name == "width") { continue; } - echo ""; - echo "$name." />"; $stringname = "str$name"; + echo ""; + echo "\" ".$window->$name." />"; echo $$stringname."
"; } ?> - +
- +
$optionname = $optionvalue; } else if ($optionvalue) { - $window->$optionname = "checked=\"checked\""; + $window->$optionname = 'checked="checked"'; } } } } else { foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) { $defaultvalue = "resource_popup$optionname"; - $window->$optionname = $CFG->$defaultvalue; + + if ($optionname == "height" or $optionname == "width") { + $window->$optionname = $CFG->$defaultvalue; + } else if ($CFG->$defaultvalue) { + $window->$optionname = 'checked="checked"'; + } } $windowtype = ($CFG->resource_popup) ? 'popup' : 'page'; diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php index a934a796da..90a38e513d 100644 --- a/mod/resource/type/text/resource.class.php +++ b/mod/resource/type/text/resource.class.php @@ -187,14 +187,19 @@ function setup($form) { if ($optionname == "height" or $optionname == "width") { $window->$optionname = $optionvalue; } else if ($optionvalue) { - $window->$optionname = "checked=\"checked\""; + $window->$optionname = 'checked="checked"'; } } } } else { foreach ($RESOURCE_WINDOW_OPTIONS as $optionname) { $defaultvalue = "resource_popup$optionname"; - $window->$optionname = $CFG->$defaultvalue; + + if ($optionname == "height" or $optionname == "width") { + $window->$optionname = $CFG->$defaultvalue; + } else if ($CFG->$defaultvalue) { + $window->$optionname = 'checked="checked"'; + } } $windowtype = ($CFG->resource_popup) ? 'popup' : 'page'; diff --git a/mod/resource/type/text/text.html b/mod/resource/type/text/text.html index ce7eb587c8..8860f6b9bc 100644 --- a/mod/resource/type/text/text.html +++ b/mod/resource/type/text/text.html @@ -32,11 +32,9 @@ -

:


- + :


-
alltext); ?> @@ -44,7 +42,7 @@
-

:


+ :
 -

:

: ]; var allitems = []; - + " onclick="return lockoptions('form', 'windowpopup[1]', popupitems);" /> "> @@ -90,7 +88,7 @@
- + onclick=" return lockoptions('form', 'windowpopup[1]', popupitems);" /> @@ -100,8 +98,8 @@ if ($name == "height" or $name == "width") { continue; } - echo ""; - echo "$name." />"; + echo ''; + echo '$name.' />'; $stringname = "str$name"; echo $$stringname."
"; }