From dead710e69a04eeb48533ae8de071ae0db4ea496 Mon Sep 17 00:00:00 2001 From: Jacques Distler Date: Fri, 4 Jun 2010 12:10:26 -0500 Subject: [PATCH] Revert #633 MathPlayer doesn't like the HTML5 DOCTYPE. Revert to sending XHTML+MathML+SVG DOCTYPE. --- app/controllers/wiki_controller.rb | 2 +- app/views/layouts/default.rhtml | 2 +- app/views/layouts/error.html.erb | 2 +- app/views/wiki/s5.rhtml | 3 +-- app/views/wiki/source.html.erb | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index fa9fe080..303b232a 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -71,7 +71,7 @@ class WikiController < ApplicationController export_pages_as_zip(html_ext) do |page| renderer = PageRenderer.new(page.revisions.last) rendered_page = <<-EOL - + #{page.plain_name} in #{@web.name} diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml index 620b7925..79dba5dc 100644 --- a/app/views/layouts/default.rhtml +++ b/app/views/layouts/default.rhtml @@ -1,4 +1,4 @@ - + diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index 6659df53..5c03dfce 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" > <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title> diff --git a/app/views/wiki/s5.rhtml b/app/views/wiki/s5.rhtml index ccbb8c37..ea0131c3 100644 --- a/app/views/wiki/s5.rhtml +++ b/app/views/wiki/s5.rhtml @@ -1,5 +1,4 @@ -<!DOCTYPE html> - +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" > <html xmlns="http://www.w3.org/1999/xhtml"> <head> diff --git a/app/views/wiki/source.html.erb b/app/views/wiki/source.html.erb index 1ef02b0e..952cf56a 100644 --- a/app/views/wiki/source.html.erb +++ b/app/views/wiki/source.html.erb @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" > <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>