From: rick Date: Tue, 1 Jun 2010 17:23:56 +0000 (+0000) Subject: updated to a new base template and new replacements for easy styling X-Git-Tag: live~780 X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/5cced8510af03eec1438cfefcf9f44e2e7a49087 updated to a new base template and new replacements for easy styling git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@352 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- diff --git a/forum/skins/default/templates/notifications/base.html b/forum/skins/default/templates/notifications/base.html index 9783bc7..6879bc2 100644 --- a/forum/skins/default/templates/notifications/base.html +++ b/forum/skins/default/templates/notifications/base.html @@ -1,49 +1,33 @@ {% load extra_filters extra_tags i18n email_tags %} {% declare %} - logo_location := os.path.join(str(settings.UPFILES_FOLDER), os.path.basename(str(settings.APP_LOGO))) + logo_location = "http://meta.osqa.net/upfiles/osqa_logo.png" + p_style = "color:#333333;font-family:'helvetica neue', arial, Helvetica, sans-serif;line-height:18px;font-size:14px;margin-top:10px;" + a_style = "text-decoration:none;color:#3060a8;font-weight:bold;" + hr_style = "color:#ccc;border:0;height:1px;background-color:#ccc;margin-bottom:20px;" + small_style = "color:#333333;font-family:'Lucida Grande', Trebuchet, Helvetica, sans-serif;font-size:12px;" + table_style = "border:20px #e5ebf8 solid;margin:10px auto 10px auto;width:750px;text-align:left;" + postal_address = "DZone, Inc. 140 Preston Executive Drive, Cary NC 27513, USA" {% enddeclare %} -{% embedmedia logo_location as logo %} - - - - - - - - ${{settings.APP_TITLE}} logo$ - -
-

-

-

- {% block content%} - {% endblock%} -

- + + + + + + +

+ ${{settings.APP_TITLE}}$ +

{% trans "Hello" %} {{ recipient.username }},

+{% block content %} +{% endblock%} +

Thanks,
{{settings.APP_SHORT_NAME}}

P.S. You can always fine-tune which notifications you receive +here. +

+ + \ No newline at end of file diff --git a/forum/skins/default/templates/notifications/base_text.html b/forum/skins/default/templates/notifications/base_text.html new file mode 100644 index 0000000..ded1e97 --- /dev/null +++ b/forum/skins/default/templates/notifications/base_text.html @@ -0,0 +1,18 @@ +{% load extra_filters extra_tags i18n email_tags %} + +{% declare %} + postal_address = "DZone, Inc. 140 Preston Executive Drive, Cary NC 27513, USA" +{% enddeclare %} + +{% trans "Hello" %} {{ recipient.username }}, + +{% block content %} +{% endblock%} + +Thanks, +{{settings.APP_SHORT_NAME}} + +P.S. You can always fine-tune which notifications you receive here: +{{ settings.APP_URL }}{% url user_subscriptions id=recipient.id %} + +{{ postal_address }} \ No newline at end of file diff --git a/forum/skins/default/templates/notifications/newquestion.html b/forum/skins/default/templates/notifications/newquestion.html index b0ee0f0..6615831 100644 --- a/forum/skins/default/templates/notifications/newquestion.html +++ b/forum/skins/default/templates/notifications/newquestion.html @@ -14,12 +14,10 @@ {% subject %}{% blocktrans %}{{ prefix }} New question on {{ app_name }}{% endblocktrans %}{% endsubject %} {% htmlcontent notifications/base.html %} -

{% trans "Hello" %} {{ recipient.username }},

- -

{% blocktrans %} {{ question_author }} has just posted a new question on {{ app_name }}, with title - {{ question_title }} and tagged {{ question_tags }}: + {{ question_title }} and tagged {{ question_tags }}: {% endblocktrans %}

@@ -27,28 +25,18 @@ {{ question.html|safe }} -

{% trans "Don't forget to come over and cast your vote." %}

- -

{% blocktrans %}Sincerely,
- Forum Administrator{% endblocktrans %}

{% trans "Don't forget to come over and cast your vote." %}

{% endhtmlcontent %} - {% textcontent %} - {% trans "Hello" %} {{ recipient.username }} - - {% blocktrans %} - {{ question_author }} has just posted a new question on {{ app_name }}, with title - "{{ question_title }}" and tagged {{ question_tags }}: - {% endblocktrans %} - - - {{ question.body|safe }} - +{% textcontent notifications/base_text.html %} +{% blocktrans %} +{{ question_author }} has just posted a new question on {{ app_name }}, with title +"{{ question_title }}" and tagged {{ question_tags }}: +{% endblocktrans %} - {% trans "Don't forget to come over and cast your vote." %} +{{ question.body|safe }} - {% blocktrans %}Sincerely, - Forum Administrator{% endblocktrans %} - {% endtextcontent %} +{% trans "Don't forget to come over and cast your vote." %} +{% endtextcontent %} {% endemail %}