SPLUNK-189, adding pngfix for IE6.

[osqa.git] / forum / skins / default / templates / notifications / newmember.html

diff --git a/forum/skins/default/templates/notifications/newmember.html b/forum/skins/default/templates/notifications/newmember.html
index 53c5fd480821dd1ab187bcd9b701a4f0d865b69b..8efbe7281e960a2d408b3cf22821b7a9df4c5a9a 100644 (file)
--- a/forum/skins/default/templates/notifications/newmember.html
+++ b/forum/skins/default/templates/notifications/newmember.html
@@ -1,31 +1,31 @@
 {% load i18n extra_tags email_tags %}
 
 {% declare %}
 {% load i18n extra_tags email_tags %}
 
 {% declare %}

-    prefix = settings.EMAIL_SUBJECT_PREFIX
+    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)

     app_name = settings.APP_SHORT_NAME
     app_name = settings.APP_SHORT_NAME

+    safe_app_name = html.mark_safe(settings.APP_SHORT_NAME)

     app_url = settings.APP_URL
     newmember_name = newmember.username
     app_url = settings.APP_URL
     newmember_name = newmember.username

+    safe_newmember_name = html.mark_safe(newmember.username)

     newmember_url = newmember.get_profile_url()
     newmember_url = newmember.get_profile_url()

+    newmember_link = html.objlink(newmember, style=settings.EMAIL_ANCHOR_STYLE)

 {% enddeclare %}
 
 {% email %}
 {% enddeclare %}
 
 {% email %}

-    {% subject %}{% blocktrans %}{{ prefix }}{{ newmember_name }} is a new member on {{ app_name }}{% endblocktrans %}{% endsubject %}
+    {% subject %}{% blocktrans %}{{ prefix }} {{ safe_newmember_name }} is a new member on {{ safe_app_name }}{% endblocktrans %}{% endsubject %}

 
     {% htmlcontent notifications/base.html %}
 
     {% htmlcontent notifications/base.html %}

-        {% declare %}
-            newmember_link = html.objlink(newmember, style=a_style)
-        {% enddeclare %}

         <p style="{{ p_style }}">
             {% blocktrans %}
         <p style="{{ p_style }}">
             {% blocktrans %}

-            {{ newmember_link }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following link: <br />
-            <a href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }} profile</a>
+            {{ newmember_link }} has just joined {{ app_name }}.
+            View <a style="{{ a_style }}" href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }}'s profile</a>.

             {% endblocktrans %}
         </p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}
             {% endblocktrans %}
         </p>
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
 {% blocktrans %}

-{{ newmember_name }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following url: <br />
+{{ safe_newmember_name }} has just joined {{ safe_app_name }}. You can visit {{ safe_newmember_name }}'s profile using the following url:

 {{ app_url }}{{ newmember_url }}
 {% endblocktrans %}
 {% endtextcontent %}
 {{ app_url }}{{ newmember_url }}
 {% endblocktrans %}
 {% endtextcontent %}