diff --git a/gadjo/templates/gadjo/form.html b/gadjo/templates/gadjo/form.html index b503f49..7e76df8 100644 --- a/gadjo/templates/gadjo/form.html +++ b/gadjo/templates/gadjo/form.html @@ -3,14 +3,14 @@

{% trans "There were errors processing your form." %}

{% for error in form.non_field_errors %} -

{{ error }}

+

{{ error }}

{% endfor %} {% for field in form %} {% if field.is_hidden and field.errors %}

{% for error in field.errors %} - {% blocktrans with name=field.name %}(Hidden field {{name}}) {{ error }}{% endblocktrans %} - {% if not forloop.last %}
{% endif %} + {% blocktrans with name=field.name %}(Hidden field {{name}}) {{ error }}{% endblocktrans %} + {% if not forloop.last %}
{% endif %} {% endfor %}

{% endif %} diff --git a/gadjo/templates/gadjo/pagination.html b/gadjo/templates/gadjo/pagination.html index d7e576d..31c1a3c 100644 --- a/gadjo/templates/gadjo/pagination.html +++ b/gadjo/templates/gadjo/pagination.html @@ -11,47 +11,47 @@ Expected context variables: {% endcomment %} {% if page_obj.paginator.num_pages > 1 %} -{% with page_key=page_key|default:"page" %} -{% spaceless %} -

- {% if page_obj.number > 4 %} - 1 - … - {% else %} - {% if page_obj.number >= 3 %} - 1 - {% if page_obj.number == 4 %} - 2 - {% endif %} - {% endif %} - {% endif %} + {% with page_key=page_key|default:"page" %} + {% spaceless %} +

+ {% if page_obj.number > 4 %} + 1 + … + {% else %} + {% if page_obj.number >= 3 %} + 1 + {% if page_obj.number == 4 %} + 2 + {% endif %} + {% endif %} + {% endif %} - {% if page_obj.has_previous %} - {{ page_obj.previous_page_number }} - {% endif %} + {% if page_obj.has_previous %} + {{ page_obj.previous_page_number }} + {% endif %} - {{ page_obj.number }} + {{ page_obj.number }} - {% if page_obj.has_next %} - {{ page_obj.next_page_number }} - {% endif %} + {% if page_obj.has_next %} + {{ page_obj.next_page_number }} + {% endif %} - {% if page_obj.number < page_obj.paginator.num_pages|add:"-3" %} - {% if page_obj.next_page_number != page_obj.paginator.num_pages %} - … - {{ page_obj.paginator.num_pages }} - {% endif %} - {% else %} - {% if page_obj.number <= page_obj.paginator.num_pages|add:"-2" %} - {% if page_obj.number == page_obj.paginator.num_pages|add:"-3" %} - {% with a_page_key=page_obj.paginator.num_pages|add:"-1" %} - {{ a_page_key }} - {% endwith %} - {% endif %} - {{ page_obj.paginator.num_pages }} - {% endif %} - {% endif %} -

-{% endspaceless %} -{% endwith %} + {% if page_obj.number < page_obj.paginator.num_pages|add:"-3" %} + {% if page_obj.next_page_number != page_obj.paginator.num_pages %} + … + {{ page_obj.paginator.num_pages }} + {% endif %} + {% else %} + {% if page_obj.number <= page_obj.paginator.num_pages|add:"-2" %} + {% if page_obj.number == page_obj.paginator.num_pages|add:"-3" %} + {% with a_page_key=page_obj.paginator.num_pages|add:"-1" %} + {{ a_page_key }} + {% endwith %} + {% endif %} + {{ page_obj.paginator.num_pages }} + {% endif %} + {% endif %} +

+ {% endspaceless %} + {% endwith %} {% endif %} diff --git a/gadjo/templates/gadjo/radio-widget.html b/gadjo/templates/gadjo/radio-widget.html index 10585e7..ff92c12 100644 --- a/gadjo/templates/gadjo/radio-widget.html +++ b/gadjo/templates/gadjo/radio-widget.html @@ -3,7 +3,7 @@ {% block widget-attrs %}role="radiogroup"{% endblock %} {% block widget-control %} -{% for option in field %} -{{ option }} -{% endfor %} + {% for option in field %} + {{ option }} + {% endfor %} {% endblock %} diff --git a/gadjo/templates/gadjo/root.html b/gadjo/templates/gadjo/root.html index 18cb630..5c345b3 100644 --- a/gadjo/templates/gadjo/root.html +++ b/gadjo/templates/gadjo/root.html @@ -6,108 +6,108 @@ {% block gadjo-favicon %} - + {% endblock %} {% block gadjo-css %} - + {% block css %} - + {% endblock %} {% endblock %} {% block gadjo-js %} - - - + + + {% endblock %} {{ media }} {% block extrascripts %} {% endblock %} -
- {% block sidepage %} - {% endblock %} - {% block user-links %} - - {% endblock %} -
+ {% block user-links %} + + {% endblock %} +
-
+
-
- {% block main-content %} - + {% block after-main-content %} {% endblock %} -
- {% block after-main-content %} + {% block sidebar %} + {% endblock %} + +
+ + + + + {% block page-end %} {% endblock %} - - {% block sidebar %} - {% endblock %} - -
- - - - - {% block page-end %} - {% endblock %} diff --git a/gadjo/templates/gadjo/widget.html b/gadjo/templates/gadjo/widget.html index 26eefe1..505b1d7 100644 --- a/gadjo/templates/gadjo/widget.html +++ b/gadjo/templates/gadjo/widget.html @@ -1,39 +1,39 @@ {% load gadjo i18n %}
+ {{ field.css_classes }} + django-{{ field|field_class_name }} + {% if field.errors %}widget-with-error{% endif %} + {% if field.field.required %}widget-required{% else %}widget-optional{% endif %}" + id="{{field.id_for_label}}_p"> {% block widget-title %} -
- {{ field.label_tag }} - {% if field.field.required %} - * - {% else %} - {% trans "(optional)" %} - {% endif %} -
+
+ {{ field.label_tag }} + {% if field.field.required %} + * + {% else %} + {% trans "(optional)" %} + {% endif %} +
{% endblock %} {% block widget-content %} -
- {% block widget-error %} - {% if field.errors %} -

- {% for error in field.errors %} - {{ error }}{% if not forloop.last %}
{% endif %} - {% endfor %} -

- {% endif %} - {% endblock %} - {% block widget-control %} - {{ field }} - {% endblock %} - {% block widget-hint %} - {% if field.help_text %} -
{{ field.help_text|safe }}
- {% endif %} - {% endblock %} -
+
+ {% block widget-error %} + {% if field.errors %} +

+ {% for error in field.errors %} + {{ error }}{% if not forloop.last %}
{% endif %} + {% endfor %} +

+ {% endif %} + {% endblock %} + {% block widget-control %} + {{ field }} + {% endblock %} + {% block widget-hint %} + {% if field.help_text %} +
{{ field.help_text|safe }}
+ {% endif %} + {% endblock %} +
{% endblock %}