diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${next.title()}</title> <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" /> @@ -10,22 +10,19 @@ ${self.css()} <!-- scripts --> ${self.js()} -%if c.ga_code: -<script type="text/javascript"> - - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '${c.ga_code}']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - - -</script> -%endif + %if c.ga_code: + <script type="text/javascript"> + var _gaq = _gaq || []; + _gaq.push(['_setAccount', '${c.ga_code}']); + _gaq.push(['_trackPageview']); + + (function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); + })(); + </script> + %endif </head> <body> <!-- header --> diff --git a/rhodecode/templates/errors/error_document.html b/rhodecode/templates/errors/error_document.html --- a/rhodecode/templates/errors/error_document.html +++ b/rhodecode/templates/errors/error_document.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Error - ${c.error_message}</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${_('Sign In')} - ${c.rhodecode_name}</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${_('Reset You password')} - ${c.rhodecode_name}</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml"> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>${_('Sign Up')} - ${c.rhodecode_name}</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />