From c6ba7b228b1fcb86ab4f15922a65439dd160c4bf Mon Sep 17 00:00:00 2001
From: james <james.bryant@elizabetharden.com>
Date: Sat, 29 Dec 2012 20:20:35 -0500
Subject: Modified templates/base.html, added {{ SITE_URL }} to the CSS
 reference link

---
 syte/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'syte')

diff --git a/syte/templates/base.html b/syte/templates/base.html
index fe42127..cbb0432 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -9,7 +9,7 @@
   <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
 {% assets filters="cssmin", output="css/styles.min.css", "css/styles.css", "css/pygments.css" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
+<link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
 {% endassets %}
 
   <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />
-- 
cgit 


From 0515b40255724fe55835295743293d97627bf2c0 Mon Sep 17 00:00:00 2001
From: jamesbeebop <jamesbeebop@gmail.com>
Date: Sat, 29 Dec 2012 20:22:26 -0500
Subject: Update syte/templates/base.html

Added {{ SITE_URL }} to the stylesheet link reference
---
 syte/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'syte')

diff --git a/syte/templates/base.html b/syte/templates/base.html
index fe42127..852a7a5 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -9,7 +9,7 @@
   <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
 {% assets filters="cssmin", output="css/styles.min.css", "css/styles.css", "css/pygments.css" %}
-    <link rel="stylesheet" href="{{ ASSET_URL }}">
+    <link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
 {% endassets %}
 
   <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />
-- 
cgit 


From 3aae16db8c96c077659763ad9ae41f1cb2f808c2 Mon Sep 17 00:00:00 2001
From: james <james.bryant@elizabetharden.com>
Date: Sun, 30 Dec 2012 09:12:30 -0500
Subject: Added SITE_URL to both instances of ASSET_URL to fix broken relative
 links to resources

---
 syte/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'syte')

diff --git a/syte/templates/base.html b/syte/templates/base.html
index cbb0432..e224cb6 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -61,7 +61,7 @@
 </div>
 
 {% assets filters="rjsmin", output="gen/packed.js", "js/libs/jquery-1.7.2.min.js", "js/libs/jquery.url.js", "js/libs/bootstrap-modal.js", "js/libs/handlebars.js", "js/libs/spin.min.js", "js/libs/moment.min.js", "js/common.js", "js/libs/github.js", "js/libs/google+.js", "js/libs/twitter.js", "js/libs/instagram.js" %}
-    <script src="{{ ASSET_URL }}"></script>
+<script src="{{ SITE_URL }}/{{ ASSET_URL }}"></script>
 {% endassets %}
 
 <script>
-- 
cgit 


From 4b5ed29cd1e3e15027adbc76d5705ea8e58aab38 Mon Sep 17 00:00:00 2001
From: james <james.bryant@elizabetharden.com>
Date: Sun, 30 Dec 2012 21:57:15 -0500
Subject: Added support for Piwik analytics.

---
 syte/templates/base.html  |  1 +
 syte/templates/piwik.html | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 syte/templates/piwik.html

(limited to 'syte')

diff --git a/syte/templates/base.html b/syte/templates/base.html
index 764f9c5..c9e4807 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -104,4 +104,5 @@
 </script>
 
 {% include "analytics.html" %}
+{% include "piwik.html" %}
 </body>
diff --git a/syte/templates/piwik.html b/syte/templates/piwik.html
new file mode 100644
index 0000000..08eba22
--- /dev/null
+++ b/syte/templates/piwik.html
@@ -0,0 +1,16 @@
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+<script type="text/javascript">
+{% if PIWIK_SSL_URL %}
+	var pkBaseURL = (("https:" == document.location.protocol) ? "https://{{ PIWIK_SSL_URL }}/" : "http://{{ PIWIK_URL }}/");
+{% else %}
+	var pkBaseURL = (("http:" == document.location.protocol) ? "http://{{ PIWIK_URL }}/" : "http://{{ PIWIK_URL }}/");
+{% endif %}
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {{ PIWIK_SITE_ID }});
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
+{% endif %}
-- 
cgit 


From 1c57debdd9d96b35ec59be198b7eaf777a661550 Mon Sep 17 00:00:00 2001
From: james <james.bryant@elizabetharden.com>
Date: Wed, 9 Jan 2013 13:08:14 -0500
Subject: Resolving conflict in syte/templates/base.html

---
 syte/templates/base.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'syte')

diff --git a/syte/templates/base.html b/syte/templates/base.html
index c9e4807..7a70cab 100644
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -9,11 +9,7 @@
   <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 
 {% assets filters="cssmin", output="css/styles.min.css", "css/styles.css", "css/pygments.css" %}
-<<<<<<< HEAD
-<link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
-=======
     <link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
->>>>>>> 0515b40255724fe55835295743293d97627bf2c0
 {% endassets %}
 
   <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />
-- 
cgit