From 65013fa5f9021425a2fce28fbd00cdf317f54d26 Mon Sep 17 00:00:00 2001 From: Lincoln de Sousa Date: Tue, 24 Jul 2007 01:18:48 -0300 Subject: [PATCH] adicionando as views e fazendo o login funcionar --- eventos/models.py | 14 +++++++++-- forms.py | 20 ++++++++++++++++ templates/base.html | 55 ++++++++++++++++++++++++++++++++++++++------ templates/index.html | 2 +- urls.py | 1 + views.py | 14 ++++++++--- 6 files changed, 93 insertions(+), 13 deletions(-) diff --git a/eventos/models.py b/eventos/models.py index cc9c965..4d96f24 100644 --- a/eventos/models.py +++ b/eventos/models.py @@ -29,7 +29,7 @@ class Evento(models.Model): nome_contato = models.CharField('Nome do contato', maxlength=100) telefone = models.CharField(maxlength=100) cidade = models.CharField(maxlength=100) - estado = models.CharField(maxlength=100) # TODO: can became a combobox + uf = models.CharField(maxlength=100) # TODO: should became a combobox rua = models.CharField(maxlength=100) numero = models.CharField('Número', maxlength=10) info_adicional = models.TextField() @@ -38,7 +38,7 @@ class Evento(models.Model): fields = ( (None, {'fields': ('nome', 'data_inicio', 'data_final')}), ('Informações da sede', {'fields': ('nome_local', 'nome_contato', - 'cidade', 'estado', 'rua', 'numero', 'info_adicional')}), + 'cidade', 'uf', 'rua', 'numero', 'info_adicional')}), ) def __str__(self): @@ -86,6 +86,16 @@ class Palestrante(models.Model): return self.nome +class Participante(models.Model): + nome = models.CharField(maxlength=100) + + class Admin: + pass + + def __str__(self): + return self.nome + + class CategoriaPalestra(models.Model): nome = models.CharField(maxlength=100) diff --git a/forms.py b/forms.py index 125f594..7a95937 100644 --- a/forms.py +++ b/forms.py @@ -17,6 +17,26 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ from django import newforms as forms +from django.newforms.widgets import Textarea class InscreverPalestra(forms.Form): pass + +class CadastroPalestrante(forms.Form): + nome = forms.CharField(max_length=100) + email = forms.CharField(max_length=100) + + telefone_comercial = forms.CharField(max_length=11) + telefone_residencial = forms.CharField(max_length=11) + telefone_celular = forms.CharField(max_length=11) + + instituicao = forms.CharField(max_length=100) + minicurriculo = forms.CharField(widget=Textarea()) + + rua = forms.CharField(max_length=100) + numero = forms.CharField(max_length=10) + bairro = forms.CharField(max_length=100) + cidade = forms.CharField(max_length=100) + uf = forms.CharField(max_length=100) + + areas_interesse = forms.MultipleChoiceField() diff --git a/templates/base.html b/templates/base.html index 43545be..06c6263 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,9 +5,46 @@ Encontro Mineiro de Software Livre + + -

Encontro Mineiro de Software Livre

+

Encontro Mineiro de Software Livre

{% if user.is_authenticated %} @@ -22,23 +59,27 @@

Login

- + + maxlength="30" name="username" />
- + + type="password" name="password" />
+ + Cadastre-se
{% endif %} - {% block content %} - {% endblock %} +
+ {% block content %}{% endblock %} +
+{# vim: set ft=htmldjango: #} diff --git a/templates/index.html b/templates/index.html index beced90..f43889d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block content %} -teste +Openarena R0X {% endblock %} diff --git a/urls.py b/urls.py index c516b31..ddf7ec9 100644 --- a/urls.py +++ b/urls.py @@ -24,5 +24,6 @@ urlpatterns = patterns('', (r'^logout/', 'django.contrib.auth.views.logout', {'next_page': '/'}), (r'^inscrever_palestra/', views.inscrever_palestra), + (r'^cadastro/', views.cadastro), (r'^$', views.index), ) diff --git a/views.py b/views.py index 13d35d8..243bf30 100644 --- a/views.py +++ b/views.py @@ -17,16 +17,24 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. """ from django.shortcuts import render_to_response -from django.template import RequestContext +from django.template import RequestContext, Context from eventmanager.decorators import enable_login_form +from eventmanager.forms import InscreverPalestra, CadastroPalestrante @enable_login_form def index(request): return render_to_response('index.html', context_instance=RequestContext(request)) +@enable_login_form +def cadastro(request): + form = CadastroPalestrante() + c = Context({'form': form}) + return render_to_response('cadastro.html', c, + context_instance=RequestContext(request)) def inscrever_palestra(request): - form = forms.InscreverPalestra() - return render_to_response('inscrever_palestra.html', + form = InscreverPalestra() + c = Context({'form': form}) + return render_to_response('inscrever_palestra.html', c, context_instance=RequestContext(request)) -- 2.20.1