]> gitweb.fluxo.info Git - semanticscuttle.git/commitdiff
make the page valid and keep chromium happy
authorChristian Weiske <cweiske@cweiske.de>
Sat, 9 Oct 2010 10:09:39 +0000 (12:09 +0200)
committerChristian Weiske <cweiske@cweiske.de>
Sat, 9 Oct 2010 10:09:39 +0000 (12:09 +0200)
data/templates/sidebar.block.linked.php
data/templates/top.inc.php
src/SemanticScuttle/header.php

index db0d0878d260672e9beb0b4f37d0e1af090caf12..54e9260acad8bb064dcca337ce36e6a22ad6ddfe 100644 (file)
@@ -32,7 +32,7 @@ if ($editingMode) {
 ?>
 <script type="text/javascript" src="<?php echo ROOT ?>js/jquery-1.4.2.js"></script>
 <script type="text/javascript" src="<?php echo ROOT ?>js/jquery.jstree.js"></script>
-<script type="text/javascript">
+<script type="text/javascript"><![CDATA[
 jQuery("#related")
 .jstree({
     "themes" : {
@@ -48,7 +48,7 @@ jQuery("#related")
                 parent = "";
                 if (node == -1 ) {
                     node = <?php echo json_encode($currenttag); ?>;
-                    parent = "&amp;parent=true";
+                    parent = "&parent=true";
                 } else if (node.attr('rel')) {
                     node = node.attr('rel');
                 } else {
@@ -60,5 +60,5 @@ jQuery("#related")
     },
     plugins : [ "themes", "json_data"]
 });
-</script>
+]]></script>
 </div>
\ No newline at end of file
index 8be978f054b587fbdd118eb673e7f6e9ee37201a..c3cbc5d01c44afcd8b5c249c5402ff51e7f075fc 100644 (file)
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
  <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
   <title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title>
   <link rel="icon" type="image/png" href="<?php echo ROOT ?>icon.png" />
   <link rel="stylesheet" type="text/css" href="<?php echo ROOT ?>scuttle.css" />
index d1a5c293bb09d834a6028f30e9e8eaace3ebd36e..3caeb35ebdfaaaa19299cc3fd0d1dd22d63cff8f 100644 (file)
@@ -120,7 +120,10 @@ $tplVars['userservice'] = $userservice;
 if (!defined('UNIT_TEST_MODE')) {
     //API files define that, so we need a way to support both of them
     if (!isset($httpContentType)) {
-        $httpContentType = 'text/html';
+        //$httpContentType = 'text/html';
+        //using that mime type makes all javascript nice in Chromium
+        // it also serves as test base if the pages really validate
+        $httpContentType = 'application/xhtml+xml';
     }
     if ($httpContentType !== false) {
         header('Content-Type: ' . $httpContentType . '; charset=utf-8');