Moved formats to models.

This commit is contained in:
Robert Kolner committed 2014-04-09 21:45:52 +02:00
1 parent 0d41a7d94d
commit 909d387efe
3 files changed
+16 -20

No files matched your search

+10 -1
View File
@@ -12,7 +12,16 @@ class DesignOrder(Order):
('A6', 'A6 (105 x 148 mm)'),
]
format_type = models.CharField(max_length=50)
FORMATS = [
('Trykk - Flyer', 'Trykk - Flyer'),
('Trykk - Plakat', 'Trykk - Plakat'),
('Trykk - Banner', 'Trykk - Banner'),
('Web - Annonse', 'Web - Annonse'),
('Web - Banner', 'Web - Banner'),
('Web - Bilde', 'Web - Bilde'),
]
format_type = models.CharField(max_length=50, choices=FORMATS)
paper_size = models.CharField(max_length=50, choices=PAPER_SIZES)
colour = models.CharField(max_length=50)
marger = models.CharField(max_length=50)
+2 -1
View File
@@ -32,7 +32,8 @@ class DesignFormView(BaseFormView):
def _get_params(self):
params = super(DesignFormView, self)._get_params()
params.update({
'paper_sizes' : DesignOrder._meta.get_field('paper_size').choices
'paper_sizes' : DesignOrder._meta.get_field('paper_size').choices,
'format_types' : DesignOrder._meta.get_field('format_type').choices,
})
return params
+4 -18
View File
@@ -9,27 +9,13 @@
<label class="text-error">Feltet er obligatorisk.</label>
{% endif %}
{% for format_type_code, format_type_display in format_types %}
<label class="radio">
<input name="format" type="radio" value="Trykk - Flyer" {% if format = 'Trykk - Flyer' %} checked="checked" {% endif %}>Trykk - Flyer</input>
<input name="format" type="radio" value="{{ format_type_code }}" {% if format = format_type_code %} checked="checked" {% endif %}>{{ format_type_display }}</input>
</label>
{% endfor %}
<label class="radio">
<input name="format" type="radio" value="Trykk - Plakat" {% if format = 'Trykk - Plakat' %} checked="checked" {% endif %}>Trykk - Plakat</input>
</label>
<label class="radio">
<input name="format" type="radio" value="Trykk - Banner" {% if format = 'Trykk - Banner' %} checked="checked" {% endif %}>Trykk - Banner</input>
</label>
<label class="radio">
<input name="format" type="radio" value="Web - Annonse" {% if format = 'Web - Annonse' %} checked="checked" {% endif %}>Web - Annonse</input>
</label>
<label class="radio">
<input name="format" type="radio" value="Web - Banner" {% if format = 'Web - Banner' %} checked="checked" {% endif %}>Web - Banner</input>
</label>
<label class="radio">
<input name="format" type="radio" value="Web - Bilde" {% if format = 'Web - Bilde' %} checked="checked" {% endif %}>Web - Bilde</input>
</label>
<label class="radio">
<input name="format" type="radio" value="other" {% if format = 'other' %} checked="checked" {% endif %}>Annet:
</input>
<input name="format" type="radio" value="other" {% if format = 'other' %} checked="checked" {% endif %}>Annet:</input>
</label>
<input type="text" name="format_other" value="{{ format_other }}" style="margin-left:20px;" />
{% if errors.format_other_error %}