Eventplanner: Grid / Translation

musicians/admin.py

@@ -4,13 +4,10 @@ from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
 
 
-from musicians.models import Musician, PhoneNumber
+from musicians.models import Musician
 
 from eventplanner.admin import EventParticipationInline
 
-class PhoneNumberInline( admin.TabularInline ):
-    model = PhoneNumber
-    extra = 3
 
 # Define an inline admin descriptor for Musician model
 # which acts a bit like a singleton
@@ -22,7 +19,7 @@ class MusicianInline( admin.StackedInline ):
     
 # Define a new User admin
 class UserAdmin( UserAdmin ):
-    inlines = (MusicianInline, PhoneNumberInline, )
+    inlines = (MusicianInline, )
 
 
 

musicians/models.py

@@ -12,16 +12,6 @@ INSTRUMENTS = (
 )
              
 
-
-class PhoneNumber( models.Model ):
-    user   = models.OneToOneField( User )
-    
-    desc   = models.CharField( max_length=15 )
-    number = models.CharField( max_length=25 )
-    
-
-
-
 def musicianPictureName( musician, originalName ):
     fileExtension = os.path.splitext(originalName)[1]
     return "user_images/" + musician.user.username + fileExtension
@@ -29,18 +19,18 @@ def musicianPictureName( musician, originalName ):
 
 class Musician( models.Model ):
     # Link to user object, contains first name and last name
-    user       = models.OneToOneField( User )
+    user       = models.OneToOneField( User, verbose_name=_("user") )
     
     # Properties
-    image      = models.ImageField( upload_to = musicianPictureName )
+    image      = models.ImageField( upload_to = musicianPictureName, verbose_name=_("image") )
     
-    instrument = models.CharField( max_length=4, choices=INSTRUMENTS, blank=True )
-    birthday   = models.DateField( null=True )
-    street     = models.CharField( max_length=80, blank=True )
-    city       = models.CharField( max_length=40, blank=True )
-    zip_code   = models.IntegerField( null=True)
+    instrument = models.CharField( max_length=4, choices=INSTRUMENTS, blank=True, verbose_name=_("instrument") )
+    birthday   = models.DateField( null=True, verbose_name=_("birthday") )
+    street     = models.CharField( max_length=80, blank=True, verbose_name=_("street") )
+    city       = models.CharField( max_length=40, blank=True, verbose_name=_("city") )
+    zip_code   = models.IntegerField( null=True, verbose_name=_("zip_code") )
     
-    public_description = models.TextField( blank=True )
+    public_description = models.TextField( blank=True, verbose_name=_("public_description") )
     
     def __unicode__(self):
         return self.user.username

musicians/templates/musicians/musician_edit.html

@@ -1,15 +1,37 @@
-{% extends "base.html" %}
+
+{% extends "website/base.html" %}
 
 {% load crispy_forms_tags %}
 
+
+<!-- No Feature slider -->
+{% block feature_slider %}
+{% endblock %}
+
+
+<!-- Static Navbar at top -->
+{% block navbar_options %} navbar navbar-inverse navbar-static-top {% endblock %}
+
+
+
 {% block content %}
 
-	{% crispy form %}
+<div class="container">
+	<div class="row">
+		<h3>{{user.first_name}} {{user.last_name}}</h3>
+		<div class="span6">
+			<form method="post">
+				{% csrf_token %}
+    			{{ form }}
+    			<br>
+    			<input type="submit" class="btn btn-primary" value="Abschicken"></input>
+			</form>
+		</div>
+		<div class="span6">
+			<img src="{{MEDIA_URL}}/user_images/{{user.username}}.png"></img>
+		</div>
+		
+	</div>
+</div>
 
-	<!-- 
-	<form action="/musicians/martin" method="post">
-	{% csrf_token %}
-	{{ form.as_p|crispy }}
-	<input type="submit" value="Submit" />
-	</form> -->
 {% endblock %}

musicians/views.py

@@ -7,9 +7,6 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render
 from django.shortcuts import get_object_or_404
 
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
-
 
 class MusicianList( ListView):
     model = Musician
@@ -17,68 +14,40 @@ class MusicianList( ListView):
 
 class UserEditForm(forms.ModelForm):
     
-    first_name = forms.CharField( max_length = 60)
-    last_name  = forms.CharField( max_length = 60)
     email      = forms.EmailField()
     
     def __init__(self, *args, **kw):
         
         if 'instance' in kw.keys():
             user = kw['instance'].user
-            initVals = { 'first_name': user.first_name, 
-                         'last_name':  user.last_name,
-                         'email':      user.email }
+            initVals = { 'email':      user.email }
             if not 'initial' in kw.keys(): 
                 kw['initial'] = initVals
             else:
                 kw['initial'].update(initVals)
         
-        super(UserEditForm, self).__init__(*args, **kw)
-        
-        self.helper = FormHelper()
-        self.helper.form_id = 'id-exampleForm'
-        self.helper.form_class = 'blueForms'
-        self.helper.form_method = 'post'
-        self.helper.form_action = '/musicians/martin' # TODO
+        super(UserEditForm, self).__init__( *args, **kw )
 
-        self.helper.add_input(Submit('submit', 'Submit'))
         
-        self.helper.form_class = 'form-horizontal'
-        #self.helper.layout = Layout(
-        #    Fieldset(
-        #        'Edit User',
-        #        'first_name',
-        #        'last_name',
-        #        'birthday',
-        #    ),
-        #)
-        
-        self.fields.keyOrder.remove('first_name')
-        self.fields.keyOrder.remove('last_name')
         self.fields.keyOrder.remove('email')
         
-        self.fields.keyOrder.insert(0, 'first_name')
-        self.fields.keyOrder.insert(1, 'last_name')    
         self.fields.keyOrder.insert(2, 'email')    
 
     def save(self):
         if self.is_valid():
             super(UserEditForm,self).save()
-            self.instance.user.first_name =  self.cleaned_data['first_name']
-            self.instance.user.last_name =  self.cleaned_data['last_name']
-            self.instance.user.email =  self.cleaned_data['email']
+            self.instance.user.email      =  self.cleaned_data['email']
             self.instance.user.save()
         
     class Meta:
         model  = Musician
-        exclude = [ 'user','image' ]
+        exclude = [ 'user','image', 'instrument' ]
         #fields = '__all__'
         
 
 
 def user_edit( request, username ):
-    
-    musician = get_object_or_404(Musician, user__username=username )
+    musician = get_object_or_404( Musician, user__username=username )
     
     if request.method == 'POST': # If the form has been submitted...
         form = UserEditForm(request.POST) # A form bound to the POST data
@@ -89,7 +58,7 @@ def user_edit( request, username ):
     else:
         form = UserEditForm( instance= musician )
 
-    return render(request, 'musicians/musician_edit.html', { 'form': form,  }  )
+    return render(request, 'musicians/musician_edit.html', { 'form': form, }  )