Browse files

demo link plus some email template work

  • Loading branch information...
1 parent 825b4ed commit 3f356f49e0336a0276ff98dccd7fb9b03d6ce634 @bryanhelmig bryanhelmig committed Mar 6, 2012
View
5 README.rst
@@ -7,7 +7,7 @@ While we give you a generic design for free, you should just as easily be able
to customize the look and feel of the app if you like.
**django-knowledge** was developed internally for `Zapier <https://zapier.com/>`_.
-Check out their `live demo <https://zapier.com/support/>`_.
+Check out a `live demo <http://django-knowledge.org/>`_.
At a glance:
@@ -27,8 +27,7 @@ At a glance:
Links:
------
-* View a `live demo <https://zapier.com/support/>`_. This is the stock design, plus a
- custom header and footer via an overridden base template.
+* View a `live demo <http://django-knowledge.org/>`_. This is the included stock design.
* Check out the `documentation <http://django-knowledge.readthedocs.org/>`_ at ReadTheDocs.
* Visit our `GitHub repo <https://github.com/zapier/django-knowledge>`_ and join the development!
View
5 docs/index.rst
@@ -13,7 +13,7 @@ While we give you a generic design for free, you should just as easily be able
to customize the look and feel of the app if you like.
**django-knowledge** was developed internally for `Zapier <https://zapier.com/>`_.
-Check out their `live demo <https://zapier.com/support/>`_.
+Check out a `live demo <http://django-knowledge.org/>`_.
At a glance:
@@ -48,8 +48,7 @@ Contents:
Links:
------
-* View a `live demo <https://zapier.com/support/>`_. This is the stock design, plus a
- custom header and footer via an overridden base template.
+* View a `live demo <http://django-knowledge.org/>`_. This is the included stock design.
* Check out the `documentation <http://django-knowledge.readthedocs.org/>`_ at ReadTheDocs.
* Visit our `GitHub repo <https://github.com/zapier/django-knowledge>`_ and join the development!.
View
3 knowledge/templates/django_knowledge/emails/base.html
@@ -0,0 +1,3 @@
+{% block content %}
+
+{% endblock content %}
View
34 knowledge/templates/django_knowledge/emails/message.html
@@ -1,22 +1,26 @@
+{% extends "django_knowledge/emails/base.html" %}
+
{% load i18n %}
-<p>{% blocktrans with name=name %}Hello {{ name }},{% endblocktrans %}</p>
+{% block content %}
+ <p>{% blocktrans with name=name %}Hello {{ name }},{% endblocktrans %}</p>
-{% if response %}
- <p>{% blocktrans with url=response.question.url title=response.question.title domain=site.domain %}
- We just wanted to let you know that a new response has been added to the question "{{ title }}". You can visit it here: <a href="{{ domain }}{{ url }}">{{ domain }}{{ url }}</a>.
- {% endblocktrans %}</p>
+ {% if response %}
+ <p>{% blocktrans with url=response.question.url title=response.question.title domain=site.domain %}
+ We just wanted to let you know that a new response has been added to the question "{{ title }}". You can visit it here: <a href="{{ domain }}{{ url }}">{{ domain }}{{ url }}</a>.
+ {% endblocktrans %}</p>
- <p>{% trans "You are receiving these messages because you checked the 'alert' box when you originally posted." %}</p>
-{% endif %}
+ <p>{% trans "You are receiving these messages because you checked the 'alert' box when you originally posted." %}</p>
+ {% endif %}
-{% if question %}
- <p>{% blocktrans with url=question.url title=question.title domain=site.domain %}
- We just wanted to let you know that a new question has been added: "{{ title }}". You can visit it here: <a href="{{ domain }}{{ url }}">{{ domain }}{{ url }}</a>
- {% endblocktrans %}</p>
+ {% if question %}
+ <p>{% blocktrans with url=question.url title=question.title domain=site.domain %}
+ We just wanted to let you know that a new question has been added: "{{ title }}". You can visit it here: <a href="{{ domain }}{{ url }}">{{ domain }}{{ url }}</a>
+ {% endblocktrans %}</p>
- <p>{% trans "You are receiving these messages because you are a staff member." %}</p>
-{% endif %}
+ <p>{% trans "You are receiving these messages because you are a staff member." %}</p>
+ {% endif %}
-<p>{% blocktrans with name=site.name %}Thank you,
-{{ name }} team{% endblocktrans %}</p>
+ <p>{% blocktrans with name=site.name %}Thank you,
+ {{ name }} team{% endblocktrans %}</p>
+{% endblock content %}

0 comments on commit 3f356f4

Please sign in to comment.