From bb069fbd218f8c72d0f787d572b5a818de4aef15 Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 17 Apr 2009 16:35:20 +0200 Subject: [PATCH] Beginning of a new component defined for normal users. (ie. not for admin purposes) --- admin/views.py | 5 +---- lib/__init__.py | 6 ++++++ main/__init__.py | 0 main/models.py | 3 +++ main/urls.py | 5 +++++ main/views.py | 10 +++++++++ static/pics/auto-reply.png | Bin 0 -> 693 bytes templates/main/index.html | 41 +++++++++++++++++++++++++++++++++++++ urls.py | 1 + 9 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 main/__init__.py create mode 100644 main/models.py create mode 100644 main/urls.py create mode 100644 main/views.py create mode 100644 static/pics/auto-reply.png create mode 100644 templates/main/index.html diff --git a/admin/views.py b/admin/views.py index 663efe130..0f6c75f8b 100644 --- a/admin/views.py +++ b/admin/views.py @@ -13,6 +13,7 @@ from mailng import admin from mailng.admin.models import Domain, Mailbox, Alias from forms import MailboxForm, DomainForm, AliasForm, PermissionForm from mailng.lib.authbackends import crypt_password +from mailng.lib import _render def _ctx_ok(url): return {"status" : "ok", "url" : url} @@ -20,10 +21,6 @@ def _ctx_ok(url): def _ctx_ko(tpl, ctx): return {"status" : "ko", "content" : render_to_string(tpl, ctx)} -def _render(request, tpl, user_context): - return render_to_response(tpl, user_context, - context_instance=RequestContext(request)) - def is_superuser(user): if not user.is_superuser: user.message_set.create(message=_("Permission denied.")) diff --git a/lib/__init__.py b/lib/__init__.py index d16f36492..bb942d9d4 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -2,6 +2,8 @@ import popen2 import os import time +from django.template import RequestContext +from django.shortcuts import render_to_response def exec_pipe(cmd): """Exécute une commande et récupère la sortie générée @@ -41,3 +43,7 @@ def crypt_password(raw_password): salt = salt[:5] hash = md5.new(salt + raw_password).hexdigest() return "%s$%s$%s" % ("md5", salt, hash) + +def _render(request, tpl, user_context): + return render_to_response(tpl, user_context, + context_instance=RequestContext(request)) diff --git a/main/__init__.py b/main/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/main/models.py b/main/models.py new file mode 100644 index 000000000..71a836239 --- /dev/null +++ b/main/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/main/urls.py b/main/urls.py new file mode 100644 index 000000000..c5b376b59 --- /dev/null +++ b/main/urls.py @@ -0,0 +1,5 @@ +from django.conf.urls.defaults import * + +urlpatterns = patterns('mailng.main.views', + url(r'^$', 'index') + ) diff --git a/main/views.py b/main/views.py new file mode 100644 index 000000000..1877c10f6 --- /dev/null +++ b/main/views.py @@ -0,0 +1,10 @@ +from django.shortcuts import get_object_or_404, render_to_response +from django.template.loader import render_to_string +from django.template import RequestContext +from django.contrib.auth.decorators \ + import login_required +from mailng.lib import _render + +@login_required +def index(request): + return _render(request, "main/index.html", {}) diff --git a/static/pics/auto-reply.png b/static/pics/auto-reply.png new file mode 100644 index 0000000000000000000000000000000000000000..a6197415940f9bbf8391817adfe110e1344cec5f GIT binary patch literal 693 zcmV;m0!safP)UTuL>Xl;KT0w}3p7GEL7SF^n-FX(tptm{(Al(fBT}n& zG9j%pn`yE|F)mzXQH^HV$0Q5`ZGn)tP19t2{4qxx8(9-r0i=`wR903|RUIZC8^^LNEXyJg2yh?}z_Kjv-haUHrY1^*rL6xFq*pY10i@#q zpp>GbqJm&B$ivYnPCgEhUiC=M3eKO+`J*qFajeE1Kx0puXDKeWXlrc&;LFkm zcLv4)$Y!%l&#&<+^#QT5zI6l-kN5B1GMkzy6t83?mj}k^@9hSl^VSn?4^MEe?F7op zkFcrlU%ydTSI?pHasWOptkKyQsUH^qRlHy3)AgqT1ie$72;)~@Cb0t*v-Xlb^?%kbbU*WZ#RJCy-TmlLg5zR b#rE892t`wcq{hbX00000NkvXXu0mjfX%#W& literal 0 HcmV?d00001 diff --git a/templates/main/index.html b/templates/main/index.html new file mode 100644 index 000000000..68193552e --- /dev/null +++ b/templates/main/index.html @@ -0,0 +1,41 @@ +{% extends "layout.html" %} +{% block content %} +{% load i18n %} +
+
+
+ {% if user.first_name %} +

{{ user.first_name }} {{ user.last_name }}

+ {% else %} +

{{ user.username }}

+ {% endif %} + +
+
+
+
+

{% trans "General" %}

+
+ + +
+
+{% endblock %} diff --git a/urls.py b/urls.py index 31b00f480..6915caef2 100644 --- a/urls.py +++ b/urls.py @@ -17,6 +17,7 @@ urlpatterns = patterns('', # (r'^admin/(.*)', admin.site.root), (r'^mailng/admin/', include('mailng.admin.urls')), + (r'^mailng/main/', include('mailng.main.urls')), (r'^accounts/login/$', 'django.contrib.auth.views.login'), (r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'), (r'^jsi18n/$', 'django.views.i18n.javascript_catalog',