diff options
| -rw-r--r-- | inc/html.php | 2 | ||||
| -rw-r--r-- | inc/template.php | 7 | ||||
| -rw-r--r-- | install.php | 4 | ||||
| -rw-r--r-- | lib/images/fileicons/index.php | 2 | ||||
| -rw-r--r-- | lib/images/smileys/index.php | 2 | ||||
| -rw-r--r-- | lib/tpl/index.php | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/inc/html.php b/inc/html.php index 1287cb4e9..1f494d46b 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1940,7 +1940,7 @@ function html_edit(){ if ($wr) { // sets changed to true when previewed - echo '<script type="text/javascript">/*<![CDATA[*/'. NL; + echo '<script>/*<![CDATA[*/'. NL; echo 'textChanged = ' . ($mod ? 'true' : 'false'); echo '/*!]]>*/</script>' . NL; } ?> diff --git a/inc/template.php b/inc/template.php index 1aeef1fee..798fea52e 100644 --- a/inc/template.php +++ b/inc/template.php @@ -332,7 +332,7 @@ function tpl_metaheaders($alt = true) { // load stylesheets $head['link'][] = array( - 'rel' => 'stylesheet', 'type'=> 'text/css', + 'rel' => 'stylesheet', 'href'=> DOKU_BASE.'lib/exe/css.php?t='.rawurlencode($conf['template']).'&tseed='.$tseed ); @@ -342,13 +342,12 @@ function tpl_metaheaders($alt = true) { } jsinfo(); $script .= 'var JSINFO = ' . json_encode($JSINFO).';'; - $head['script'][] = array('type'=> 'text/javascript', '_data'=> $script); + $head['script'][] = array('_data'=> $script); // load jquery $jquery = getCdnUrls(); foreach($jquery as $src) { $head['script'][] = array( - 'type' => 'text/javascript', 'charset' => 'utf-8', '_data' => '', 'src' => $src, @@ -357,7 +356,7 @@ function tpl_metaheaders($alt = true) { // load our javascript dispatcher $head['script'][] = array( - 'type'=> 'text/javascript', 'charset'=> 'utf-8', '_data'=> '', + 'charset'=> 'utf-8', '_data'=> '', 'src' => DOKU_BASE.'lib/exe/js.php'.'?t='.rawurlencode($conf['template']).'&tseed='.$tseed, ) + ($conf['defer_js'] ? [ 'defer' => 'defer'] : []); diff --git a/install.php b/install.php index 407c2c364..55dac2570 100644 --- a/install.php +++ b/install.php @@ -46,7 +46,7 @@ header('Content-Type: text/html; charset=utf-8'); <head> <meta charset="utf-8" /> <title><?php echo $lang['i_installer']?></title> - <style type="text/css"> + <style> body { width: 90%; margin: 0 auto; font: 84% Verdana, Helvetica, Arial, sans-serif; } img { border: none } br.cl { clear:both; } @@ -56,7 +56,7 @@ header('Content-Type: text/html; charset=utf-8'); select.text, input.text { width: 30em; margin: 0 0.5em; } a {text-decoration: none} </style> - <script type="text/javascript"> + <script> function acltoggle(){ var cb = document.getElementById('acl'); var fs = document.getElementById('acldep'); diff --git a/lib/images/fileicons/index.php b/lib/images/fileicons/index.php index 8ec577593..d1f233e48 100644 --- a/lib/images/fileicons/index.php +++ b/lib/images/fileicons/index.php @@ -3,7 +3,7 @@ <head> <title>Filetype icons</title> - <style type="text/css"> + <style> body { background-color: #ccc; font-family: Arial; diff --git a/lib/images/smileys/index.php b/lib/images/smileys/index.php index c9c74872f..574966628 100644 --- a/lib/images/smileys/index.php +++ b/lib/images/smileys/index.php @@ -3,7 +3,7 @@ <head> <title>Smileys</title> - <style type="text/css"> + <style> body { background-color: #ccc; font-family: Arial; diff --git a/lib/tpl/index.php b/lib/tpl/index.php index a3e9a8849..4d48d5127 100644 --- a/lib/tpl/index.php +++ b/lib/tpl/index.php @@ -18,7 +18,7 @@ require_once(DOKU_INC.'inc/init.php'); <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>Template Replacements</title> - <style type="text/css"> + <style> body { background-color: #fff; color: #000; |