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 d73a42883db70e53db15bbc29e9773bbb5ebc4bc..82029d620862c0f7dd6952ddd1a9ebbb4887cfc7 100644 (file)
--- 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 %}
     {% 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 %}
 
         <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 797221378c8183f289c80c5e2c799d20e5d0ec88..32ade899f9fab341036be8d16807bf3b5d0d02d0 100644 (file)
--- 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>
         <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 %}
 
         <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 1755cc0b2ad0aa24316a9979762c49bcabbff3d3..1adcba2f87e4302603e7d2641a99113d213f3cab 100644 (file)
--- 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 %}
     {% 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>
 
             {% 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>
 
         <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 %}
 
         <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 6387049fe65a241a01251d59197214b9bd9ee784..45e4f820bf9403a1917576998e7ecdb7686a4d39 100644 (file)
--- 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 %}
     {% 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/>
             {% trans "Sender" %}:{% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}<br />
             {% trans "email" %}: {{ email }}
             <br/>