offline avatar offline committed 5e25a4c Merge

merge

Comments (0)

Files changed (4)

+Персональная страница проекта:
+
+http://bitbucket.org/offline/django-openauth/
+
+Проект имеет зависимости от следующих продуктов:
+
+hg+https://bitbucket.org/offline/django-annoying/#egg=django-annoying
+hg+https://bitbucket.org/offline/django-confirmation/#egg=django-confirmation
+hg+https://bitbucket.org/offline/django-flashcookie/#egg=django-flashcookie
+hg+https://bitbucket.org/offline/django-notify/#egg=django-notify
+python-openid
+

openauth/templates/openauth/login.html

 {% extends 'base.html' %}
 {% block content %}
-<form method='post' action='?next={{ request.GET.next }}'>
+<h1>Вход</h1>
+<div class="error">{{ error }}</div>
+<form method='post' action='?next={{ request.GET.next }}' id="loginform">
     <table>
     {{ form.as_table }}
     </table>
-    <input type='submit' value='submit' />
+    <input type='submit' value='Войти' />
 </form>
+
+<div>
+  <p>Есть OpenID или учетная запись Google? <a href="../openid-login/">Войти с помощью OpenID</a>.</p>
+</div>
+<div>
+	<h3>Забыли пароль?</h3>
+	<p>Если вы забыли пароль, то сервер <span><a href="../reset_password/">может отправить вам новый</a></span>.</p>
+</div>
+<div>
+	<h3>Новый пользователь?</h3>
+	<p>Чтобы стать новым пользователем перейдите на <span><a href="../registation/">страницу регистрации</a></span>.</p>
+</div>
 {% endblock content %}

openauth/templates/openauth/openid_login.html

 {% if error %}
 <div class="error">{{ error }}</div>
 {% endif %}
-<form action="." method="post">
+<form action="." method="post" id="loginform">
     {{ form.as_table }}
     <p>Or with <input type="button" name="auth_google" onclick="customAuth('google')" value="Google"/></p>
     <p><input type="submit" value="Continue"/></p>
 </form>
+<div>
+	<h3>Новый пользователь?</h3>
+	<p>Хотите зарегистироваться обычным способом перейдите на <span><a href="../registation/">страницу регистрации</a></span>.</p>
+</div>
 {% endblock %}
 
 from openauth import views
 
-
 urlpatterns = patterns('',
     url(r'^registration/$', views.registration, name='openauth-registration'),
     url(r'^login/$', views.login, name='openauth-login'),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.