From: Arthur Darcet Date: Sat, 2 Feb 2013 13:36:23 +0000 (+0100) Subject: Basic group list X-Git-Url: http://git.polytechnique.org/?p=xnet;a=commitdiff_plain;h=1e2ffbc2ac4bb53275958215605efb9d5ee3479e Basic group list --- diff --git a/xnet/group/models.py b/xnet/group/models.py index b544387..a2c273d 100644 --- a/xnet/group/models.py +++ b/xnet/group/models.py @@ -38,7 +38,7 @@ class Group(models.Model): kind = models.CharField(max_length=10, choices=KIND_CHOICES, verbose_name=_(u"kind")) domain = models.CharField(max_length=20, choices=DOMAIN_CHOICES, verbose_name=_(u"domain")) - dns = models.CharField(max_length=128, verbose_name=_(u"dns domain"), blank=True, unique=True) + dns = models.CharField(max_length=128, verbose_name=_(u"dns domain"), blank=True) class Meta: verbose_name = _(u"group") diff --git a/xnet/group/urls.py b/xnet/group/urls.py new file mode 100644 index 0000000..5a16503 --- /dev/null +++ b/xnet/group/urls.py @@ -0,0 +1,8 @@ +from django.conf.urls.defaults import patterns, url + + +urlpatterns = patterns( + 'xnet.group.views', + url(r'^$', 'index', name='index'), + url(r'^view/([0-9]+)$', 'view', name='view'), +) diff --git a/xnet/group/views.py b/xnet/group/views.py new file mode 100644 index 0000000..8cc4072 --- /dev/null +++ b/xnet/group/views.py @@ -0,0 +1,11 @@ +from django.contrib import messages +from django.shortcuts import render + +from xnet.group.models import Group + + +def index(request): + return render(request, 'groups/index.html', {'groups': Group.objects.order_by('kind')}) + +def view(request): + pass diff --git a/xnet/site/static/css/groups.css b/xnet/site/static/css/groups.css new file mode 100644 index 0000000..5ca99d8 --- /dev/null +++ b/xnet/site/static/css/groups.css @@ -0,0 +1,15 @@ +.group_list { + float: left; + border: solid 1px black; + border-radius: 5px; + background-color: white; + margin: 1%; + width: 22%; +} +.group_list h3 { + margin: 0 10px 0 10px; + font-size: medium; +} +.group_list li { + list-style: none; +} diff --git a/xnet/templates/base.html b/xnet/templates/base.html index 8b0257f..69aa45d 100644 --- a/xnet/templates/base.html +++ b/xnet/templates/base.html @@ -11,6 +11,7 @@ + {% block css %}{% endblock %} {% block body %} @@ -27,9 +28,9 @@

- - {% trans "blah" %} + + + {% trans "Groupes" %} diff --git a/xnet/templates/groups/index.html b/xnet/templates/groups/index.html new file mode 100644 index 0000000..9001ee8 --- /dev/null +++ b/xnet/templates/groups/index.html @@ -0,0 +1,37 @@ +{% extends "base.html" %} +{% load static %} + +{% block css %} + {{ block.super }} + +{% endblock %} +{% block js %} + +{% endblock %} + +{% block content %} +{% regroup groups by get_kind_display as group_list %} +{% for group in group_list %} +

+

{{ group.grouper }}

+ +

{{ item }}

+

+{% endfor %} +{% endblock %} diff --git a/xnet/urls.py b/xnet/urls.py index 89a94dc..8c4236e 100644 --- a/xnet/urls.py +++ b/xnet/urls.py @@ -11,6 +11,6 @@ admin.site.login_template = 'xnet/admin_login.html' urlpatterns = patterns('', url(r'^$', 'xnet.site.views.home', name='home'), url(r'^xorgauth/', authgroupex_view.login_view, name='xorgauth'), - + url(r'^groups/', include('xnet.group.urls', namespace='groups')), url(r'^admin/', include(admin.site.urls)), )