From: matt <matt@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 12 Jul 2010 18:51:59 +0000 (+0000)
Subject: more OSQA-377 fixes.  We had some extra } lying around in the styles
X-Git-Tag: live~614
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/8e7eac3f6dd10c8a995584f8e090a7ad92c86c15?ds=sidebyside

more OSQA-377 fixes.  We had some extra } lying around in the styles

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@520 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/auth/mail_validation.html b/forum/skins/default/templates/auth/mail_validation.html
index d73a428..82029d6 100644
--- a/forum/skins/default/templates/auth/mail_validation.html
+++ b/forum/skins/default/templates/auth/mail_validation.html
@@ -11,11 +11,11 @@
     {% subject %}{% blocktrans %}{{ prefix }} Your email validation link {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}}">{% trans "Please use the following link to help us verify your email address:" %}</p>
+        <p style="{{ p_style }}">{% trans "Please use the following link to help us verify your email address:" %}</p>
 
-        <a  style="{{ a_style }}}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a></p>
 
-        <p style="{{ p_style }}}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
+        <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
         <p style="{{ p_style }}">{% fullurl auth_validate_email user=recipient.id,code=validation_code %}</p>
     {% endhtmlcontent %}
diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html
index 7972213..32ade89 100644
--- a/forum/skins/default/templates/auth/temp_login_email.html
+++ b/forum/skins/default/templates/auth/temp_login_email.html
@@ -14,9 +14,9 @@
         <p style="{{ p_style }}">
             {% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
         </p>
-        <a  style="{{ a_style }}}" href="{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}">{% trans "Go to your account" %}</a>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
 
-        <p style="{{ p_style }}}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
+        <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
         <p style="{{ p_style }}">{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}</p>
     {% endhtmlcontent %}
diff --git a/forum/skins/default/templates/auth/welcome_email.html b/forum/skins/default/templates/auth/welcome_email.html
index 1755cc0..1adcba2 100644
--- a/forum/skins/default/templates/auth/welcome_email.html
+++ b/forum/skins/default/templates/auth/welcome_email.html
@@ -12,20 +12,20 @@
     {% subject %}{% blocktrans %}{{ prefix }} Welcome to {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}}">
+        <p style="{{ p_style }}">
             {% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %},
         </p>
 
-        <p style="{{ p_style }}}">{% trans "Here's your login info (store it in a cool dry place):" %}</p>
+        <p style="{{ p_style }}">{% trans "Here's your login info (store it in a cool dry place):" %}</p>
 
-        <p style="{{ p_style }}}">{% trans "Username: " %} {{ recipient.username }}<br />
+        <p style="{{ p_style }}">{% trans "Username: " %} {{ recipient.username }}<br />
         <b>{% trans "Password: As IF we would send your password in cleartext!" %}</b></p>
 
-        <p style="{{ p_style }}}">{% trans "The following link will help us verify your email address:" %}</p>
+        <p style="{{ p_style }}">{% trans "The following link will help us verify your email address:" %}</p>
 
-        <p style="{{ p_style }}}"><a  style="{{ a_style }}}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a></p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a></p>
 
-        <p style="{{ p_style }}}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
+        <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
 
         <p style="{{ p_style }}">{% fullurl auth_validate_email user=recipient.id,code=validation_code %}</p>
     {% endhtmlcontent %}
diff --git a/forum/skins/default/templates/notifications/feedback.html b/forum/skins/default/templates/notifications/feedback.html
index 6387049..45e4f82 100644
--- a/forum/skins/default/templates/notifications/feedback.html
+++ b/forum/skins/default/templates/notifications/feedback.html
@@ -12,7 +12,7 @@
     {% subject %}{% blocktrans %}{{ prefix }} Feedback message from {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        <p style="{{ p_style }}}">
+        <p style="{{ p_style }}">
             {% trans "Sender" %}:{% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}<br />
             {% trans "email" %}: {{ email }}
             <br/>