From a004d494703c22d49a814b33aac8da67be917886 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 21 Jul 2014 10:36:51 -0400 Subject: [PATCH] Switching from Intercom to Olark. --- .../templates/blogs/themes/default/base.html | 2 +- templates/base.html | 59 +++++++------------ utils/templatetags/intercom.py | 10 ---- 3 files changed, 23 insertions(+), 48 deletions(-) delete mode 100644 utils/templatetags/intercom.py diff --git a/blogs/templates/blogs/themes/default/base.html b/blogs/templates/blogs/themes/default/base.html index 8379331..5d0a25b 100644 --- a/blogs/templates/blogs/themes/default/base.html +++ b/blogs/templates/blogs/themes/default/base.html @@ -14,7 +14,7 @@ {% block page-description %}{% endblock %} {% block rochester-made %}{% endblock %} {% block keyboard-shortcuts %}{% endblock %} -{% block intercom %}{% endblock %} +{% block olark %}{% endblock %} {% block js %} {{ block.super }} window.blog_post = true; diff --git a/templates/base.html b/templates/base.html index 4adb255..c79c9af 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{% load snipt_tags intercom %} +{% load snipt_tags %} @@ -419,42 +419,27 @@ {% endblock %} {% if request.user.profile.get_account_age <= 7 or request.user.profile.is_pro %} {% if not debug %} - {% block intercom %} - - + {% block olark %} + + + {% endblock %} {% endif %} {% endif %} diff --git a/utils/templatetags/intercom.py b/utils/templatetags/intercom.py deleted file mode 100644 index d1a52cc..0000000 --- a/utils/templatetags/intercom.py +++ /dev/null @@ -1,10 +0,0 @@ -from django import template -from settings_local import INTERCOM_SECRET_KEY - -import hmac, hashlib - -register = template.Library() - -@register.filter -def intercom_sha_256(user_id): - return hmac.new(INTERCOM_SECRET_KEY, str(user_id), digestmod=hashlib.sha256).hexdigest()