diff options
| -rw-r--r-- | django_authopenid/urls.py | 12 | ||||
| -rw-r--r-- | django_authopenid/views.py | 25 | ||||
| -rw-r--r-- | forum/managers.py | 2 | ||||
| -rw-r--r-- | forum/views.py | 8 | ||||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.mo | bin | 14334 -> 15146 bytes | |||
| -rw-r--r-- | locale/en/LC_MESSAGES/django.po | 229 | ||||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.mo | bin | 49819 -> 49749 bytes | |||
| -rw-r--r-- | locale/es/LC_MESSAGES/django.po | 131 | ||||
| -rw-r--r-- | templates/authopenid/sendpw.html | 2 | ||||
| -rw-r--r-- | templates/authopenid/settings.html | 2 | ||||
| -rw-r--r-- | templates/authopenid/signin.html | 80 | ||||
| -rw-r--r-- | templates/content/jquery-openid/images/local-login.png | bin | 0 -> 2522 bytes | |||
| -rw-r--r-- | templates/content/jquery-openid/images/openidico16.png | bin | 0 -> 554 bytes | |||
| -rw-r--r-- | templates/content/jquery-openid/jquery.openid.js | 19 | ||||
| -rw-r--r-- | templates/content/jquery-openid/openid.css | 16 | ||||
| -rw-r--r-- | templates/content/style/style.css | 4 |
16 files changed, 309 insertions, 221 deletions
diff --git a/django_authopenid/urls.py b/django_authopenid/urls.py index d932a48d..f5d7a72f 100644 --- a/django_authopenid/urls.py +++ b/django_authopenid/urls.py @@ -12,17 +12,15 @@ urlpatterns = patterns('django_authopenid.views', url(r'^%s$' % _('signout/'), 'signout', name='user_signout'), url(r'^%s%s$' % (_('signin/'), _('complete/')), 'complete_signin', name='user_complete_signin'), - url(r'^%s$' % _('register/'), 'register', name='user_register'), + #url(r'^%s$' % _('register/'), 'register', name='user_register'), url(r'^%s$' % _('signup/'), 'signup', name='user_signup'), #disable current sendpw function - #url(r'^%s$' % _('sendpw/'), 'signin', name='user_sendpw'), - url(r'^%s$' % _('sendpw/'), 'sendpw', name='sendpw'), - url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', - name='user_confirmchangepw'), + url(r'^%s$' % _('sendpw/'), 'sendpw', name='user_sendpw'), + url(r'^%s%s$' % (_('password/'), _('confirm/')), 'confirmchangepw', name='user_confirmchangepw'), # manage account settings - #url(r'^$', _('account_settings'), name='user_account_settings'), - #url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), + url(r'^$', _('account_settings'), name='user_account_settings'), + url(r'^%s$' % _('password/'), 'changepw', name='user_changepw'), url(r'^%s$' % _('email/'), 'changeemail', name='user_changeemail',kwargs = {'action':'change'}), url(r'^%s%s$' % (_('email/'),_('validate/')), 'changeemail', name='user_changeemail',kwargs = {'action':'validate'}), #url(r'^%s$' % _('openid/'), 'changeopenid', name='user_changeopenid'), diff --git a/django_authopenid/views.py b/django_authopenid/views.py index 95898a81..65d579f4 100644 --- a/django_authopenid/views.py +++ b/django_authopenid/views.py @@ -175,9 +175,18 @@ def signin(request,newquestion=False,newanswer=False): form_auth = OpenidAuthForm(initial={'next':next}) if request.POST: - - if 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys(): + if 'blogin' in request.POST.keys(): + # perform normal django authentification + form_auth = OpenidAuthForm(request.POST) + if form_auth.is_valid(): + user_ = form_auth.get_user() + login(request, user_) + next = clean_next(form_auth.cleaned_data.get('next')) + print 'next stop is "%s"' % next + return HttpResponseRedirect(next) + + elif 'bsignin' in request.POST.keys() or 'openid_username' in request.POST.keys(): form_signin = OpenidSigninForm(request.POST) if form_signin.is_valid(): next = clean_next(form_signin.cleaned_data.get('next')) @@ -193,14 +202,6 @@ def signin(request,newquestion=False,newanswer=False): on_failure=signin_failure, sreg_request=sreg_req) - elif 'blogin' in request.POST.keys(): - # perform normal django authentification - form_auth = OpenidAuthForm(request.POST) - if form_auth.is_valid(): - user_ = form_auth.get_user() - login(request, user_) - next = clean_next(form_auth.cleaned_data.get('next')) - return HttpResponseRedirect(next) question = None if newquestion == True: @@ -223,7 +224,7 @@ def signin(request,newquestion=False,newanswer=False): 'form1': form_auth, 'form2': form_signin, 'msg': request.GET.get('msg',''), - 'sendpw_url': reverse('sendpw'), + 'sendpw_url': reverse('user_sendpw'), }, context_instance=RequestContext(request)) def complete_signin(request): @@ -368,7 +369,7 @@ def register(request): return render('authopenid/complete.html', { 'form1': form1, 'form2': form2, - 'provider':providers[provider_name], + 'provider':provider_logo, 'nickname': nickname, 'email': email }, context_instance=RequestContext(request)) diff --git a/forum/managers.py b/forum/managers.py index 314f022f..2c05bc5f 100644 --- a/forum/managers.py +++ b/forum/managers.py @@ -24,7 +24,7 @@ class QuestionManager(models.Manager): return questions def get_unanswered_questions(self, orderby): - questions = self.filter(deleted=False, answer_count=0).order_by(orderby) + questions = self.filter(deleted=False, answer_accepted=False).order_by(orderby) return questions def get_questions(self, orderby): diff --git a/forum/views.py b/forum/views.py index 16a5a32d..10438982 100644 --- a/forum/views.py +++ b/forum/views.py @@ -1189,12 +1189,8 @@ def user_stats(request, user_id, user_view): params=[user.id] ).values('id', 'name', 'description', 'type') total_awards = awards.count() - #fixed to work with Django version < 1.1 - try: - from django.db.models import Count - awards = awards.annotate(count = Count('badge__id')) - except: - pass + from django.db.models import Count + awards = awards.annotate(count = Count('badge__id')) return render_to_response(user_view.template_file,{ "tab_name" : user_view.id, diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo Binary files differindex 447afac4..cd8de560 100644 --- a/locale/en/LC_MESSAGES/django.mo +++ b/locale/en/LC_MESSAGES/django.mo diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index ff280947..b5e5c549 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-12 15:41+0000\n" +"POT-Creation-Date: 2009-08-19 00:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -16,13 +16,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: settings.py:12 urls.py:25 forum/views.py:304 forum/views.py:698 +#: settings.py:12 urls.py:25 forum/views.py:305 forum/views.py:699 msgid "account/" msgstr "" #: settings.py:12 urls.py:26 django_authopenid/urls.py:9 #: django_authopenid/urls.py:10 django_authopenid/urls.py:11 -#: django_authopenid/urls.py:13 forum/views.py:304 forum/views.py:699 +#: django_authopenid/urls.py:13 forum/views.py:305 forum/views.py:700 #: templates/authopenid/confirm_email.txt:10 msgid "signin/" msgstr "" @@ -82,7 +82,8 @@ msgstr "" #: urls.py:37 urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 #: urls.py:43 urls.py:44 urls.py:45 urls.py:46 urls.py:47 forum/feed.py:19 -#: forum/models.py:306 forum/views.py:1416 +#: forum/models.py:306 forum/views.py:1188 forum/views.py:1190 +#: forum/views.py:1430 msgid "questions/" msgstr "" @@ -118,12 +119,12 @@ msgstr "" msgid "question/" msgstr "" -#: urls.py:51 urls.py:52 forum/views.py:740 forum/views.py:2013 +#: urls.py:51 urls.py:52 forum/views.py:741 forum/views.py:2027 msgid "tags/" msgstr "" -#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:993 forum/views.py:997 -#: forum/views.py:1418 forum/views.py:1751 forum/views.py:2015 +#: urls.py:53 urls.py:54 urls.py:55 forum/views.py:994 forum/views.py:998 +#: forum/views.py:1432 forum/views.py:1765 forum/views.py:2029 msgid "users/" msgstr "" @@ -238,7 +239,7 @@ msgstr "" msgid "Incorrect username." msgstr "" -#: django_authopenid/urls.py:10 forum/views.py:304 forum/views.py:699 +#: django_authopenid/urls.py:10 forum/views.py:305 forum/views.py:700 msgid "newquestion/" msgstr "" @@ -695,27 +696,27 @@ msgstr "" msgid "profile - user preferences" msgstr "" -#: forum/views.py:947 +#: forum/views.py:948 #, python-format msgid "subscription saved, %(email)s needs validation" msgstr "" "Your subscription is saved, but email address %(email)s needs to be " "validated, please see <a href='/faq#validate'>more details here</a>" -#: forum/views.py:1860 +#: forum/views.py:1874 msgid "uploading images is limited to users with >60 reputation points" msgstr "" -#: forum/views.py:1862 +#: forum/views.py:1876 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" -#: forum/views.py:1864 +#: forum/views.py:1878 #, python-format msgid "maximum upload file size is %sK" msgstr "" -#: forum/views.py:1866 +#: forum/views.py:1880 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -723,7 +724,7 @@ msgstr "" #: forum/management/commands/send_email_alerts.py:35 msgid "updates from website" -msgstr "" +msgstr "Q&A forum update" #: forum/templatetags/extra_tags.py:143 forum/templatetags/extra_tags.py:172 #: templates/header.html:35 @@ -937,7 +938,7 @@ msgid "must have valid %(email)s to post" msgstr "" "<span class='strong big'>Looks like your email address, %(email)s has not " "yet been validated.</span> To post messages you must verify your email, " -"please see <a href='/faq#validate'>more details here</a>.<br/>You can submit " +"please see <a href='/faq#validate'>more details here</a>.<br>You can submit " "your question now and validate email after that. Your question will saved as " "pending meanwhile. " @@ -965,7 +966,7 @@ msgstr "" msgid "Badges summary" msgstr "" -#: templates/badges.html:17 templates/user_stats.html:115 +#: templates/badges.html:17 templates/user_stats.html:73 msgid "Badges" msgstr "" @@ -1070,17 +1071,17 @@ msgid "ask the author" msgstr "" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:17 +#: templates/users_questions.html:18 msgid "this question was selected as favorite" msgstr "" #: templates/book.html:88 templates/book.html.py:93 -#: templates/users_questions.html:11 templates/users_questions.html.py:17 +#: templates/users_questions.html:11 templates/users_questions.html.py:18 msgid "number of times" msgstr "" #: templates/book.html:105 templates/index.html:48 templates/questions.html:46 -#: templates/unanswered.html:37 templates/users_questions.html:30 +#: templates/unanswered.html:37 templates/users_questions.html:32 msgid "votes" msgstr "" @@ -1089,14 +1090,14 @@ msgid "the answer has been accepted to be correct" msgstr "" #: templates/book.html:115 templates/index.html:49 templates/questions.html:47 -#: templates/unanswered.html:38 templates/users_questions.html:40 +#: templates/unanswered.html:38 templates/users_questions.html:42 msgid "views" msgstr "" #: templates/book.html:125 templates/index.html:69 templates/question.html:499 #: templates/questions.html:84 templates/questions.html.py:156 #: templates/tags.html:49 templates/unanswered.html:75 -#: templates/unanswered.html.py:106 templates/users_questions.html:52 +#: templates/unanswered.html.py:106 templates/users_questions.html:54 msgid "using tags" msgstr "" @@ -1265,13 +1266,13 @@ msgid "how to validate email info" msgstr "" "<form style='margin:0;padding:0;' action='/email/sendkey/'><p><span class=" "\"bigger strong\">How?</span> If you have just set or changed your email " -"address - <strong>check your email and click the included link</strong>.<br/" -">The link contains a key generated specifically for you. You can also " +"address - <strong>check your email and click the included link</strong>." +"<br>The link contains a key generated specifically for you. You can also " "<button style='display:inline' type='submit'><strong>get a new key</strong></" "button> and check your email again.</p></form><span class=\"bigger strong" "\">Why?</span> Email validation is required to make sure that <strong>only " "you can post messages</strong> on your behalf and to <strong>minimize spam</" -"strong> posts.<br/>With email you can <strong>subscribe for updates</strong> " +"strong> posts.<br>With email you can <strong>subscribe for updates</strong> " "on the most interesting questions. Also, when you sign up for the first time " "- create a unique <a href='/faq#gravatar'><strong>gravatar</strong></a> " "personal image.</p>" @@ -1342,35 +1343,35 @@ msgstr "" msgid "." msgstr "" -#: templates/footer.html:7 templates/header.html:14 templates/index.html:83 +#: templates/footer.html:8 templates/header.html:14 templates/index.html:83 msgid "about" msgstr "" -#: templates/footer.html:8 templates/header.html:15 templates/index.html:84 +#: templates/footer.html:9 templates/header.html:15 templates/index.html:84 #: templates/question_edit_tips.html:16 msgid "faq" msgstr "" -#: templates/footer.html:9 +#: templates/footer.html:10 +msgid "wiki" +msgstr "" + +#: templates/footer.html:11 msgid "blog" msgstr "" -#: templates/footer.html:10 +#: templates/footer.html:12 msgid "contact us" msgstr "" -#: templates/footer.html:11 +#: templates/footer.html:13 msgid "privacy policy" msgstr "" -#: templates/footer.html:12 +#: templates/footer.html:14 msgid "give feedback" msgstr "" -#: templates/footer.html:18 -msgid "current revision" -msgstr "" - #: templates/header.html:10 msgid "logout" msgstr "" @@ -1518,6 +1519,9 @@ msgid "" "As a registered user you can login with your OpenID, log out of the site or " "permanently remove your account." msgstr "" +"Clicking <strong>Logout</strong> will log you out from the Q&A forum.</" +"p><p>If you wish to sign off completely - please make sure to log out from " +"your OpenID provider." #: templates/logout.html:21 msgid "Logout now" @@ -1670,7 +1674,7 @@ msgstr "" msgid "close date %(question.closed_at)s" msgstr "" -#: templates/question.html:269 templates/user_stats.html:28 +#: templates/question.html:269 templates/user_stats.html:13 msgid "Answers" msgstr " Answers" @@ -1849,12 +1853,12 @@ msgid_plural "" "\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question tagged <span " -"class=\"tag\">%(tagname)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>question tagged</p><p><span " +"class=\"tag\">%(tagname)s</span></p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions tagged <span " -"class=\"tag\">%(tagname)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>questions tagged</p><div " +"class=\"tags\"><span class=\"tag\">%(tagname)s</span></div>" #: templates/questions.html:116 #, python-format @@ -1868,12 +1872,14 @@ msgid_plural "" "\t\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question with title " -"containing <span class=\"darkred strong\">%(searchtitle)s</span>" +"<div class=\"questions-count\">%(q_num)s</div><p>question with title " +"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></" +"p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions with title " -"containing <span class=\"darkred strong\">%(searchtitle)s</span></strong>" +"<div class=\"questions-count\">%(q_num)s</div><p>questions with title " +"containing <strong><span class=\"darkred\">%(searchtitle)s</span></strong></" +"p>" #: templates/questions.html:122 #, python-format @@ -1887,10 +1893,10 @@ msgid_plural "" "\t\t\t\t" msgstr[0] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>question" +"<div class=\"questions-count\">%(q_num)s</div><p>question</p>" msgstr[1] "" "\n" -"<span class=\"questions-count\">%(q_num)s</span><br/>questions" +"<div class=\"questions-count\">%(q_num)s</div><p>questions</p>" #: templates/questions.html:131 msgid "latest questions info" @@ -1997,8 +2003,8 @@ msgstr "" #, python-format msgid "have %(num_q)s unanswered questions" msgstr "" -"<span class=\"questions-count\">%(num_q)s</span><br/> questions with " -"<strong>no accepted answers</strong>" +"<div class=\"questions-count\">%(num_q)s</div><strong>unanswered</strong> " +"questions" #: templates/user_edit.html:6 msgid "Edit user profile" @@ -2088,41 +2094,49 @@ msgstr "" msgid "Save" msgstr "" -#: templates/user_stats.html:16 +#: templates/user_stats.html:10 msgid "User questions" msgstr "" -#: templates/user_stats.html:38 +#: templates/user_stats.html:20 #, python-format msgid "the answer has been voted for %(vote_count)s times" msgstr "" -#: templates/user_stats.html:38 +#: templates/user_stats.html:20 msgid "this answer has been selected as correct" msgstr "" -#: templates/user_stats.html:46 +#: templates/user_stats.html:28 #, python-format msgid "the answer has been commented %(comment_count)s times" -msgstr "(%(comment_count)s comment(s))" +msgstr "" -#: templates/user_stats.html:60 -msgid "votes total" -msgstr "Votes" +#: templates/user_stats.html:36 +msgid "Votes" +msgstr "" + +#: templates/user_stats.html:41 +msgid "thumb up" +msgstr "" -#: templates/user_stats.html:69 +#: templates/user_stats.html:42 msgid "user has voted up this many times" msgstr "" -#: templates/user_stats.html:74 +#: templates/user_stats.html:46 +msgid "thumb down" +msgstr "" + +#: templates/user_stats.html:47 msgid "user voted down this many times" msgstr "" -#: templates/user_stats.html:87 +#: templates/user_stats.html:54 msgid "Tags" msgstr "" -#: templates/user_stats.html:97 +#: templates/user_stats.html:61 #, python-format msgid "see other questions tagged '%(tag)s' " msgstr "" @@ -2139,6 +2153,10 @@ msgstr "" msgid "reputation history" msgstr "" +#: templates/user_tabs.html:23 +msgid "questions that user selected as his/her favorite" +msgstr "" + #: templates/user_tabs.html:24 msgid "favorites" msgstr "" @@ -2176,7 +2194,15 @@ msgstr "" msgid "this questions was selected as favorite" msgstr "" -#: templates/users_questions.html:33 +#: templates/users_questions.html:12 +msgid "thumb-up on" +msgstr "" + +#: templates/users_questions.html:19 +msgid "thumb-up off" +msgstr "" + +#: templates/users_questions.html:35 msgid "this answer has been accepted to be correct" msgstr "" @@ -2207,7 +2233,7 @@ msgstr "" "anyone, must be valid)" #: templates/authopenid/changeemail.html:31 -#: templates/authopenid/signin.html:136 +#: templates/authopenid/signin.html:154 msgid "Password" msgstr "" @@ -2219,6 +2245,12 @@ msgstr "" #, python-format msgid "validate %(email)s info" msgstr "" +"<span class=\"strong big\">An email with a validation link has been sent to %" +"(email)s.</span> Please <strong>follow the emailed link</strong> with your " +"web browser. Email validation is necessary to help insure the proper use of " +"email on <span class=\"orange\">Q&A</span> forum. If you would like " +"to use <strong>another email</strong>, please <a href=\"/email/change/" +"\"><strong>change it again</strong></a>." #: templates/authopenid/changeemail.html:50 msgid "Email not changed" @@ -2324,7 +2356,7 @@ msgstr "New user signup" #, python-format msgid "register new %(provider)s account info" msgstr "" -"<span class=\"big strong\">You are here for the first time with your %" +"<p><span class=\"big strong\">You are here for the first time with your %" "(provider)s login.</span> Please create your <strong>screen name</strong> " "and save your <strong>email</strong> address. Saved email address will let " "you <strong>subscribe for the updates</strong> on the most interesting " @@ -2336,7 +2368,7 @@ msgid "This account already exists, please use another." msgstr "" #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32 -#: templates/authopenid/signin.html:120 +#: templates/authopenid/signin.html:138 msgid "Sorry, looks like we have some errors:" msgstr "" @@ -2362,7 +2394,7 @@ msgstr "" msgid "user name" msgstr "" -#: templates/authopenid/complete.html:58 +#: templates/authopenid/complete.html:58 templates/authopenid/signin.html:128 msgid "password" msgstr "" @@ -2370,13 +2402,13 @@ msgstr "" msgid "Register" msgstr "" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:138 +#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:156 msgid "Forgot your password?" msgstr "" #: templates/authopenid/confirm_email.txt:2 msgid "Thank you for registering at our Q&A forum!" -msgstr "Thank you for registering at our Q&A forum!" +msgstr "" #: templates/authopenid/confirm_email.txt:4 msgid "Your account details are:" @@ -2559,77 +2591,87 @@ msgstr "" #: templates/authopenid/signin.html:40 msgid "Click to sign in through any of these services." msgstr "" -"<p><span class=\"big strong\">We accept <a href=\"http://openid.net" -"\">OpenID</a> login.</span> <font color=\"gray\">Instead of creating a new " -"password - log in through any of the services below.</font></p><p><span " -"class=\"big strong\">1. Select the login service by clicking one of the " -"icons</span></p>" +"<p><span class=\"big strong\">Please select your favorite login method below.</span>" +"</p><p><font color=\"gray\">External login services use <a " +"href=\"http://openid.net\"><b>OpenID</b></a> technology that increases " +"security of your online identity and makes login process simpler. First option " +"requires login name and password.</font></p>" -#: templates/authopenid/signin.html:103 +#: templates/authopenid/signin.html:113 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>" msgstr "" -"<span class=\"big strong\">2. Enter your <span id=\"enter_your_what" -"\">Provider user name</span></span><br/>(or select another OpenID provider " -"above)" +"<span class=\"big strong\">Enter your <span id=\"enter_your_what\">Provider " +"user name</span></span><br><span class='grey'>(or select another login method above)</span>" -#: templates/authopenid/signin.html:110 +#: templates/authopenid/signin.html:120 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" msgstr "" -"<span class=\"big strong\">2. Enter your <a class=\"openid_logo\" href=" -"\"http://openid.net\">OpenID</a> web address</span><br/>(or choose specific " -"provider by clicking on one of the icons above)" +"<span class=\"big strong\">Enter your <a class=\"openid_logo\" href=\"http://" +"openid.net\">OpenID</a> web address</span><br><span class='grey'>(or choose another login " +"method above)</span>" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:137 +#: templates/authopenid/signin.html:122 templates/authopenid/signin.html:130 +#: templates/authopenid/signin.html:155 msgid "Login" msgstr "" -#: templates/authopenid/signin.html:116 +#: templates/authopenid/signin.html:125 +msgid "Enter your login name and password" +msgstr "" +"<span class='big strong'>Enter your forum login and password</span><br/>" +"<span class='grey'>(or select your OpenID provider above)</span>" + +#: templates/authopenid/signin.html:126 +msgid "login name" +msgstr "" + +#: templates/authopenid/signin.html:134 msgid "we support two login modes" msgstr "" "You can log in either through one of these services or traditionally - using " "local username/password." -#: templates/authopenid/signin.html:134 +#: templates/authopenid/signin.html:152 msgid "Use login name and password" msgstr "" -#: templates/authopenid/signin.html:135 +#: templates/authopenid/signin.html:153 msgid "Login name" msgstr "" -#: templates/authopenid/signin.html:139 +#: templates/authopenid/signin.html:157 msgid "Create new account" msgstr "" -#: templates/authopenid/signin.html:148 +#: templates/authopenid/signin.html:166 msgid "Why use OpenID?" msgstr "" -#: templates/authopenid/signin.html:151 +#: templates/authopenid/signin.html:169 msgid "with openid it is easier" msgstr "With the OpenID you don't need to create new username and password." -#: templates/authopenid/signin.html:154 +#: templates/authopenid/signin.html:172 msgid "reuse openid" msgstr "You can safely re-use the same login for all OpenID-enabled websites." -#: templates/authopenid/signin.html:157 +#: templates/authopenid/signin.html:175 msgid "openid is widely adopted" msgstr "" "There are > 160,000,000 OpenID account in use. Over 10,000 sites are OpenID-" "enabled." -#: templates/authopenid/signin.html:160 +#: templates/authopenid/signin.html:178 msgid "openid is supported open standard" msgstr "OpenID is based on an open standard, supported by many organizations." -#: templates/authopenid/signin.html:165 +#: templates/authopenid/signin.html:183 msgid "Find out more" msgstr "" -#: templates/authopenid/signin.html:166 +#: templates/authopenid/signin.html:184 msgid "Get OpenID" msgstr "" @@ -2671,11 +2713,6 @@ msgstr "" msgid "Login with your OpenID" msgstr "" -#~ msgid "what is this website" -#~ msgstr "" -#~ "This is a collaboratively edited question and answer site for the " -#~ "Magnetic Resonance specialists." - # #~ msgid "editing tips" #~ msgstr "Tips" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo Binary files differindex 91639ba1..d25949ed 100644 --- a/locale/es/LC_MESSAGES/django.mo +++ b/locale/es/LC_MESSAGES/django.mo diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index d7655dd7..fe73330c 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-17 16:44+0000\n" -"PO-Revision-Date: 2009-08-17 10:04-0600\n" +"POT-Creation-Date: 2009-08-21 17:28+0000\n" +"PO-Revision-Date: 2009-08-21 11:29-0600\n" "Last-Translator: Bruno Sarlo <bsarlo@gmail.com>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" @@ -28,8 +28,8 @@ msgstr "archivossubidos/" msgid "signup/" msgstr "registrarse/" -#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:26 -#: django_authopenid/urls.py:27 +#: urls.py:28 urls.py:29 urls.py:30 django_authopenid/urls.py:24 +#: django_authopenid/urls.py:25 msgid "email/" msgstr "email/" @@ -79,8 +79,8 @@ msgstr "revisiones/" #: urls.py:38 urls.py:39 urls.py:40 urls.py:41 urls.py:42 urls.py:43 #: urls.py:44 urls.py:45 urls.py:46 urls.py:47 urls.py:48 forum/feed.py:19 -#: forum/models.py:313 forum/views.py:1232 forum/views.py:1234 -#: forum/views.py:1474 +#: forum/models.py:313 forum/views.py:1228 forum/views.py:1230 +#: forum/views.py:1470 msgid "questions/" msgstr "preguntas/" @@ -108,7 +108,7 @@ msgstr "respuesta/" msgid "vote/" msgstr "votar/" -#: urls.py:48 urls.py:49 django_authopenid/urls.py:29 +#: urls.py:48 urls.py:49 django_authopenid/urls.py:27 msgid "delete/" msgstr "borrar/" @@ -116,12 +116,12 @@ msgstr "borrar/" msgid "question/" msgstr "pregunta/" -#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2071 +#: urls.py:52 urls.py:53 forum/views.py:747 forum/views.py:2067 msgid "tags/" msgstr "etiquetas/" #: urls.py:54 urls.py:55 urls.py:56 forum/views.py:1034 forum/views.py:1038 -#: forum/views.py:1476 forum/views.py:1809 forum/views.py:2073 +#: forum/views.py:1472 forum/views.py:1805 forum/views.py:2069 msgid "users/" msgstr "usuarios/" @@ -260,24 +260,25 @@ msgstr "salir/" msgid "complete/" msgstr "completado/" -#: django_authopenid/urls.py:15 -msgid "register/" -msgstr "registrarse/" - -#: django_authopenid/urls.py:19 +#: django_authopenid/urls.py:18 msgid "sendpw/" msgstr "enviarcontrasena/" -#: django_authopenid/urls.py:20 +#: django_authopenid/urls.py:19 django_authopenid/urls.py:23 #, fuzzy msgid "password/" msgstr "contraseña" -#: django_authopenid/urls.py:20 +#: django_authopenid/urls.py:19 msgid "confirm/" msgstr "" -#: django_authopenid/urls.py:27 +#: django_authopenid/urls.py:22 +#, fuzzy +msgid "account_settings" +msgstr "preferencias" + +#: django_authopenid/urls.py:25 msgid "validate/" msgstr "" @@ -286,54 +287,54 @@ msgstr "" msgid "OpenID %(openid_url)s is invalid" msgstr "El OpenID %(openid_url)s no es valido" -#: django_authopenid/views.py:418 django_authopenid/views.py:545 +#: django_authopenid/views.py:419 django_authopenid/views.py:546 msgid "Welcome" msgstr "Bienvenido" -#: django_authopenid/views.py:508 +#: django_authopenid/views.py:509 msgid "Password changed." msgstr "Contraseña modificada" -#: django_authopenid/views.py:520 django_authopenid/views.py:525 +#: django_authopenid/views.py:521 django_authopenid/views.py:526 msgid "your email needs to be validated" msgstr "su correo electrónico necesita ser validado" -#: django_authopenid/views.py:682 django_authopenid/views.py:834 +#: django_authopenid/views.py:683 django_authopenid/views.py:835 #, python-format msgid "No OpenID %s found associated in our database" msgstr "El OpenID %s no esta asociada en nuestra base de datos" -#: django_authopenid/views.py:686 django_authopenid/views.py:841 +#: django_authopenid/views.py:687 django_authopenid/views.py:842 #, python-format msgid "The OpenID %s isn't associated to current user logged in" msgstr "El OpenID %s no esta asociada al usuario actualmente autenticado" -#: django_authopenid/views.py:694 +#: django_authopenid/views.py:695 msgid "Email Changed." msgstr "Email modificado" -#: django_authopenid/views.py:769 +#: django_authopenid/views.py:770 msgid "This OpenID is already associated with another account." msgstr "Este OpenID ya está asociada a otra cuenta." -#: django_authopenid/views.py:774 +#: django_authopenid/views.py:775 #, python-format msgid "OpenID %s is now associated with your account." msgstr "El OpenID %s está ahora asociada con tu cuenta." -#: django_authopenid/views.py:844 +#: django_authopenid/views.py:845 msgid "Account deleted." msgstr "Cuenta borrada." -#: django_authopenid/views.py:884 +#: django_authopenid/views.py:885 msgid "Request for new password" msgstr "Pedir nueva contraseña" -#: django_authopenid/views.py:897 +#: django_authopenid/views.py:898 msgid "A new password has been sent to your email address." msgstr "Una nueva contraseña ha sido enviada a tu cuenta de Email." -#: django_authopenid/views.py:927 +#: django_authopenid/views.py:928 #, python-format msgid "" "Could not change password. Confirmation key '%s' is not " @@ -342,7 +343,7 @@ msgstr "" "No se ha podido modificar la contraseña. La clave de confirmación '%s' no " "está registrada" -#: django_authopenid/views.py:936 +#: django_authopenid/views.py:937 msgid "" "Can not change password. User don't exist anymore in our " "database." @@ -350,7 +351,7 @@ msgstr "" "No se puede cambiar la contraseña. El usuario no existe más en nuestra base " "de datos." -#: django_authopenid/views.py:945 +#: django_authopenid/views.py:946 #, python-format msgid "Password changed for %s. You may now sign in." msgstr "Contraseña cambiada por %s. Ahora puedes ingresar." @@ -729,22 +730,22 @@ msgstr "perfil - preferencia de " msgid "subscription saved, %(email)s needs validation" msgstr "subscripción guardada, %(email)s necesita validación" -#: forum/views.py:1918 +#: forum/views.py:1914 msgid "uploading images is limited to users with >60 reputation points" msgstr "para subir imagenes debes tener más de 60 puntos de reputación" -#: forum/views.py:1920 +#: forum/views.py:1916 msgid "allowed file types are 'jpg', 'jpeg', 'gif', 'bmp', 'png', 'tiff'" msgstr "" "los tipos de archivos permitidos son 'jpg', 'jpeg', 'gif', 'bmp', 'png', " "'tiff'" -#: forum/views.py:1922 +#: forum/views.py:1918 #, python-format msgid "maximum upload file size is %sK" msgstr "tamaño máximo permitido es archivo %sK" -#: forum/views.py:1924 +#: forum/views.py:1920 #, python-format msgid "" "Error uploading file. Please contact the site administrator. Thank you. %s" @@ -2296,7 +2297,7 @@ msgid "Your new Email" msgstr "Tu nuevo Email" #: templates/authopenid/changeemail.html:31 -#: templates/authopenid/signin.html:137 +#: templates/authopenid/signin.html:143 msgid "Password" msgstr "Contraseña" @@ -2359,6 +2360,7 @@ msgid "OpenID URL:" msgstr "URL de OpenID:" #: templates/authopenid/changeopenid.html:30 +#: templates/authopenid/settings.html:34 msgid "Change OpenID" msgstr "Cambiar OpenID" @@ -2404,7 +2406,7 @@ msgid "This account already exists, please use another." msgstr "Esta cuenta ya existe, por favor usar otra." #: templates/authopenid/complete.html:19 templates/authopenid/complete.html:32 -#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:121 +#: templates/authopenid/sendpw.html:16 templates/authopenid/signin.html:130 msgid "Sorry, looks like we have some errors:" msgstr "Ups, parece que hay errores:" @@ -2436,7 +2438,7 @@ msgstr "contraseña" msgid "Register" msgstr "Registrarse" -#: templates/authopenid/complete.html:62 templates/authopenid/signin.html:139 +#: templates/authopenid/complete.html:62 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -2564,15 +2566,15 @@ msgstr "" " %(title)s %(summary)s será publicada una vez que ingreses\n" " " -#: templates/authopenid/signin.html:40 +#: templates/authopenid/signin.html:42 msgid "Click to sign in through any of these services." msgstr "Clickea para entrar por cualquiera de estos servicios." -#: templates/authopenid/signin.html:103 +#: templates/authopenid/signin.html:115 msgid "Enter your <span id=\"enter_your_what\">Provider user name</span>" msgstr "Ingresa tu <span id=\"enter_your_what\">nombre de usuario</span>" -#: templates/authopenid/signin.html:110 +#: templates/authopenid/signin.html:122 msgid "" "Enter your <a class=\"openid_logo\" href=\"http://openid.net\">OpenID</a> " "web address" @@ -2580,56 +2582,56 @@ msgstr "" "Ingresa tu dirección (URL) de <a class=\"openid_logo\" href=\"http://openid." "net\">OpenID</a>" -#: templates/authopenid/signin.html:112 templates/authopenid/signin.html:138 +#: templates/authopenid/signin.html:124 templates/authopenid/signin.html:146 msgid "Login" msgstr "Ingresar" -#: templates/authopenid/signin.html:116 -msgid "we support two login modes" -msgstr "soportamos dos tipos de ingreso" - -#: templates/authopenid/signin.html:135 -msgid "Use login name and password" -msgstr "Nombre de usuario y contraseña" +#: templates/authopenid/signin.html:127 +msgid "Enter your login name and password" +msgstr "Introdusca su nombre de usuario y contraseña" -#: templates/authopenid/signin.html:136 +#: templates/authopenid/signin.html:141 msgid "Login name" msgstr "Nombre de usuario" -#: templates/authopenid/signin.html:140 -msgid "Create new account" -msgstr "Crear cuenta nueva" +#: templates/authopenid/signin.html:147 +msgid "Create account" +msgstr "Crear cuenta" -#: templates/authopenid/signin.html:149 +#: templates/authopenid/signin.html:148 +msgid "I forgot my password" +msgstr "¿Olvidaste tu contraseña?" + +#: templates/authopenid/signin.html:157 msgid "Why use OpenID?" msgstr "¿Porqué usar OpenID?" -#: templates/authopenid/signin.html:152 +#: templates/authopenid/signin.html:160 msgid "with openid it is easier" msgstr "Con OpenID no necesitas crear un nuevo nombre de usuario y contraseña." -#: templates/authopenid/signin.html:155 +#: templates/authopenid/signin.html:163 msgid "reuse openid" msgstr "" "Puedes de forma segura re-usar el mismo nombre de usuario para todos los " "sitios que acepten OpenID." -#: templates/authopenid/signin.html:158 +#: templates/authopenid/signin.html:166 msgid "openid is widely adopted" msgstr "" "OpenID es extensamente usado. Hay más de 160,000,000 cuentas de OpenID en " "uso en el mundo. Mas de 10,000 sitios aceptan OpenID." -#: templates/authopenid/signin.html:161 +#: templates/authopenid/signin.html:169 msgid "openid is supported open standard" msgstr "" "OpenID es basado en un standard abierto, apoyado por muchas organizaciones." -#: templates/authopenid/signin.html:166 +#: templates/authopenid/signin.html:174 msgid "Find out more" msgstr "Averigua más" -#: templates/authopenid/signin.html:167 +#: templates/authopenid/signin.html:175 msgid "Get OpenID" msgstr "Adquiere una OpenID" @@ -2673,6 +2675,15 @@ msgstr "Registrate con tu OpenID" msgid "Login with your OpenID" msgstr "Ingresar con tu OpenID" +#~ msgid "register/" +#~ msgstr "registrarse/" + +#~ msgid "we support two login modes" +#~ msgstr "soportamos dos tipos de ingreso" + +#~ msgid "Create new account" +#~ msgstr "Crear cuenta nueva" + #, fuzzy #~ msgid "complete list of quesionts" #~ msgstr "lista completa de preguntas" diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html index b02ee6e9..37091261 100644 --- a/templates/authopenid/sendpw.html +++ b/templates/authopenid/sendpw.html @@ -13,7 +13,7 @@ {% trans "Please enter your username below and new password will be sent to your registered e-mail" %} </div> {% if form.errors %} -<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br> +<p class="errors"><span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> {% if form.username.errors %} <span class="error">{{ form.username.errors|join:", " }}</span> {% endif %} diff --git a/templates/authopenid/settings.html b/templates/authopenid/settings.html index a373324e..ecc16c72 100644 --- a/templates/authopenid/settings.html +++ b/templates/authopenid/settings.html @@ -31,7 +31,7 @@ <dt>» <a href="{% url user_changeemail %}">{% trans "Change email " %}</a></dt> <dd>{% trans "Add or update the email address associated with your account." %}</dd> {% if is_openid %} - <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID %}</a></dt> + <dt>» <a href="{% url user_changeopenid %}">{% trans "Change OpenID" %}</a></dt> <dd>{% trans "Change openid associated to your account" %}</dd> {% endif %} diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html index f8749d2b..60aa5e5d 100644 --- a/templates/authopenid/signin.html +++ b/templates/authopenid/signin.html @@ -37,14 +37,16 @@ {% endblocktrans %} </div> {% endif %} - <div style="width:600px;float:left;margin-bottom:5px;">{% trans "Click to sign in through any of these services." %}</div> <form id="openid_form" name="openid_form" class="openid" method="post" action="{% url user_signin %}"> + <div style="width:600px;float:left;margin-bottom:5px;"> + {% trans "Click to sign in through any of these services." %} + </div> <ul class="providers"> - <li class="openid" title="OpenID"> - <div class="logo_box openid_box"> - <img src="/content/jquery-openid/images/openid.gif" alt="icon" /> + <li class="local" title="Local login"> + <div class="logo_box local_login_box"> + <img src="/content/jquery-openid/images/local-login.png" alt="icon" /> </div> - <span><strong>http://{your-openid-url}</strong></span> + <span></span> </li> <li class="direct" title="Google"> <div class="logo_box google_box"> @@ -61,7 +63,17 @@ <img src="/content/jquery-openid/images/aol.gif" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span> </div> </li> - <li class="username first_tiny_li" title="MyOpenID user name"> + <!--<li class="openid" title="OpenID"> + <div class="logo_box openid_box"> + <img src="/content/jquery-openid/images/openid.gif" alt="icon" /> + </div> + <span><strong>http://{your-openid-url}</strong></span> + </li>--> + <li class="openid first_tiny_li" title="OpenID URL"> + <img src="/content/jquery-openid/images/openidico16.png" alt="icon" /> + <span>http://{your-openid-url}</span> + </li> + <li class="username" title="MyOpenID user name"> <img src="/content/jquery-openid/images/myopenid-2.png" alt="icon" /> <span>http://<strong>username</strong>.myopenid.com/</span> </li> @@ -111,37 +123,33 @@ <div><p><input id="openid_url" type="text" value="http://" name="openid_url" /> <input id="bsignin" name="bsignin" type="submit" value="{% trans "Login" %}" /></p></div> </fieldset> + <fieldset id='local_login_fs'> + <p>{% trans 'Enter your login name and password' %}</p> + {% if form1.errors %} + <p class="errors"> + <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> + <ul class="error-list"> + {% if form1.username.errors %} + <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> + {% endif %} + {% if form1.password.errors %} + <li><span class="error">{{ form1.password.errors|join:", " }}</span></li> + {% endif %} + </ul> + </p> + {% endif %} + <div><label for="username">{% trans "Login name" %}</label> + {{form1.username}}<br/> + <label for="password">{% trans "Password" %}</label> + {{form1.password}}<br/> + <p id="local_login_buttons"> + <input id="blogin" name="blogin" type="submit" value="{% trans "Login" %}" /> + <a href="{% url user_signup %}">{% trans "Create account" %}</a><br/> + <a href="{% url user_sendpw %}">{% trans "I forgot my password" %}</a> + </p> + </div> + </fieldset> </form> -<div class="login"> - <p>{% trans "we support two login modes" %}</p> - <div > - <br> - {% if form1.errors %} - <p class="errors"> - <span class="big">{% trans "Sorry, looks like we have some errors:" %}</span><br/> - <ul class="error-list"> - {% if form1.username.errors %} - <li><span class="error">{{ form1.username.errors|join:", " }}</span></li> - {% endif %} - {% if form1.password.errors %} - <li><span class="error">{{ form1.password.errors|join:", " }}</span></li> - {% endif %} - </ul> - </p> - {% endif %} - <form name="fauth" action="{% url user_signin %}" method="post"> - {{ form1.next }} - <fieldset class="fieldset" > - <legend class="big">{% trans "Use login name and password" %}</legend> - <div class="form-row"><label for="id_username">{% trans "Login name" %}:</label><br />{{ form1.username }}</div> - <div class="form-row"><label for="id_password">{% trans "Password" %}:</label><br />{{ form1.password }}</div> - <div class="submit-row"><input type="submit" class="submit" name="blogin" value="{% trans "Login" %}"> - <a href="{%url sendpw%}">{% trans "Forgot your password?" %}</a> - <a href="{%url user_signup%}">{% trans "Create new account" %}</a></div> - </fieldset> - </form> - </div> -</div> {% endblock %} {% block sidebar %} diff --git a/templates/content/jquery-openid/images/local-login.png b/templates/content/jquery-openid/images/local-login.png Binary files differnew file mode 100644 index 00000000..258cedac --- /dev/null +++ b/templates/content/jquery-openid/images/local-login.png diff --git a/templates/content/jquery-openid/images/openidico16.png b/templates/content/jquery-openid/images/openidico16.png Binary files differnew file mode 100644 index 00000000..ad718ac5 --- /dev/null +++ b/templates/content/jquery-openid/images/openidico16.png diff --git a/templates/content/jquery-openid/jquery.openid.js b/templates/content/jquery-openid/jquery.openid.js index eec29ab2..6486fd39 100644 --- a/templates/content/jquery-openid/jquery.openid.js +++ b/templates/content/jquery-openid/jquery.openid.js @@ -13,6 +13,7 @@ $.fn.openid = function() { var $end = $this.find('p:has(input[name=openid_username])>span:eq(1)'); //needed for special effects only + var $localfs = $this.find('fieldset:has(input[name=username])'); var $usrfs = $this.find('fieldset:has(input[name=openid_username])'); var $idfs = $this.find('fieldset:has(input[name=openid_url])'); @@ -33,11 +34,23 @@ $.fn.openid = function() { return true; }; + var local = function() { + var $li = $(this); + $li.parent().find('li').removeClass('highlight'); + $li.addClass('highlight'); + $usrfs.hide(); + $idfs.hide(); + $localfs.show(); + $this.unbind('submit').submit(submitid); + return false; + }; + var direct = function() { var $li = $(this); $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $usrfs.fadeOut('slow'); + $localfs.fadeOut('slow'); $idfs.fadeOut('slow'); $id.val($this.find("li.highlight span").text()); setTimeout(function(){$('#bsignin').click()},1000); @@ -49,6 +62,7 @@ $.fn.openid = function() { $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $usrfs.hide(); + $localfs.hide(); $idfs.show(); $id.focus(); $this.unbind('submit').submit(submitid); @@ -60,6 +74,7 @@ $.fn.openid = function() { $li.parent().find('li').removeClass('highlight'); $li.addClass('highlight'); $idfs.hide(); + $localfs.hide(); $usrfs.show(); $this.find('#enter_your_what').text($li.attr("title")); $front.text($li.find("span").text().split("username")[0]); @@ -69,6 +84,7 @@ $.fn.openid = function() { return false; }; + $this.find('li.local').click(local); $this.find('li.direct').click(direct); $this.find('li.openid').click(openid); $this.find('li.username').click(username); @@ -84,6 +100,9 @@ $.fn.openid = function() { }); $this.find('li span').hide(); $this.find('li').css('line-height', 0).css('cursor', 'pointer'); + $usrfs.hide(); + $idfs.hide(); + $localfs.hide(); $this.find('li:eq(0)').click(); return this; diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css index 6c59192f..2ec8adf4 100644 --- a/templates/content/jquery-openid/openid.css +++ b/templates/content/jquery-openid/openid.css @@ -6,6 +6,7 @@ img {border-style:none;} .aol_box img {margin-top:6px;} .yahoo_box img {margin-top:13px;} .google_box img {margin-top:6px;} +.local_login_box img {margin-top:9px;} form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;} form.openid ul li {float:left; padding:4px;} @@ -20,7 +21,22 @@ form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; background: #DCDCDC; padding:10px;display:inline-block} +form.openid p {margin-bottom:4px;} form.openid fieldset div p {padding:0px;margin:0px;} +form.openid label { + display:inline-block; + font-weight:normal; + width:6em; + text-align:right; +} +#local_login_fs div { + padding-bottom:4px; +} +#local_login_buttons { + text-align:center; + line-height:1.8em; + margin-top:3px; +} /*form.openid input[type='submit'] {margin-left:1em;}*/ #openid_username {background:#ffffa0;} #openid_url {background:#ffffa0;} diff --git a/templates/content/style/style.css b/templates/content/style/style.css index 6d48198b..0fb96c7f 100644 --- a/templates/content/style/style.css +++ b/templates/content/style/style.css @@ -1093,7 +1093,9 @@ ul.bulleta li {background:url(/content/images/bullet_green.gif) no-repeat 0px 2p color:#d64000; font-weight:bold; } - +.grey { + color:#808080; +} .about div { padding:10px 5px 10px 5px; border-top:1px dashed #aaaaaa; |
