diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-08 19:13:04 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-02-08 19:13:04 -0500 |
| commit | bdf1cc4f9dd3f0ac06ba1af3c7d35c72cc358297 (patch) | |
| tree | 61f7902b47844c05a309b7d4827897b162d39e8a /templates | |
| parent | 3e7c42f81352ad73a1395ed0601f2d4fdf9b5359 (diff) | |
| download | askbot-bdf1cc4f9dd3f0ac06ba1af3c7d35c72cc358297.tar.gz askbot-bdf1cc4f9dd3f0ac06ba1af3c7d35c72cc358297.tar.bz2 askbot-bdf1cc4f9dd3f0ac06ba1af3c7d35c72cc358297.zip | |
fixed a little bug that i have planted into fbconnect before, removed unused files fixed email signup form validation
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/authopenid/complete.html | 3 | ||||
| -rwxr-xr-x | templates/authopenid/signin.html | 2 | ||||
| -rw-r--r-- | templates/authopenid/signup.html | 6 | ||||
| -rw-r--r-- | templates/content/style/style.css | 3 | ||||
| -rwxr-xr-x | templates/fbconnect/xd_receiver.html | 11 |
5 files changed, 21 insertions, 4 deletions
diff --git a/templates/authopenid/complete.html b/templates/authopenid/complete.html index c967e8e2..62970e38 100644 --- a/templates/authopenid/complete.html +++ b/templates/authopenid/complete.html @@ -95,6 +95,9 @@ parameters: <p>{% trans "receive updates motivational blurb" %}</p> <div class='simple-subscribe-options'> {{email_feeds_form.subscribe}} + {% if email_feeds_form.errors %} + <p class="error">{% trans "please select one of the options above" %}</p> + {% endif %} </div> <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p> <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" value="{% trans "create account" %}"/></div> diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index 51b8aa7f..aacdd490 100755 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -71,7 +71,7 @@ </div>
<span><strong>http://{your-openid-url}</strong></span>
</li>-->
- <li class="direct first_tiny_li facebook" title="Facebook Connect">
+ <li class="first_tiny_li facebook" title="Facebook Connect">
{% if question %}
<fb:login-button onlogin="window.location = '{% url fb_signin_new_question %}'"></fb:login-button>
{% else %}
diff --git a/templates/authopenid/signup.html b/templates/authopenid/signup.html index d800eaf9..fdb236c2 100644 --- a/templates/authopenid/signup.html +++ b/templates/authopenid/signup.html @@ -15,10 +15,12 @@ <li><label for="password1_id">{{form.password1.label}}</label>{{form.password1}}{{form.password1.errors}}</li> <li><label for="password2_id">{{form.password2.label}}</label>{{form.password2}}{{form.password2.errors}}</li> </ul> - <p class="signup_p">{% trans "receive updates motivational blurb" %}</p> - <p class="signup_p">{% trans "Please select your preferred email update schedule for the following groups of questions:" %}</p> + <p class="margin-top">{% trans "receive updates motivational blurb" %}</p> <div class='simple-subscribe-options'> {{email_feeds_form.subscribe}} + {% if email_feeds_form.errors %} + <p class="error">{% trans "please select one of the options above" %}</p> + {% endif %} </div> <p class="signup_p">{% trans "Please read and type in the two words below to help us prevent automated account creation." %}</p> {{form.recaptcha}} diff --git a/templates/content/style/style.css b/templates/content/style/style.css index aba67eee..175fcb66 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -1265,6 +1265,9 @@ p.space-above { .margin-bottom { margin-bottom: 10px; } +.margin-top { + margin-top: 10px; +} .inline-block { display:inline-block; } diff --git a/templates/fbconnect/xd_receiver.html b/templates/fbconnect/xd_receiver.html index c67c57b7..a03c61bc 100755 --- a/templates/fbconnect/xd_receiver.html +++ b/templates/fbconnect/xd_receiver.html @@ -1 +1,10 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" > <body> <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script> </body> </html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" >
+{% load i18n %}
+ <head>
+ <title>{% blocktrans %}Connect to {{APP_SHORT_NAME}} with Facebook!{% endblocktrans %}
+ </head>
+ <body>
+ <script src="http://static.ak.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
+ </body>
+</html>
|