Skip to content

Commit

Permalink
markup validation and cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@atutorlangs
atutorlangs committed Jan 12, 2014
1 parent 9574411 commit c3bef77
Show file tree
Hide file tree
Showing 67 changed files with 91 additions and 308 deletions.
2 changes: 1 addition & 1 deletion include/footer.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

// this js is indep of the theme used:
?>
<script language="javascript" type="text/javascript">
<script type="text/javascript">
//<!--z
var selected;
function rowselect(obj) {
Expand Down
2 changes: 1 addition & 1 deletion include/html/languages.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
return;
}
?>
<div align="center" id="langdiv" style="clear: left"><br /><?php
<div id="langdiv" style="clear: left"><br /><?php

if ($languageManager->getNumLanguages() > 5) {
echo '<form method="get" action="'.AT_print($_my_uri,'url.base').'">';
Expand Down
4 changes: 2 additions & 2 deletions include/lib/tinymce.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ function load_editor($simple = TRUE, $name = FALSE, $mode="textareas") {
//insert predefined template: template
//insert page break: pagebreak

echo '<script language="javascript" type="text/javascript" src="'.AT_BASE_HREF.'jscripts/tiny_mce/tiny_mce.js"></script>
<script language="javascript" type="text/javascript">';
echo '<script type="text/javascript" src="'.AT_BASE_HREF.'jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">';

echo 'ATutor = ATutor || {};
ATutor.tinymce = ATutor.tinymce || {};
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/plugins/advimage/js/image.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var ImageDialog = {
tinyMCEPopup.requireLangPack();

if (url = tinyMCEPopup.getParam("external_image_list_url"))
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
},

init : function(ed) {
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/plugins/advlink/js/advlink.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function preinit() {
var url;

if (url = tinyMCEPopup.getParam("external_link_list_url"))
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
}

function changeClass() {
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/plugins/media/js/media.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
var url;

if (url = tinyMCEPopup.getParam("media_external_list_url"))
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

function get(id) {
return document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/plugins/preview/example.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script language="javascript" src="../../tiny_mce_popup.js"></script>
<script src="../../tiny_mce_popup.js"></script>
<script type="text/javascript" src="jscripts/embed.js"></script>
<script type="text/javascript">
tinyMCEPopup.onInit.add(function(ed) {
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/plugins/template/js/template.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var TemplateDialog = {
var url = tinyMCEPopup.getParam("template_external_list_url");

if (url != null)
document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
document.write('<sc'+'ript type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
},

init : function() {
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/themes/advanced/js/image.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var ImageDialog = {
tinyMCEPopup.requireLangPack();

if (url = tinyMCEPopup.getParam("external_image_list_url"))
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
},

init : function() {
Expand Down
2 changes: 1 addition & 1 deletion jscripts/tiny_mce/themes/advanced/js/link.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var LinkDialog = {
var url;

if (url = tinyMCEPopup.getParam("external_link_list_url"))
document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
document.write('<script type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
},

init : function() {
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/backups/admin/restore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
</div>
</form>
<?php $i=0; ?>
<script language="javascript" type="text/javascript">
<script type="text/javascript">

function selectAll() {
if (document.form.all.checked == true) {
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/backups/upload.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@



<script language="javascript" type="text/javascript">
<script type="text/javascript">
function openWindow(page) {
newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
newWindow.focus();
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/courses/html/course_properties.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
$savant->display('admin/courses/edit_course.tmpl.php');
?>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
<!--
function enableNotify() {
document.course_form.notify.disabled = false;
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/editor/edit_content.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@

if(isset($main['tool_file'])) {
// echo '<!-- TODO LAW note problem here with one tool_file variable for multiple tools -->'."\n";
echo ' <script type="text/javascript" language="javascript">'."\n";
echo ' <script type="text/javascript">'."\n";
echo ' //<!--'."\n";
echo ' ATutor.mods.editor.tool_for = "' . urlencode($main['title']) . '";'."\n";
echo ' //-->'."\n";
Expand Down
4 changes: 2 additions & 2 deletions mods/_core/editor/editor_tabs/edit.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

if (!defined('AT_INCLUDE_PATH')) { exit; }
?>
<script type="text/javascript" language="javascript">
<script type="text/javascript">
//<!--
ATutor.mods.editor.editor_pref = "<?php if(isset($_SESSION['prefs']['PREF_CONTENT_EDITOR'])) echo $_SESSION['prefs']['PREF_CONTENT_EDITOR'] ?>";
//-->
Expand Down Expand Up @@ -57,7 +57,7 @@
$_POST['head'] = $stripslashes($_POST['head']);
}
?>
<script type="text/javascript" language="javascript">
<script type="text/javascript">
//<!--
ATutor.mods.editor.content_path = "<?php if(isset($content_row['content_path'])) echo $content_row['content_path'] ?>";
ATutor.mods.editor.content_id = "<?php if(isset($cid)) echo $cid ?>";
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/editor/editor_tabs/tests.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
<br />
<?php }?>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
function toggleTestSelect(r_id){
var row = document.getElementById(r_id);
var checkBox = row.cells[0].firstChild;
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/file_manager/new.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
</div>
</form>

<script type="text/javascript" language="javascript">
<script type="text/javascript">
//<!--
function on_load()
{
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/groups/members.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
</table>
</form>

<script type="text/javascript" language="javascript">
<script type="text/javascript">
// <!--
function hirow(obj, row) {
if (obj.value && obj.value == <?php echo $_GET['gid']; ?>) {
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/imscp/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ function print_menu_sections(&$menu, $only_print_content_folder = false, $parent
</div>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">

var but_src;
function setClickSource(name) {
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/languages/language_editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
</div>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
//<!--
function showtext(obj) {
frames['tran'].location.href = "<?php echo AT_BASE_HREF; ?>mods/_core/languages/language_term.php?type=<?php echo $_variables[$_GET['type']].SEP; ?>term=" + obj.value;
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/languages/translate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
define('AT_INCLUDE_PATH', '../../../include/');
?>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
function openWindow(page) {
newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
newWindow.focus();
Expand Down
2 changes: 1 addition & 1 deletion mods/_core/users/admins/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@

?>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
// <!--
function checkAdmin() {
if (document.form.priv_admin.checked == true) {
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/assignments/add_assignment.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@



<script language="javascript" type="text/javascript">
<script type="text/javascript">
function disable_dates (state, name) {
document.form['day' + name].disabled=state;
document.form['month' + name].disabled=state;
Expand Down
6 changes: 3 additions & 3 deletions mods/_standard/calendar/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
";
}
$_custom_head .=
'<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
<script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
'<script type="text/javascript">' . $global_js_vars . '</script>
<script type="text/javascript" src="' . AT_BASE_HREF .
'mods/_standard/calendar/js/index.js"></script>';
$_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet
require(AT_INCLUDE_PATH.'header.inc.php');
Expand Down Expand Up @@ -254,7 +254,7 @@
?>
</div>

<script language="javascript" type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
<script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
</script>

<style type='text/css'>
Expand Down
8 changes: 4 additions & 4 deletions mods/_standard/calendar/index_mystart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@
";
}
$_custom_head .=
'<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
<script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
'<script type="text/javascript">' . $global_js_vars . '</script>
<script type="text/javascript" src="' . AT_BASE_HREF .
'mods/_standard/calendar/js/index_mystart.js"></script>';
$_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet
require(AT_INCLUDE_PATH.'header.inc.php');
Expand All @@ -107,7 +107,7 @@
?>
<!-- Loader wheel to indicate on-going transfer of data -->

<script language="javascript" type="text/javascript">
<script type="text/javascript">

var userid = "<?php echo $_SESSION['member_id']; ?>";
</script>
Expand All @@ -116,7 +116,7 @@
</div>


<script language="javascript" type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
<script type="text/javascript" src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
</script>

<style type='text/css'>
Expand Down
6 changes: 3 additions & 3 deletions mods/_standard/calendar/index_public.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
var cid = '" . $_GET['cid'] . "';
";
$_custom_head .=
'<script language="javascript" type="text/javascript">' . $global_js_vars . '</script>
<script language="javascript" type="text/javascript" src="' . AT_BASE_HREF .
'<script type="text/javascript">' . $global_js_vars . '</script>
<script type="text/javascript" src="' . AT_BASE_HREF .
'mods/_standard/calendar/js/index_public.js"></script>';

//Get member id from request if it is not set then display default message
Expand Down Expand Up @@ -165,7 +165,7 @@
?>
<?php $_custom_css = $_base_path . 'mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.css'; // use a custom stylesheet ?>

<script language="javascript" type="text/javascript"
<script type="text/javascript"
src="<?php echo AT_BASE_HREF; ?>mods/_standard/calendar/lib/fullcalendar/fullcalendar-theme.js">
</script>

Expand Down
4 changes: 2 additions & 2 deletions mods/_standard/chat/display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
require('include/html/chat_header.inc.php');
if ($myPrefs['refresh'] != 'manual') {
?>
<script language="javascript" type="text/javascript">
<script type="text/javascript">
<!--
setTimeout("reDisplay()", <?php echo $myPrefs['refresh'] * 1000; ?>);
function reDisplay() {
Expand Down Expand Up @@ -111,7 +111,7 @@ function reDisplay() {
<input type="submit" name="submit" value="'._AT('send').'" class="button" title="'._AT('send').'" onfocus="this.className=\'submit highlight\'" onblur="this.className=\'submit\'" />';

echo '</form></p>';
echo '<script language="javascript"><!--
echo '<script type="text/javascript"><!--
function checkForm() {
if (document.f1.message.value == "" || !document.f1.message.value) return false;
return true;
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/chat/poster.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</td>
</tr>
</table>
<script language="javascript" type="text/javascript"><!--
<script type="text/javascript"><!--
function checkForm() {
document.f1.message.value = document.f1.tempField.value;
if (document.f1.message.value == "" || !document.f1.message.value) return false;
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/gradebook/gradebook_add_tests.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function add_assignment($assignment_id)
</div>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
function disable_dates (state, name) {
document.form['day' + name].disabled=state;
document.form['month' + name].disabled=state;
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/gradebook/gradebook_edit_tests.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
</div>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
function disable_dates (state, name) {
document.form['day' + name].disabled=state;
document.form['month' + name].disabled=state;
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/tests/html/tests_questions.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</table>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
// <!--
function selectCat(catID, cat) {
for (var i=0;i<document.form.elements.length;i++) {
Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/tests/lib/test_result_functions.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function print_question_cats($cat_id = 0) {

function print_VE ($area) {
?>
<script type="text/javascript" language="javascript">
<script type="text/javascript">
document.writeln('<a href="#" onclick="javascript:window.open(\'<?php echo AT_BASE_HREF; ?>mods/_standard/tests/form_editor.php?area=<?php echo $area; ?>\',\'newWin1\',\'toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,copyhistory=0,width=640,height=480\'); return false;" style="cursor: pointer; text-decoration: none" ><?php echo _AT('use_visual_editor'); ?></a>');
</script>

Expand Down
2 changes: 1 addition & 1 deletion mods/_standard/tile_search/import.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function print_menu_sections(&$menu, $parent_content_id = 0, $depth = 0, $orderi
</div>
</form>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
function openWindow(page) {
newWindow = window.open(page, "progWin", "width=400,height=200,toolbar=no,location=no");
newWindow.focus();
Expand Down
2 changes: 1 addition & 1 deletion themes/atspaces/include/footer.tmpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<?php require(AT_INCLUDE_PATH.'html/copyright.inc.php'); ?>
</div>
</div> <!-- end page wrapper -->
<script language="javascript" type="text/javascript">
<script type="text/javascript">
//<!--
<?php require_once(AT_INCLUDE_PATH.'../jscripts/ATutor_js.php'); ?>
//-->
Expand Down
2 changes: 1 addition & 1 deletion themes/atspaces/include/header.tmpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/InfusionAll.js"></script>
<script type="text/javascript" src="<?php echo $this->base_href; ?>jscripts/infusion/framework/enhancement/js/ProgressiveEnhancement.js"></script>

<script language="javascript" type="text/javascript">
<script type="text/javascript">
//<!--

jQuery.noConflict();
Expand Down
2 changes: 1 addition & 1 deletion themes/blumin/include/header.tmpl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<?php endif; ?>

<script src="<?php echo $this->base_path; ?>jscripts/infusion/InfusionAll.js" type="text/javascript"></script>
<script language="javascript" type="text/javascript">
<script type="text/javascript">
//<!--
jQuery.noConflict();
//-->
Expand Down
Loading

0 comments on commit c3bef77

Please sign in to comment.