refactor: adjust template block names

renamed so they make sense

!20

app/access/templates/access/index.html.j2

@@ -3,7 +3,7 @@
 {% block title %}Organizations{% endblock %}
 {% block content_header_icon %}{% endblock %}
 
-{% block body%}
+{% block content %}
 
 <table class="data">
     <tr>

app/access/templates/access/organization.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}Organization - {{ organization.name }}{% endblock %}
 
-{% block body%}
+{% block content %}
 
 
 <section class="content-header">

app/access/templates/access/team.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}Team - {{ team.team_name }}{% endblock %}
 
-{% block body%}
+{% block content %}
 <form method="post">
   {% csrf_token %}
   <div>

app/config_management/templates/config_management/group.html.j2

@@ -1,6 +1,6 @@
 {% extends 'base.html.j2' %}
 
-{% block body %}
+{% block content %}
 
 <script>
 

app/config_management/templates/config_management/group_index.html.j2

@@ -1,6 +1,6 @@
 {% extends 'base.html.j2' %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="New Group" onclick="window.location='{% url 'Config Management:_group_add' %}';">
 <table class="data">

app/core/templates/history.html.j2

@@ -1,7 +1,7 @@
 {% extends 'base.html.j2' %}
 {% load json %}
 
-{% block body %}
+{% block content %}
 
 <script>
 

app/itam/templates/itam/device.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}{{ device.name }}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <script>
 

app/itam/templates/itam/device_index.html.j2

@@ -3,7 +3,7 @@
 {% block title %}Devices{% endblock %}
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="New Device" onclick="window.location='{% url 'ITAM:_device_add' %}';">
 <table class="data">

app/itam/templates/itam/operating_system.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}{{ operating_system.name }}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <script>
 

app/itam/templates/itam/operating_system_index.html.j2

@@ -3,7 +3,7 @@
 {% block title %}Operating Systems{% endblock %}
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="New Operating System" onclick="window.location='{% url 'ITAM:_operating_system_add' %}';">
 <table class="data">

app/itam/templates/itam/software.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}{{ software.name }}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <script>
 

app/itam/templates/itam/software_index.html.j2

@@ -3,7 +3,7 @@
 {% block title %}Software{% endblock %}
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="New Software" onclick="window.location='{% url 'ITAM:_software_add' %}';">
 <table class="data">

app/settings/templates/settings/device_models.html.j2

@@ -3,7 +3,7 @@
 
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="<< Back to settings" onclick="window.location='{% url 'Settings:Settings' %}';">
 <input type="button" value="New Device Model" onclick="window.location='{% url 'Settings:_device_model_add' %}';">

app/settings/templates/settings/device_types.html.j2

@@ -3,7 +3,7 @@
 
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="<< Back to settings" onclick="window.location='{% url 'Settings:Settings' %}';">
 <input type="button" value="New Device Type" onclick="window.location='{% url 'Settings:_device_type_add' %}';">

app/settings/templates/settings/home.html.j2

@@ -1,7 +1,7 @@
 {% extends 'base.html.j2' %}
 
 
-{% block content%}
+{% block article %}
 <style>
 
 div#content {

app/settings/templates/settings/manufacturers.html.j2

@@ -3,7 +3,7 @@
 
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 <input type="button" value="<< Back to settings" onclick="window.location='{% url 'Settings:Settings' %}';">
 <input type="button" value="New Manufacturer" onclick="window.location='{% url 'Settings:_manufacturer_add' %}';">

app/settings/templates/settings/software_categories.html.j2

@@ -3,7 +3,7 @@
 
 {% block content_header_icon %}{% endblock %}
 
-{% block body %}
+{% block content %}
 
 
 <input type="button" value="<< Back to settings" onclick="window.location='{% url 'Settings:Settings' %}';">

app/templates/base.html.j2

@@ -13,7 +13,7 @@
 </head>
 
 <body>
-
+  {% block body %}
   <header>
 
     <h1><a href="/" style="text-decoration: none; color: inherit;">{% settings_value "SITE_TITLE" %}</a></h1>
@@ -69,7 +69,6 @@ section h2 span svg {
 
 </style>
 
-
     <section>
       <h2>{% block title %}{{ content_title }}{% endblock %}
         {% if model_delete_url %}
@@ -84,14 +83,14 @@ section h2 span svg {
             <path d="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z"/>
           </svg>
         </span>
-        {% endblock %}
+        {% endblock content_header_icon %}
         {% endif %}
-        </h2>
-      {% block content %}
+      </h2>
+      {% block article %}
       <article>
-        {% block body%}{% endblock %}
+        {% block content %}{% endblock %}
       </article>
-      {% endblock %}
+      {% endblock article %}
       <footer>
       <span style="position:relative; font-size: 12px">
         Build details: 
@@ -107,8 +106,8 @@ section h2 span svg {
       <span></span>
       </footer>
     </section>
-
   </main>
+  {% endblock body %}
 
 </body>
 

app/templates/form.html.j2

@@ -1,6 +1,6 @@
 {% extends 'base.html.j2' %}
 
-{% block body%}
+{% block content %}
 
 <form method="post">
   {% csrf_token %}

app/templates/home.html.j2

@@ -1,7 +1,7 @@
 {% extends 'base.html.j2' %}
 
 
-{% block body%}
+{% block content %}
 
 To Do List:
 

app/templates/password_change.html.j2

@@ -2,7 +2,7 @@
 
 {% block title %}Change Password{% endblock %}
 
-{% block body%}
+{% block content %}
 <div>
 <form action="" method="post">
     {% csrf_token %}