u/bodqhrohro/swineboard Commit - r144:7af95110

boards/forms.py

0 +19 -1

              from captcha.fields import CaptchaField
              from django import forms
              from django.forms.util import ErrorList
-             from boards.models import TITLE_MAX_LENGTH
+             from boards.models import TITLE_MAX_LENGTH, User
              from neboard import settings
              from boards import utils
              class SettingsForm(forms.Form):
                  theme = forms.ChoiceField(choices=settings.THEMES, widget=forms.RadioSelect)
+             class LoginForm(forms.Form):
+                 user_id = forms.CharField()
+                 def clean_user_id(self):
+                     user_id = self.cleaned_data['user_id']
+                     if user_id:
+                         users = User.objects.filter(user_id=user_id)
+                         if len(users) == 0:
+                             raise forms.ValidationError('No such user found')
+                     return user_id
+                 def clean(self):
+                     cleaned_data = super(LoginForm, self).clean()
+                     return cleaned_data
  No newline at end of file

boards/locale/ru/LC_MESSAGES/django.mo

0 binary modified 0 0

NO CONTENT: modified file, binary diff hidden

boards/locale/ru/LC_MESSAGES/django.po

0 +14 -1

              msgstr ""
              "Project-Id-Version: PACKAGE VERSION\n"
              "Report-Msgid-Bugs-To: \n"
-             "POT-Creation-Date: 2013-09-06 21:15+0300\n"
+             "POT-Creation-Date: 2013-09-06 21:49+0300\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"
              msgid "Settings"
              msgstr "Настройки"
+             #: templates/boards/base.html:42 templates/boards/login.html:6
+             #: templates/boards/login.html.py:21
+             msgid "Login"
+             msgstr "Вход"
              #: templates/boards/base.html:43
              msgid "Up"
              msgstr "Вверх"
+             #: templates/boards/login.html:15
+             msgid "User ID"
+             msgstr "ID пользователя"
+             #: templates/boards/login.html:24
+             msgid "Insert your user id above"
+             msgstr "Вставьте свой ID пользователя выше"
              #: templates/boards/posting_general.html:18
              msgid "Tag: "
              msgstr "Тег: "

boards/models.py

0 +4 -2

                  registration_time = models.DateTimeField()
                  last_access_time = models.DateTimeField()
-                 fav_tags = models.ManyToManyField(Tag)
-                 fav_threads = models.ManyToManyField(Post, related_name='+')
+                 fav_tags = models.ManyToManyField(Tag, null=True, blank=True)
+                 fav_threads = models.ManyToManyField(Post, related_name='+', null=True,
+                                                      blank=True)
                  def save_setting(self, name, value):
                      setting, created = Setting.objects.get_or_create(name=name, user=self)
                  value = models.CharField(max_length=50)
                  user = models.ForeignKey(User)
              class Ban(models.Model):
                  ip = models.GenericIPAddressField()

boards/static/css/md/base_page.css

0 +1 -1

              .form-errors {
                  padding-left: 1ex;
                  font-weight: bold;
-                 vertical-align: top;
+                 vertical-align: middle;
              }
              .post-form input, .post-form textarea {

boards/templates/boards/base.html

0 +1 -1

              <div class="navigation_panel">
                  {% block metapanel %}{% endblock %}
-                 [<a href="rss/">RSS</a>]
+                 [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
                  <a class="link" href="#top">{% trans 'Up' %}</a>
              </div>

boards/templates/boards/login.html

0 +27 -20

		@@ -1,22 +1,29 b''
1		<!DOCTYPE html>
2		<html>
3		<head>
4		<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/md/login.css" media="all"/>
5		<title>Login page</title>
6		</head>
	1	{% extends "boards/base.html" %}
	2
	3	{% load i18n %}
	4
	5	{% block head %}
	6	<title>{% trans 'Login' %}</title>
	7	{% endblock %}
	8
	9	{% block content %}
7	10
8		<body>
9		{% if error != none%}
10		<span id="error_message">
11		{{ error }}
12		</span>
13		{% endif %}
	11	<form enctype="multipart/form-data" method="post">
	12	<div class="post-form-w">
	13	<div class="post-form">
	14	<div class="form-row">
	15	<div class="form-label">{% trans 'User ID' %}</div>
	16	<div class="form-input">{{ form.user_id }}</div>
	17	<div class="form-errors">{{ form.user_id.errors }}</div>
	18	</div>
	19	</div>
	20	<div class="form-submit">
	21	<input type="submit" value="{% trans "Login" %}"/>
	22	</div>
	23	<div>
	24	{% trans 'Insert your user id above' %}
	25	</div>
	26	</div>
	27	</form>
14	28
15		<form action="login" method="POST">{% csrf_token %}
16
17		Login: <input type="text" name="name"><br />
18		Password: <input type="password" name="password"><br />
19		<input type="submit">
20		</form>
21		</body>
22		</html> No newline at end of file
	29	{% endblock %} No newline at end of file

boards/templates/boards/posting_general.html

0 +1 0

                          {% endif %}
                          ">{{ page }}</a>]
                      {% endfor %}
+                     [<a href="rss/">RSS</a>]
                  </span>
              {% endblock %}

boards/templates/boards/thread.html

0 +1 0

                      {{ posts.0.get_reply_count }} {% trans 'replies' %},
                      {{ posts.0.get_images_count }} {% trans 'images' %}.
                      {% trans 'Last update: ' %}{{ posts.0.last_edit_time }}
+                     [<a href="rss/">RSS</a>]
                  </span>
              {% endblock %}

boards/urls.py

0 +3 -5

                  url(r'^page/(?P<page>\w+)/$', views.index, name='index'),
                  # login page
-                 url(r'^login$', views.login, name='login'),
-                 # logout page
-                 url(r'^logout$', views.logout, name='logout'),
+                 url(r'^login/$', views.login, name='login'),
                  # /boards/tag/tag_name/
                  url(r'^tag/(?P<tag_name>\w+)/$', views.tag, name='tag'),
                  # /boards/thread/
                  url(r'^thread/(?P<post_id>\w+)/$', views.thread, name='thread'),
                  # /boards/theme/theme_name/
-                 url(r'^settings$', views.settings, name='settings'),
-                 url(r'^tags$', views.all_tags, name='tags'),
+                 url(r'^settings/$', views.settings, name='settings'),
+                 url(r'^tags/$', views.all_tags, name='tags'),
                  url(r'^captcha/', include('captcha.urls')),
                  url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
                  url(r'^authors/$', views.authors, name='authors'),

boards/views.py

0 +14 -22

              import boards
              from boards import utils
              from boards.forms import ThreadForm, PostForm, SettingsForm, PlainErrorList, \
-                 ThreadCaptchaForm, PostCaptchaForm
+                 ThreadCaptchaForm, PostCaptchaForm, LoginForm
              from boards.models import Post, Tag, Ban, User, RANK_USER, RANK_MODERATOR, NO_PARENT
              from boards import authors
              def login(request):
-                 """Log in as admin"""
-                 if 'name' in request.POST and 'password' in request.POST:
-                     request.session['admin'] = False
+                 """Log in with user id"""
-                     isAdmin = len(Admin.objects.filter(name=request.POST['name'],
-                                                        password=request.POST[
-                                                            'password'])) > 0
-                     if isAdmin:
-                         request.session['admin'] = True
+                 context = _init_default_context(request)
-                         response = HttpResponseRedirect('/')
-                     else:
-                         response = render(request, 'boards/login.html', {'error': 'Login error'})
-                 else:
-                     response = render(request, 'boards/login.html', {})
+                 if request.method == 'POST':
+                     form = LoginForm(request.POST, request.FILES, error_class=PlainErrorList)
+                     if form.is_valid():
+                         user = User.objects.get(user_id=form.cleaned_data['user_id'])
+                         request.session['user_id'] = user.id
+                         return redirect(index)
-                 return response
+                 else:
+                     form = LoginForm()
-             def logout(request):
-                 request.session['admin'] = False
-                 return HttpResponseRedirect('/')
+                 context['form'] = form
+                 return render(request, 'boards/login.html', context)
              def settings(request):

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages