merged analytics and changes to make bootlex xhtml strict

This commit is contained in:
Alexander Jung-Loddenkemper
2012-03-18 20:04:02 +01:00
parent 6d2edf7db1
commit f3060b4474
4 changed files with 26 additions and 24 deletions

View File

@@ -1,11 +1,15 @@
{% if GOOGLE_ANALYTICS %}
<script type="text/javascript">
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '{{ GOOGLE_ANALYTICS }}']);
_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>
<script type="text/javascript">
try {
var pageTracker = _gat._getTracker("{{GOOGLE_ANALYTICS}}");
pageTracker._trackPageview();
} catch(err) {}</script>
{% endif %}

View File

@@ -3,9 +3,9 @@
{% block content %}
<div id="content">
<div class="header">
<h1>{{ article.title }}</h2>
<h1>{{ article.title }}</h1>
</div>
<p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
<p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
<div class="entry-content">
{{ article.content }}
</div><!-- /.entry-content -->

View File

@@ -1,15 +1,16 @@
<!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" lang="en">
<html lang="{{ DEFAULT_LANG }}">
<html xmlns="http://www.w3.org/1999/xhtml" lang="{{ DEFAULT_LANG }}">
<head>
{% block head %}
<title>{% block title %}{% endblock title %} - {{ SITENAME }}</title>
<meta http-equiv="content-type" content="charset=utf-8" />
<link href="http://fonts.googleapis.com/css?family=Arimo:400,700|Inika" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/bootstrap.css">
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/pastie.css">
<link href="http://fonts.googleapis.com/css?family=Arimo:400,700|Inika" rel="stylesheet" type="text/css" />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}theme/pastie.css" />
{% endblock head %}
{% include 'analytics.html' %}
</head>
<body>
@@ -63,7 +64,7 @@
</div>
</div>
<hr>
<hr />
<div class="row">
<div class="span12">
@@ -73,8 +74,5 @@
</div><!-- /#contentinfo -->
</div>
</div>
{% include 'analytics.html' %}
</body>
</html>

View File

@@ -3,7 +3,7 @@
{% block content %}
<div id="content">
{% block content_title %}
<h1>Blog</h2>
<h1>Blog</h1>
{% endblock %}
<ul class="unstyled">
@@ -13,7 +13,7 @@
<div class="header">
<h2>{{ article.title }}</h2>
</div>
<p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</small></p>
<p class="meta"><small><span>{% if article.author %}<a href="{{ SITEURL }}author/{{ article.author }}/">{{ article.author }}</a> - {% endif %}</span><span>{{ article.locale_date }}</span> - <span class="tags">{% if article.tags %}{% for tag in article.tags %}<a href="/tag/{{ tag }}/">{{ tag }}</a>{% if not loop.last %}, {% endif %}{% endfor %}{% endif %}</span></small></p>
<div class="entry-content">
{{ article.summary }}
</div><!-- /.entry-content -->
@@ -25,7 +25,7 @@
</div>
</li>
<hr>
<li><hr /></li>
{% endfor %}