diff -r 1f01957a3eae -r 50f3f48467e8 web/hdabo/templates/registration/login.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/hdabo/templates/registration/login.html Thu Jun 23 17:53:20 2011 +0200 @@ -0,0 +1,26 @@ +{% extends "hdabo_base.html" %} +{% load i18n %} + {% block content %} + {{block.super}} + {% if form.errors %} +

{% trans "Sorry, that's not a valid username or password." %}

+ {% endif %} +

+ +

+ {% endblock %} + \ No newline at end of file diff -r 1f01957a3eae -r 50f3f48467e8 web/hdabo/urls.py --- a/web/hdabo/urls.py Wed Jun 22 17:53:22 2011 +0200 +++ b/web/hdabo/urls.py Thu Jun 23 17:53:20 2011 +0200 @@ -1,5 +1,7 @@ from django.conf.urls.defaults import patterns, include, url from django.contrib import admin +from django.contrib.auth import urls as auth_url + # Uncomment the next two lines to enable the admin: admin.autodiscover() @@ -13,6 +15,8 @@ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: + url(r'^accounts/', include(auth_url)), + url(r'^logout/', 'django.contrib.auth.views.logout_then_login'), url(r'^admin/', include(admin.site.urls)), url(r'^search/', include('haystack.urls')), url(r'^$', 'hdabo.views.home', name='home'), diff -r 1f01957a3eae -r 50f3f48467e8 web/hdabo/views.py --- a/web/hdabo/views.py Wed Jun 22 17:53:22 2011 +0200 +++ b/web/hdabo/views.py Thu Jun 23 17:53:20 2011 +0200 @@ -20,7 +20,7 @@ -#@login_required +@login_required def home(request): # Get all organizations @@ -39,7 +39,7 @@ context_instance=RequestContext(request)) -#@login_required +@login_required def list_for_orga(request, orga_id=None, valid=None, start_index=None): orga = Organisation.objects.get(id=orga_id) @@ -92,7 +92,7 @@ context_instance=RequestContext(request)) -#@login_required +@login_required def all_tags(request, num_page=None, nb_by_page=None, searched=None): default_nb_py_page = 50 @@ -157,7 +157,7 @@ context_instance=RequestContext(request)) -#@login_required +@login_required def tag_up_down(request): ds_id = request.POST["datasheet_id"] # post vars new_order and old_order indicate the position (from 1) of the tag in the list. @@ -191,7 +191,7 @@ return get_tag_table(request=request, ds_id=ds_id, valid=0) -#@login_required +@login_required def get_tag_table(request=None, ds_id=None, valid=None): ordered_tags = TaggedSheet.objects.filter(datasheet=Datasheet.objects.filter(id=ds_id)[0]).order_by('order') @@ -201,7 +201,7 @@ context_instance=RequestContext(request)) -#@login_required +@login_required def get_all_tags_table(request, num_page=None, nb_by_page=None, searched=None): current_page, p, num_page, nb_by_page = get_current_page(num_page, nb_by_page, searched) @@ -211,7 +211,6 @@ context_instance=RequestContext(request)) -#@login_required def get_current_page(num_page=None, nb_by_page=None, searched=None): default_nb_py_page = 50 @@ -251,7 +250,7 @@ return current_page, p, num_page, nb_by_page -#@login_required +@login_required def remove_tag_from_list(request=None): ds_id = request.POST["datasheet_id"] @@ -269,7 +268,7 @@ return get_tag_table(request=request, ds_id=ds_id, valid=0) -#@login_required +@login_required def modify_tag(request): tag_id = request.POST["id"] @@ -297,7 +296,7 @@ return get_all_tags_table(request=request, num_page=request.POST["num_page"], nb_by_page=request.POST["nb_by_page"], searched=request.POST["searched"]) -#@login_required +@login_required def modify_tag_datasheet(request): tag_id = request.POST["id"] @@ -331,7 +330,7 @@ -#@login_required +@login_required def reset_wikipedia_info(request): # 2 cases : # - ordered tag for one datasheet : POST["datasheet_id"] is not null @@ -355,7 +354,7 @@ return get_all_tags_table(request=request, num_page=request.POST["num_page"], nb_by_page=request.POST["nb_by_page"], searched=request.POST["searched"]) -#@login_required +@login_required def add_tag(request=None): ds_id = request.POST["datasheet_id"] @@ -381,7 +380,7 @@ return get_tag_table(request=request, ds_id=ds_id, valid=0) -#@login_required +@login_required def remove_wp_link(request=None): # 2 cases : # - ordered tag for one datasheet : POST["datasheet_id"] is not null @@ -399,7 +398,7 @@ return get_all_tags_table(request=request, num_page=request.POST["num_page"], nb_by_page=request.POST["nb_by_page"], searched=request.POST["searched"]) -#@login_required +@login_required def validate_datasheet(request=None, ds_id=None, valid=None): # We set if valid is true of false, function of the url parameters if valid == "1" or valid == "true" or not valid : @@ -433,7 +432,7 @@ return redirect('home') -#@login_required +@login_required def update_tag_alias(request): # 2 cases : # - ordered tag for one datasheet : POST["datasheet_id"] is not null @@ -450,7 +449,6 @@ return get_all_tags_table(request=request, num_page=request.POST["num_page"], nb_by_page=request.POST["nb_by_page"], searched=request.POST["searched"]) -#@login_required def get_categories(): # List of categories in an OrderedDict categories = OrderedDict({"":""}) @@ -459,7 +457,7 @@ return categories -#@login_required +@login_required def update_tag_category(request): tag_id = request.POST["id"]