From: Lukasz Rekucki Date: Fri, 21 Aug 2009 11:50:55 +0000 (+0200) Subject: Podstawowe logowanie do edytora. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/3517c7fa3ec165a2650799a8d821d21116789c3b?ds=sidebyside Podstawowe logowanie do edytora. --- diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 8d80d029..5134eed5 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -3,8 +3,10 @@ import hg, urllib2 from django.utils import simplejson as json from django.views.generic.simple import direct_to_template + from django.conf import settings from django.http import HttpResponseRedirect +from django.contrib.auth.decorators import login_required from explorer import forms, models diff --git a/project/settings.py b/project/settings.py index c5b0c2db..a4187068 100644 --- a/project/settings.py +++ b/project/settings.py @@ -62,6 +62,15 @@ TEMPLATE_LOADERS = ( # 'django.template.loaders.eggs.load_template_source', ) +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.core.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.request", +) + + MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', diff --git a/project/static/css/master.css b/project/static/css/master.css index 1a726a81..e7dfb70b 100644 --- a/project/static/css/master.css +++ b/project/static/css/master.css @@ -4,10 +4,21 @@ body { overflow: hidden; } -#breadcrumbs { - padding: 2px 10px; +#header { + position: relative; + padding: 2px 0.5em; background-color: #CDCDCD; - border-bottom: 1px solid #858585; + border-bottom: 1px solid black; + clear: both; +} + +#header #breadcrumbs { + +} + +#header #login_info { + position: absolute; + right: 1em; } ul { @@ -204,3 +215,18 @@ p { color: #FFF; cursor: default; } + + +div.isection { + margin: 1em auto; + border: 1px solid black; + padding: 0.5em 2em; + background: #9f9ffa; + + width: 60%; +} + +div.isection p { + margin: 0.5em 1em; +} + diff --git a/project/templates/base.html b/project/templates/base.html index 6e9c389f..9622fa4d 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -3,14 +3,17 @@ - {% block title %}Platforma Redakcyjna{% endblock %} + {% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%} {% block extrahead %} {% endblock %} - + {% block maincontent %} {% endblock %} diff --git a/project/templates/registration/head_login.html b/project/templates/registration/head_login.html new file mode 100644 index 00000000..d6df7fe7 --- /dev/null +++ b/project/templates/registration/head_login.html @@ -0,0 +1,6 @@ +{% if user.is_authenticated %} +{{ user.get_full_name }} | +Wyloguj +{% else %} +Logowanie +{% endif %} diff --git a/project/templates/registration/login.html b/project/templates/registration/login.html new file mode 100644 index 00000000..8bf89675 --- /dev/null +++ b/project/templates/registration/login.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block subtitle %} - Logowanie {% endblock subtitle %} + +{% block maincontent %} + +
+
+{{ form.as_p }} +

+ +
+
+ +{% endblock maincontent %} diff --git a/project/urls.py b/project/urls.py index 19f0520c..d153f84d 100644 --- a/project/urls.py +++ b/project/urls.py @@ -7,7 +7,7 @@ admin.autodiscover() urlpatterns = patterns('', - # Example: + # Explorer: url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/(?P[^/]+)/$', 'explorer.views.file_xml', name='file_xml'), url(r'^html/(?P[^/]+)/$', 'explorer.views.file_html', name='file_html'), @@ -17,6 +17,10 @@ urlpatterns = patterns('', # Admin panel url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), + + # Authorization + url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next_page'}), + url(r'^accounts/logout$', 'django.contrib.auth.views.logout', {'next_page': '/'}), # {'redirect_field_name': 'next_page'}), )