diff --git a/docbow_project/templates/admin/404.html b/docbow_project/templates/admin/404.html index 10aeb75..7792cc6 100644 --- a/docbow_project/templates/admin/404.html +++ b/docbow_project/templates/admin/404.html @@ -8,6 +8,6 @@ {% block content %} -

{% trans "Page not found" %}

-

{% trans "We're sorry, but the requested page could not be found." %}

+

{% trans "Page not found" %}

+

{% trans "We're sorry, but the requested page could not be found." %}

{% endblock %} diff --git a/docbow_project/templates/admin/500.html b/docbow_project/templates/admin/500.html index e6fb34a..78aa61d 100644 --- a/docbow_project/templates/admin/500.html +++ b/docbow_project/templates/admin/500.html @@ -4,13 +4,18 @@ {% load i18n %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %} + +{% endblock %} {% block title %}{% trans "Server error (500)" %}{% endblock %} {% block content %} -

{% trans "Server Error (500)" %}

-

{% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %}

+

{% trans "Server Error (500)" %}

+

{% trans "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." %}

{% endblock %} diff --git a/docbow_project/templates/admin/actions.html b/docbow_project/templates/admin/actions.html index 7e9f8ea..2f873d7 100644 --- a/docbow_project/templates/admin/actions.html +++ b/docbow_project/templates/admin/actions.html @@ -1,14 +1,14 @@ {% load i18n %} -
+
{% for field in action_form %}{{ field }}{% endfor %} {% if actions_selection_counter %} - {% endblock %} {% endif %} {% block content %} -
-
- {% if app_list %} - {% for app in app_list %} -
-

{% trans app.name %}

- {% for model in app.models %} -
- {% if model.perms.change %}{{ model.name }}{% else %}{{ model.name }}{% endif %} -
    -
  • {% if model.perms.add %}{% trans 'Add' %}{% else %} {% endif %}
    • -
  • {% if model.perms.change %}{% trans 'Change' %}{% else %} {% endif %}
    • +
    +
    + {% for app in app_list %} +
    +

    {% trans app.name %}

    + {% for model in app.models %} +
    + {% if model.perms.change %}{{ model.name }}{% else %}{{ model.name }}{% endif %} + {% if model.perms.add or model.perms.change %} + -
    - {% endfor %} -
    - {% endfor %} - {% endif %} + {% endif %} +
    + {% endfor %} +
    + {% empty %} +

    {% trans "You don´t have permission to edit anything." %}

    + {% endfor %}
{% endblock %} diff --git a/docbow_project/templates/admin/base.html b/docbow_project/templates/admin/base.html index fe2bd9e..bd8dc54 100644 --- a/docbow_project/templates/admin/base.html +++ b/docbow_project/templates/admin/base.html @@ -1,83 +1,123 @@ - - -{% load adminmedia i18n grp_tags %} +{% load admin_static %}{% load url from future %}{% load i18n grp_tags %} + + {% block title %}{% endblock %} - {% block blockbots %} - - {% endblock %} + + {% block blockbots %}{% endblock %} {% block stylesheets %} - - {% if LANGUAGE_BIDI %}{% endif %} - - + + + {% if LANGUAGE_BIDI %} + + + {% else %} + + {% endif %} {% endblock %} {% block extrastyle %}{% endblock %} {% block javascripts %} - + - - - - - - - - - - - - - - - + + + {% if debug %} + + + + + + + + + + + + + + {% else %} + + + {% endif %} {% endblock %} {% block extrahead %}{% endblock %} - -
+ +
+ - {% if not is_popup %} - {% include "admin/includes_grappelli/header.html" %} - - {% block breadcrumbs %} - - {% endblock %} - {% endif %} - - {% if messages %} -
    - {% for message in messages %} - {{ message }} - {% endfor %} -
- {% endif %} +
+ {% if not is_popup %} + + + {% include "admin/includes_grappelli/header.html" %} + + +
+ + +
+ {% endif %} +
+ -
- {% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{% trans title %}

{% endif %}{% endblock %} - {% block object-tools %}{% endblock %} - {% block content %} - {{ content }} - {% block filters %}{% endblock %} - {% endblock %} -
-
+
+ + + {% if messages %} +
    + {% for message in messages %} + {{ message }} + {% endfor %} +
+ {% endif %} + + +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block object-tools %}{% endblock %} +
+ + +
+ {% block content %} + {{ content }} + {% block filters %}{% endblock %} + {% endblock %} +
+ +
+ - {% block footer %}{% endblock %} + {% block footer %}{% endblock %} +
- + \ No newline at end of file diff --git a/docbow_project/templates/admin/change_form.html b/docbow_project/templates/admin/change_form.html index c02745a..2c82635 100644 --- a/docbow_project/templates/admin/change_form.html +++ b/docbow_project/templates/admin/change_form.html @@ -1,7 +1,8 @@ {% extends "admin/base_site.html" %} -{% load i18n admin_modify adminmedia grp_tags %} +{% load url from future %} +{% load admin_static i18n admin_modify grp_tags %} {% block stylesheets %} @@ -11,59 +12,104 @@ {% block javascripts %} {{ block.super }} - {% url admin:jsi18n as jsi18nurl %} + {% url 'admin:jsi18n' as jsi18nurl %} - {{ media }} {% endblock %} -{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %} -{% block content-class %}content-flexible{% endblock %} +{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} grp-change-form{% endblock %} +{% block content-class %}{% endblock %} + + + +{% block page-tools %} + {% if not is_popup %} + + {% endif %} +{% endblock %} {% block breadcrumbs %} {% if not is_popup %} - + {% endif %} {% endblock %} @@ -71,9 +117,11 @@ {% block object-tools %} {% if change %} {% if not is_popup %} -
    -
  • {% trans "History" %}
    • - {% if has_absolute_url %}
  • {% trans "View on site" %}
    • {% endif%} + {% endif %} {% endif %} @@ -81,60 +129,60 @@ {% block content %} -
    -
    -
    {% csrf_token %}{% block form_top %}{% endblock %} -
    - - {% if is_popup %}{% endif %} - - - {% if save_on_top %}{% submit_row %}{% endif %} - - - {% if errors %} -

    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    -
      {% for error in adminform.form.non_field_errors %}
    • {{ error }}
      • {% endfor %}
    - {% endif %} - - - {% for fieldset in adminform %} - {% include "admin/includes/fieldset.html" %} - {% endfor %} - - {% block after_field_sets %}{% endblock %} - - - {% for inline_admin_formset in inline_admin_formsets %} - {% include inline_admin_formset.opts.template %} - {% endfor %} - - {% block after_related_objects %}{% endblock %} - - - {% submit_row %} - - {% if adminform and add %} - {% block extrahead %} - - {% endblock %} - {% endif %} - - - {% prepopulated_fields_js %} - -
    -
    +
    {% csrf_token %}{% block form_top %}{% endblock %} +
    + + {% if is_popup %}{% endif %} + + + + + {% if errors %} +

    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    +
      {% for error in adminform.form.non_field_errors %}
    • {{ error }}
      • {% endfor %}
    + {% endif %} + + + {% block field_sets %} + {% for fieldset in adminform %} + {% include "admin/includes/fieldset.html" %} + {% endfor %} + {% endblock %} + + {% block after_field_sets %}{% endblock %} + + + {% block inline_field_sets %} + {% for inline_admin_formset in inline_admin_formsets %} + {% include inline_admin_formset.opts.template %} + {% endfor %} + {% endblock %} + + {% block after_related_objects %}{% endblock %} + + + {% block submit_buttons_bottom %}{% submit_row %}{% endblock %} + + {% if adminform and add %} + {% block extrahead %} + {{ block.super }} + + {% endblock %} + {% endif %} + + + {% prepopulated_fields_js %} +
    -
    + {% endblock %} diff --git a/docbow_project/templates/admin/change_list.html b/docbow_project/templates/admin/change_list.html index 3a12d53..032270b 100644 --- a/docbow_project/templates/admin/change_list.html +++ b/docbow_project/templates/admin/change_list.html @@ -1,7 +1,8 @@ {% extends "admin/base_site.html" %} -{% load adminmedia admin_list i18n grp_tags %} +{% load url from future %} +{% load admin_list i18n grp_tags %} {% block stylesheets %} @@ -12,6 +13,7 @@ {% block javascripts %} {{ block.super }} + {{ media.js }} {% if cl.formset or action_form %} {% url 'admin:jsi18n' as jsi18nurl %} @@ -22,7 +24,7 @@ $(document).ready(function() { $("tr input.action-select").actions(); }); - })(django.jQuery); + })(grp.jQuery); {% endif %} {% if cl.formset %} @@ -34,29 +36,73 @@ var related_lookup_fields_fk = {% get_related_lookup_fields_fk cl.model_admin %}; var related_lookup_fields_m2m = {% get_related_lookup_fields_m2m cl.model_admin %}; var related_lookup_fields_generic = {% get_related_lookup_fields_generic cl.model_admin %}; + var autocomplete_fields_fk = {% get_autocomplete_lookup_fields_fk cl.model_admin %}; + var autocomplete_fields_m2m = {% get_autocomplete_lookup_fields_m2m cl.model_admin %}; + var autocomplete_fields_generic = {% get_autocomplete_lookup_fields_generic cl.model_admin %}; $.each(related_lookup_fields_fk, function() { - $("div.changelist-results") + $("div.grp-changelist-results") .find("input[name^='" + prefix + "'][name$='" + this + "']") - .grp_related_fk({lookup_url:"{% url grp_related_lookup %}"}); + .grp_related_fk({lookup_url:"{% url 'grp_related_lookup' %}"}); }); $.each(related_lookup_fields_m2m, function() { - $("div.changelist-results") + $("div.grp-changelist-results") .find("input[name^='" + prefix + "'][name$='" + this + "']") - .grp_related_m2m({lookup_url:"{% url grp_m2m_lookup %}"}); + .grp_related_m2m({lookup_url:"{% url 'grp_m2m_lookup' %}"}); }); $.each(related_lookup_fields_generic, function() { var content_type = this[0], object_id = this[1]; - $("div.changelist-results") + $("div.grp-changelist-results") .find("input[name^='" + prefix + "'][name$='" + this[1] + "']") .each(function() { var ct_id = "#id_" + prefix + "-" + $(this).attr("id").split("-")[1] + "-" + content_type, obj_id = "#id_" + prefix + "-" + $(this).attr("id").split("-")[1] + "-" + object_id; - $(this).grp_related_generic({content_type:ct_id, object_id:obj_id, lookup_url:"{% url grp_related_lookup %}"}); + $(this).grp_related_generic({content_type:ct_id, object_id:obj_id, lookup_url:"{% url 'grp_related_lookup' %}"}); }); }); + $.each(autocomplete_fields_fk, function() { + $("div.grp-changelist-results") + .find("input[name^='" + prefix + "'][name$='" + this + "']") + .each(function() { + $(this).grp_autocomplete_fk({ + lookup_url:"{% url 'grp_related_lookup' %}", + autocomplete_lookup_url:"{% url 'grp_autocomplete_lookup' %}" + }); + }); + }); + $.each(autocomplete_fields_m2m, function() { + $("div.grp-changelist-results") + .find("input[name^='" + prefix + "'][name$='" + this + "']") + .each(function() { + $(this).grp_autocomplete_m2m({ + lookup_url:"{% url 'grp_m2m_lookup' %}", + autocomplete_lookup_url:"{% url 'grp_autocomplete_lookup' %}" + }); + }); + }); + $.each(autocomplete_fields_generic, function() { + var content_type = this[0], + object_id = this[1]; + $("div.grp-changelist-results") + .find("input[name^='" + prefix + "'][name$='" + this[1] + "']") + .each(function() { + var i = $(this).attr("id").match(/-\d+-/); + if (i) { + var ct_id = "#id_" + prefix + i[0] + content_type, + obj_id = "#id_" + prefix + i[0] + object_id; + $(this).grp_autocomplete_generic({ + content_type:ct_id, + object_id:obj_id, + lookup_url:"{% url 'grp_related_lookup' %}", + autocomplete_lookup_url:"{% url 'grp_autocomplete_lookup' %}" + }); + } + }); + }); + // reset actions select box + $('.grp-changelist-actions select').val(-1); }); - })(django.jQuery); + })(grp.jQuery); {% endif %} - {{ media.js }} {% endblock %} {% block object-tools %} {% if has_add_permission %} -
      -
    • - - {% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %} - -
      • + {% endif %} {% endblock %} @@ -107,37 +149,57 @@ {% block content %} {% if cl.search_fields or cl.has_filters or cl.date_hierarchy %} -
      - - {% pagination cl %} - {% if cl.has_filters or cl.search_fields %} - - {% if cl.has_filters %} -
      -
      - {% trans 'Filter' %} -
      - {% for spec in cl.filter_specs %}{% admin_list_filter cl spec %}{% endfor %} -
      +
      +
      +
      + {% if cl.has_filters or cl.search_fields %} + {% block aside %} + + {% endblock %} + {% endif %} + {% block pagination_top %} +
      + + {% pagination cl %}
      -
      - {% endif %} - - {% if cl.search_fields %} - - {% endif %} - {% endif %} -
      + {% endblock %} + +
      +
      + + {% block date_hierarchy %} + {% if cl.date_hierarchy %}{% date_hierarchy cl %}{% endif %} + {% endblock %}
      - - {% if cl.date_hierarchy %} - {% date_hierarchy cl %} - {% endif %} {% endif %} -
      {% csrf_token %} -
      + {% csrf_token %} +
      +

      Results

      {% if is_popup %}{% endif %} @@ -155,19 +217,24 @@ {% block result_list %} {% result_list cl %} {% endblock %} - - {% pagination cl %} -

      + + + {% if not cl.result_count == 0 %} + {% block pagination_bottom %} +
      +
      {% pagination cl %}
      +
      + {% endblock %} + {% endif %} {% if cl.formset or action_form %} - + {% endif %}
      {% endblock %} diff --git a/docbow_project/templates/admin/change_list_results.html b/docbow_project/templates/admin/change_list_results.html index 062b52e..4d743f2 100644 --- a/docbow_project/templates/admin/change_list_results.html +++ b/docbow_project/templates/admin/change_list_results.html @@ -1,29 +1,40 @@ +{% load i18n admin_static %} +{% if result_hidden_fields %} +
      {# DIV for HTML validation #} + {% for item in result_hidden_fields %}{{ item }}{% endfor %} +
      +{% endif %} + {% if results %} - - {% if result_hidden_fields %} -
      {# DIV for HTML validation #} - {% for item in result_hidden_fields %}{{ item }}{% endfor %} -
      - {% endif %} - -
      - +
      +
      {% for header in result_headers %} - {% endfor %} {% for result in results %} - {% for item in result %}{{ item }}{% endfor %} + {% if result.form.non_field_errors %} + + {% endif %} + {% for item in result %}{{ item }}{% endfor %} {% endfor %}
      - {% if header.sortable %}{% endif %} - {{ header.text|capfirst }} - {% if header.sortable %}{% endif %} + + {% if header.sortable %} + {% if header.sort_priority > 0 %} +
      + + {% if num_sorted_fields > 1 %}{{ header.sort_priority }}{% endif %} + +
      + {% endif %} + {% endif %} +
      {% if header.sortable %}{{ header.text|capfirst }}{% else %}{{ header.text|capfirst }}{% endif %}
      {{ result.form.non_field_errors }}
      {% endif %} + diff --git a/docbow_project/templates/admin/csv_export_selected_confirmation.html b/docbow_project/templates/admin/csv_export_selected_confirmation.html index 873bd87..88a7827 100644 --- a/docbow_project/templates/admin/csv_export_selected_confirmation.html +++ b/docbow_project/templates/admin/csv_export_selected_confirmation.html @@ -5,12 +5,12 @@ {% block breadcrumbs %} - + {% endblock %} @@ -23,18 +23,18 @@ $("._fields").attr('checked', $(this).attr('checked')); }); }); - })(django.jQuery); + })(grp.jQuery); -
      +
      {% csrf_token %} -
      +

      {% blocktrans %}Export following fields:{% endblocktrans %}

      -
      +
      -
      +
        {% for item in fields %}
      • @@ -44,15 +44,15 @@
      -
      +
      {% for obj in queryset %} {% endfor %} -
      diff --git a/docbow_project/templates/admin/date_hierarchy.html b/docbow_project/templates/admin/date_hierarchy.html index 25e3c6b..472bcf0 100644 --- a/docbow_project/templates/admin/date_hierarchy.html +++ b/docbow_project/templates/admin/date_hierarchy.html @@ -1,13 +1,15 @@ {% load i18n %} -{% if show and choices %} -
      -
      -
        - {% if back %}
      • {{ back.title }}
        • {% endif %} - {% for choice in choices %} -
      • {% if choice.link %}{{ choice.title }}{% else %}{{ choice.title }}{% endif %}
        • - {% endfor %} -

      -
      -
      +{% if show and choices|length %} +
      + +
      {% endif %} + diff --git a/docbow_project/templates/admin/delete_confirmation.html b/docbow_project/templates/admin/delete_confirmation.html index f0cf7ad..41e68ab 100644 --- a/docbow_project/templates/admin/delete_confirmation.html +++ b/docbow_project/templates/admin/delete_confirmation.html @@ -1,46 +1,58 @@ {% extends "admin/base_site.html" %} -{% load i18n %} +{% load url from future %} +{% load i18n admin_urls %} + + {% block breadcrumbs %} - + {% endblock %} {% block content %} -
      - {% if perms_lacking %} -
      -

      {% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

      -
      -
        +
        + {% if perms_lacking or protected %} +
        + {% if perms_lacking %} +

        {% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

        +
          {% for obj in perms_lacking %}
        • {{ obj }}
          • {% endfor %}
        -
        + {% endif %} + {% if protected %} +

        {% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}

        +
          + {% for obj in protected %} +
        • {{ obj }}
          • + {% endfor %} +
        + {% endif %}
        {% else %} -
        +

        {% blocktrans with object as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}

        -
        -
          {{ deleted_objects|unordered_list }}
        -
        +
          {{ deleted_objects|unordered_list }}
        {% csrf_token %} -
        - +
        + +
        {% endif %} diff --git a/docbow_project/templates/admin/delete_selected_confirmation.html b/docbow_project/templates/admin/delete_selected_confirmation.html index 5fce00c..ada4f38 100644 --- a/docbow_project/templates/admin/delete_selected_confirmation.html +++ b/docbow_project/templates/admin/delete_selected_confirmation.html @@ -1,52 +1,64 @@ {% extends "admin/base_site.html" %} -{% load i18n %} +{% load url from future %} +{% load i18n l10n admin_urls %} + + {% block breadcrumbs %} - + {% endblock %} {% block content %} -
        - {% if perms_lacking %} -
        -

        {% blocktrans %}Deleting the {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

        -
        -
          +
          + {% if perms_lacking or protected %} +
          + {% if perms_lacking %} +

          {% blocktrans %}Deleting the selected {{ objects_name }} would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

          +
            {% for obj in perms_lacking %}
          • {{ obj }}
            • {% endfor %}
          -
          + {% endif %} + {% if protected %} +

          {% blocktrans %}Deleting the selected {{ objects_name }} would require deleting the following protected related objects:{% endblocktrans %}

          +
            + {% for obj in protected %} +
          • {{ obj }}
            • + {% endfor %} +
          + {% endif %}
          {% else %} -
          -

          {% blocktrans %}Are you sure you want to delete the selected {{ objects_name }} objects? All of the following objects and their related items will be deleted:{% endblocktrans %}

          +
          +

          {% blocktrans %}Are you sure you want to delete the selected {{ objects_name }}? All of the following objects and their related items will be deleted:{% endblocktrans %}

          {% for deleteable_object in deletable_objects %} -
          -
            {{ deleteable_object|unordered_list }}
          -
          +
            {{ deleteable_object|unordered_list }}
          {% endfor %}
          {% csrf_token %} -
          + {% endif %} diff --git a/docbow_project/templates/admin/filter.html b/docbow_project/templates/admin/filter.html index 07756b6..b94b198 100644 --- a/docbow_project/templates/admin/filter.html +++ b/docbow_project/templates/admin/filter.html @@ -1,7 +1,9 @@ {% load i18n %} -
          - - +
          +
          + + +
          \ No newline at end of file diff --git a/docbow_project/templates/admin/index.html b/docbow_project/templates/admin/index.html index 139c6c0..3d89c96 100644 --- a/docbow_project/templates/admin/index.html +++ b/docbow_project/templates/admin/index.html @@ -1,7 +1,7 @@ {% extends "admin/base_site.html" %} -{% load i18n adminmedia grp_tags log %} +{% load i18n grp_tags log %} {% block javascripts %} @@ -13,49 +13,77 @@ {% block content-class %}content-grid{% endblock %} -{% block breadcrumbs %}{% endblock %} -{% block content_title %}{% if title %}

          {{ title }}

          {% endif %}{% endblock %} +{% block breadcrumbs %} +
            +
          • {% trans "Home" %}
            • +
          +{% endblock %} +{% block content_title %} + {% if title %} +

          {{ title }}

          + {% endif %} +{% endblock %} {% block content %} -
          -
          - {% if app_list %} +
          +
          {% for app in app_list %} -
          -

          {% trans app.name %}

          +
          +

          {% trans app.name %}

          {% for model in app.models %} -
          - {% if model.perms.change %}{{ model.name }}{% else %}{{ model.name }}{% endif %} - -
          - {% endfor %} -
          - {% endfor %} - {% else %} -

          {% trans "You don´t have permission to edit anything." %}

          - {% endif %} -
          -
          -
          -

          {% trans 'Recent Actions' %}

          -
          -

          {% trans 'My Actions' %}

          - {% get_admin_log 10 as admin_log for_user user %} - {% if not admin_log %} -

          {% trans 'None available' %}

          - {% else %} - - {% endif %} +
          + {% if model.admin_url %} + {{ model.name }} + {% else %} + {{ model.name }} + {% endif %} + {% if model.add_url or model.admin_url %} + + {% endif %} +
          + {% endfor %} +
          + {% empty %} +

          {% trans "You don´t have permission to edit anything." %}

          + {% endfor %} +
          +
          +
          +

          {% trans 'Recent Actions' %}

          +
          +

          {% trans 'My Actions' %}

          + {% get_admin_log 10 as admin_log for_user user %} + {% if not admin_log %} +

          {% trans 'None available' %}

          + {% else %} +
            + {% for entry in admin_log %} +
          • + {% if entry.is_deletion %} + {{ entry.object_repr }} + {% else %} + {{ entry.object_repr }} + {% endif %} + {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} +
            • + {% endfor %} +
          + {% endif %} +
          -
          {% endblock %} + diff --git a/docbow_project/templates/admin/invalid_setup.html b/docbow_project/templates/admin/invalid_setup.html index f3e097e..e08ba8e 100644 --- a/docbow_project/templates/admin/invalid_setup.html +++ b/docbow_project/templates/admin/invalid_setup.html @@ -1,10 +1,16 @@ {% extends "admin/base_site.html" %} +{% load url from future %} {% load i18n %} -{% block breadcrumbs %}{% endblock %} +{% block breadcrumbs %} + +{% endblock %} {% block content %} diff --git a/docbow_project/templates/admin/login.html b/docbow_project/templates/admin/login.html index 8528fbb..81f9b75 100644 --- a/docbow_project/templates/admin/login.html +++ b/docbow_project/templates/admin/login.html @@ -1,19 +1,21 @@ {% extends "admin/base_site.html" %} -{% load i18n %} {# grp_csrf #} +{% load url from future %} +{% load i18n %} -{% block bodyclass %}login{% endblock %} -{% block content-class %}content-flexible{% endblock %} +{% block bodyclass %}grp-login{% endblock %} +{% block content-class %}{% endblock %} {% block content_title %}{% endblock %} {% block extrahead %} + {{ block.super }} {% endblock %} @@ -22,27 +24,45 @@ {% block content %} -