diff --git a/circle/dashboard/templates/base.html b/circle/dashboard/templates/base.html index d95e4ba..101a4e7 100644 --- a/circle/dashboard/templates/base.html +++ b/circle/dashboard/templates/base.html @@ -6,7 +6,7 @@ - {% block title %}{% block title-page %}{% endblock %} | {% block title-site %}Circle{% endblock %}{% endblock %} + {% block title %}{% block title-page %}{% endblock %} | {% block title-site %}CIRCLE{% endblock %}{% endblock %} @@ -22,21 +22,61 @@ - + + +
-{% block content %} -

Please override "content" block.

-{% endblock %} -
- + {% block messages %} +
+ {% if messages %} + {% for message in messages %} +
+ {{ message|safe }} +
+ {% endfor %} + {% endif %} +
+ {% endblock messages %} + {% block content %} +

Please override "content" block.

+ {% endblock %}
- + {% block extra_js %} {% endblock %} diff --git a/circle/dashboard/templates/dashboard/base.html b/circle/dashboard/templates/dashboard/base.html index caf86d6..0b1dc5b 100644 --- a/circle/dashboard/templates/dashboard/base.html +++ b/circle/dashboard/templates/dashboard/base.html @@ -1,83 +1,4 @@ -{% load i18n %} - - - - - - +{% extends "base.html" %} +{% load i18n %} - {% block title %}{% block title-page %}{% endblock %} | {% block title-site %}Circle{% endblock %}{% endblock %} - - - - - - - - - - - - - - - - - -
- {% block messages %} -
- {% if messages %} - {% for message in messages %} -
- {{ message|safe }} -
- {% endfor %} - {% endif %} -
- {% endblock messages %} - {% block content %} -

Please override "content" block.

- {% endblock %} -
- - -{% block extra_js %} -{% endblock %} - +{% block title-site %}Dashboard | CIRCLE{% endblock %} diff --git a/circle/dashboard/templates/dashboard/group-list.html b/circle/dashboard/templates/dashboard/group-list.html index 4535a0e..4e34451 100644 --- a/circle/dashboard/templates/dashboard/group-list.html +++ b/circle/dashboard/templates/dashboard/group-list.html @@ -1,6 +1,9 @@ {% extends "dashboard/base.html" %} {% load i18n %} {% load render_table from django_tables2 %} + +{% block title-page %}{% trans "Group list" %}{% endblock %} + {% block content %}
diff --git a/circle/dashboard/templates/dashboard/index.html b/circle/dashboard/templates/dashboard/index.html index 095a8a4..0a01b78 100644 --- a/circle/dashboard/templates/dashboard/index.html +++ b/circle/dashboard/templates/dashboard/index.html @@ -1,7 +1,7 @@ {% extends "dashboard/base.html" %} {% load i18n %} -{% block title-page %}{% trans "Dashboard" %}{% endblock %} +{% block title-page %}{% trans "Index" %}{% endblock %} {% block content %}
diff --git a/circle/dashboard/templates/dashboard/lease-create.html b/circle/dashboard/templates/dashboard/lease-create.html index 9332e97..da1b08c 100644 --- a/circle/dashboard/templates/dashboard/lease-create.html +++ b/circle/dashboard/templates/dashboard/lease-create.html @@ -1,6 +1,9 @@ {% extends "dashboard/base.html" %} {% load i18n %} {% load crispy_forms_tags %} + +{% block title-page %}{% trans "Create lease" %}{% endblock %} + {% block content %}
diff --git a/circle/dashboard/templates/dashboard/lease-edit.html b/circle/dashboard/templates/dashboard/lease-edit.html index cd8b86d..bd86285 100644 --- a/circle/dashboard/templates/dashboard/lease-edit.html +++ b/circle/dashboard/templates/dashboard/lease-edit.html @@ -1,8 +1,10 @@ {% extends "dashboard/base.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% block content %} +{% block title-page %}{% trans "Edit lease" %}{% endblock %} + +{% block content %}
diff --git a/circle/dashboard/templates/dashboard/node-detail.html b/circle/dashboard/templates/dashboard/node-detail.html index ef61d47..91566ee 100644 --- a/circle/dashboard/templates/dashboard/node-detail.html +++ b/circle/dashboard/templates/dashboard/node-detail.html @@ -1,5 +1,8 @@ {% extends "dashboard/base.html" %} {% load i18n %} + +{% block title-page %}{{ node.name }} | {% trans "Node" %}{% endblock %} + {% block content %}