diff options
| author | Matthieu Aubry <matt@piwik.org> | 2013-07-05 09:45:14 +0400 |
|---|---|---|
| committer | Matthieu Aubry <matt@piwik.org> | 2013-07-05 09:45:14 +0400 |
| commit | 137d27ab07b115470d3f40d7afe29a726929b123 (patch) | |
| tree | 1d51e385a1d29da4615a69cfd8197d5e062ffa1c /tests | |
| parent | 7133a08c4e3671970fcdddc0670a6bb73cab4b27 (diff) | |
| parent | a87a9cc562dbe677d96a3ffef19ae8b0a3ac08d2 (diff) | |
Merge pull request #82 from tzi/pleineLune__layout-cleanup
HTML & CSS clean up. See below for review & regressions.
Diffstat (limited to 'tests')
11 files changed, 18 insertions, 23 deletions
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html index 1f27b18ef8..e85cf1d597 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html index 918ed744a9..ef77c1b7de 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html index 677249cafa..8657d7b64f 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html index e40448a8cd..2a3f647dda 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html index f06484d972..c443b7b766 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html index 2bd73e792e..7bf226f41f 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html @@ -1,6 +1,6 @@ <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <meta charset="utf-8"/> </head> <body style="color: rgb(68,68,68);"> diff --git a/tests/javascript/index.php b/tests/javascript/index.php index 0d6fa88b8e..eae2b8387c 100644 --- a/tests/javascript/index.php +++ b/tests/javascript/index.php @@ -1,9 +1,8 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html> <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>piwik.js: Unit Tests</title> + <meta charset="utf-8"> + <title>piwik.js: Unit Tests</title> <?php require_once(dirname(__FILE__).'/SQLite.php'); diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl index 4c7de1cd5e..a5d2c40e46 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/allfiles.tmpl @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}" /> {! Link.base = ""; /* all generated links will be relative to this */ !} diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl index 1b32e4aa12..4f980d4269 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/class.tmpl @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}" /> <meta name="generator" content="JsDoc Toolkit" /> diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl b/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl index a5dc1158ec..06960ec799 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/index.tmpl @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> <meta http-equiv="content-type" content="text/html; charset={+IO.encoding+}" /> diff --git a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html index 661f6f67d1..7632b1d4e2 100644 --- a/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html +++ b/tests/lib/jsdoc-toolkit/templates/jsdoc/static/index.html @@ -1,8 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<!DOCTYPE html> +<html lang="en"> <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <meta charset="utf-8"> <title>Generated Javascript Documentation</title> </head> <frameset cols="20%,80%"> |