Skip to content
Browse files

change order of description and language fields

  • Loading branch information...
1 parent ce39911 commit 0576657478a31a81381eb0f1eb10f05730af60a0 @sergiocharpineljr sergiocharpineljr committed Aug 14, 2012
View
6 ispdb/config/models.py
@@ -196,13 +196,13 @@ def __str__(self): return str(self.url)
def __unicode__(self): return self.url
class DocURLDesc(models.Model):
+ description = models.TextField(
+ max_length=100,
+ verbose_name="Description of the settings page")
language = models.CharField(
max_length=10,
verbose_name="Language",
choices=settings.LANGUAGES)
- description = models.TextField(
- max_length=100,
- verbose_name="Description of the settings page")
docurl = models.ForeignKey(DocURL, related_name="descriptions")
def __str__(self): return str(self.description)
View
3 ispdb/templates/config/details.html
@@ -269,8 +269,7 @@
{% for desc in docurl.desc_formset %}
<table class="tab_desc">
<tr>
- <td>{{ desc.language.label }}:</td><td>{{ desc.language|data_verbose_field }}</td>
- <td>{{ desc.description.label }}:</td><td>{{ desc.description.value }}</td>
+ <td>{{ desc.description.label }}:</td><td>{{ desc.description.value }}</td><td> {{ desc.language|data_verbose_field }}</td>
</tr>
</table>
{% endfor %}
View
12 ispdb/templates/config/enter_config.html
@@ -247,9 +247,9 @@
{% with config_form.docurl_formset.empty_desc_form as form %}
<tr>
<th>{{ form.description.label_tag }}:</th>
- <td>{{ form.language }}</td>
+ <td>{{ form.description }}</td>
<td>
- {{ form.description }}
+ {{ form.language }}
{{ form.DELETE }}
<a class="link delete desc" value="{1}-{0}">Remove</a>
</td>
@@ -262,9 +262,9 @@
<input type="hidden" name="{1}-TOTAL_FORMS" value="1" id="id_{1}-TOTAL_FORMS" /><input type="hidden" name="{1}-INITIAL_FORMS" value="0" id="{1}-INITIAL_FORMS" /><input type="hidden" name="{1}-MAX_NUM_FORMS" id="id_{1}-MAX_NUM_FORMS" />
<tr>
<th>{{ form.description.label_tag }}:</th>
- <td>{{ form.language }}</td>
+ <td>{{ form.description }}</td>
<td>
- {{ form.description }}
+ {{ form.language }}
{{ form.DELETE }}
<a class="link delete desc" value="{1}-{0}">Remove</a>
</td>
@@ -364,9 +364,9 @@ <h3 class="hidden" id="problem">There are missing or incorrect values in the for
{{ desc_form.id }}
<tr>
<th>{{ desc_form.description.label_tag }}:</th>
- <td>{{ desc_form.language.errors }}{{ desc_form.language }}</td>
+ <td>{{ desc_form.description.errors }}{{ desc_form.description }}</td>
<td>
- {{ desc_form.description.errors }}{{ desc_form.description }}
+ {{ desc_form.language.errors }}{{ desc_form.language }}
{{ desc_form.DELETE }}
{% if desc_form.DELETE.value == "True" %}
<a class="link delete desc" value="{{desc_form.prefix}}">Undo</a>
View
3 ispdb/templates/config/show_issue.html
@@ -142,8 +142,7 @@
<table class="tab_desc">
{% for desc in docurl.desc_formset %}
<tr>
- <td>{{ desc.language.label }}:</td><td>{{ desc.language|data_verbose_field }}</td>
- <td>{{ desc.description.label }}:</td><td>{{ desc.description.value }}</td>
+ <td>{{ desc.description.label }}:</td><td>{{ desc.description.value }}</td><td> {{ desc.language|data_verbose_field }}</td>
</tr>
{% endfor %}
</table>

0 comments on commit 0576657

Please sign in to comment.
Something went wrong with that request. Please try again.