Templates cleanup

interfaces/templates/interface.html

@@ -1,11 +1,13 @@
 {% extends "base.html" %}
 {% load i18n %}
+
 {% block title %}{% trans "Interface" %} - {{ iface }}{% endblock %}
+
+{% block page_heading %}{% trans "Interface" %}: {{ iface }}{% endblock page_heading %}
+
 {% block content %}
-   <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            <h2 class="page-header">{% trans "Interface" %}: {{ iface }}</h2>
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item active">
                     <a href="{% url 'overview' compute.id %}"><i class="fa fa-dashboard"></i> {% trans "Overview" %}</a>
@@ -31,9 +33,6 @@
             </ol>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         <dl class="ml-3 row">

interfaces/templates/interfaces.html

@@ -1,13 +1,16 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load staticfiles %}
+
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
+
+{% block page_heading%}{% trans "Interfaces" %} - {{ compute.name }}{% endblock page_heading %}
+
+{% block page_heading_extra %}{% include 'create_iface_block.html' %}{% endblock page_heading_extra %}
+
 {% block content %}
-    <!-- Page Heading -->
     <div class="row">
         <div class="col-lg-12">
-            {% include 'create_iface_block.html' %}
-            <h2 class="page-header">{{ compute.name }}</h2>
             <nav aria-label="breadcrumb">
             <ol class="breadcrumb bg-light shadow-sm">
                 <li class="breadcrumb-item active">
@@ -35,9 +38,6 @@
             </nav>
         </div>
     </div>
-    <!-- /.row -->
-
-    {% include 'errors_block.html' %}
 
     <div class="row">
         {% if not  ifaces_all %}

interfaces/views.py

@@ -1,3 +1,4 @@
+from django.contrib import messages
 from django.shortcuts import render, get_object_or_404
 from django.http import HttpResponseRedirect
 from django.urls import reverse
@@ -17,7 +18,6 @@ def interfaces(request, compute_id):
     """
 
     ifaces_all = []
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
     try:
@@ -42,10 +42,10 @@ def interfaces(request, compute_id):
                     return HttpResponseRedirect(request.get_full_path())
                 else:
                     for msg_err in form.errors.values():
-                        error_messages.append(msg_err.as_text())
+                        messages.error(request, msg_err.as_text())
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'interfaces.html', locals())
 
@@ -60,7 +60,6 @@ def interface(request, compute_id, iface):
     """
 
     ifaces_all = []
-    error_messages = []
     compute = get_object_or_404(Compute, pk=compute_id)
 
     try:
@@ -88,6 +87,6 @@ def interface(request, compute_id, iface):
                 return HttpResponseRedirect(reverse('interfaces', args=[compute_id]))
         conn.close()
     except libvirtError as lib_err:
-        error_messages.append(lib_err)
+        messages.error(request, lib_err)
 
     return render(request, 'interface.html', locals())