--- a/web/hdabo/settings.py Fri Jun 24 03:31:05 2011 +0200
+++ b/web/hdabo/settings.py Fri Jun 24 03:39:10 2011 +0200
@@ -113,7 +113,6 @@
'django.contrib.messages.middleware.MessageMiddleware',
)
-
ROOT_URLCONF = 'hdabo.urls'
TEMPLATE_DIRS = (
@@ -168,3 +167,9 @@
PAGINATION_DEFAULT_NB_BY_PAGE = 50
from hdabo.config import * #@UnusedWildImport
+
+if 'LOGIN_REDIRECT_URL' not in locals():
+ LOGIN_REDIRECT_URL = BASE_URL
+if 'LOGIN_URL' not in locals():
+ LOGIN_URL = BASE_URL + "hdabo/accounts/login"
+
--- a/web/hdabo/templates/hdabo_base.html Fri Jun 24 03:31:05 2011 +0200
+++ b/web/hdabo/templates/hdabo_base.html Fri Jun 24 03:39:10 2011 +0200
@@ -55,8 +55,12 @@
<div id="content" class="span-24 last">
<div id="toolbar">
{% block toolbar %}
+ {% if user.is_authenticated %}
<ul><li><a href="{% url hdabo.views.home %}">Home</a></li>
- <li><a href="{% url hdabo.views.all_tags %}">Tous les tags</a></li></ul>
+ <li><a href="{% url hdabo.views.all_tags %}">Tous les tags</a></li>
+ <li><span style="float:right;">{{user.username}} | <a href="{% url django.contrib.auth.views.logout_then_login %}" >Se déconnecter</a></li>
+ </ul>
+ {% endif %}
{% endblock %}
</div>
<div id="inner_content">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/web/hdabo/templates/registration/login.html Fri Jun 24 03:39:10 2011 +0200
@@ -0,0 +1,26 @@
+{% extends "hdabo_base.html" %}
+{% load i18n %}
+ {% block content %}
+ {{block.super}}
+ {% if form.errors %}
+ <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+ {% endif %}
+ <div class="span-24 last">
+ <form action="" method='post' id="login-form">
+ <div id="loginform_div" class="span-12">
+ {% csrf_token %}
+ <input type="hidden" name="next" value="{{ next }}" />
+ <ul id="login_fields_list">
+ {{form.as_ul}}
+ </ul>
+ <ul>
+ <li><a href="{% url django.contrib.auth.views.password_reset %}" >{% trans "Forget password?" %}</a></li>
+ </ul>
+ <div id="submitcontent-buttons-login" class="span-24 last">
+ <button class="button"type="submit" value="login">{% trans "login" %}</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ {% endblock %}
+
\ No newline at end of file
--- a/web/hdabo/urls.py Fri Jun 24 03:31:05 2011 +0200
+++ b/web/hdabo/urls.py Fri Jun 24 03:39:10 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'),
--- a/web/hdabo/views.py Fri Jun 24 03:31:05 2011 +0200
+++ b/web/hdabo/views.py Fri Jun 24 03:39:10 2011 +0200
@@ -21,7 +21,7 @@
-#@login_required
+@login_required
def home(request):
orgas = Organisation.objects.all().order_by('name')
@@ -42,7 +42,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)
@@ -96,7 +96,7 @@
context_instance=RequestContext(request))
-#@login_required
+@login_required
def all_tags(request, num_page=None, nb_by_page=None, searched=None):
# If the view is asked after a form sent with post vars, it means that searched is a post var.
@@ -136,7 +136,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.
@@ -170,7 +170,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')
@@ -180,7 +180,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) #@UnusedVariable
@@ -226,7 +226,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"]
@@ -244,7 +244,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"]
@@ -272,7 +272,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"]
@@ -306,7 +306,7 @@
-#@login_required
+@login_required
def reset_wikipedia_info(request):
# 2 cases :
# - ordered tag for one datasheet : POST["datasheet_id"] is not null
@@ -330,7 +330,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"]
@@ -356,7 +356,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
@@ -374,7 +374,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 :
@@ -408,7 +408,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
@@ -425,7 +425,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({"":""})
@@ -434,7 +433,7 @@
return categories
-#@login_required
+@login_required
def update_tag_category(request):
tag_id = request.POST["id"]