Merge branch 'master' into part-import

InvenTree/part/templates/part/part_base.html

@@ -12,13 +12,6 @@
 
 <div class='panel panel-default panel-inventree'>
 
-{% if part.variant_of %}
-<div class='alert alert-info alert-block'>
-    {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
-    {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
-</div>
-{% endif %}
-
     <div class="row">
     <div class="col-sm-6">
         {% include "part/part_thumb.html" %}
@@ -107,6 +100,15 @@
             </table>
         </div>
         </div>
+
+        <div class='info-messages'>
+            {% if part.variant_of %}
+            <div class='alert alert-info alert-block'>
+                {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
+                {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
+            </div>
+            {% endif %}
+        </div>
     </div>
     <div class="col-sm-6">
         <table class="table table-striped">

InvenTree/part/templatetags/inventree_extras.py

@@ -119,6 +119,12 @@ def inventree_version(*args, **kwargs):
     return version.inventreeVersion()
 
 
+@register.simple_tag()
+def inventree_api_version(*args, **kwargs):
+    """ Return InvenTree API version """
+    return version.inventreeApiVersion()
+
+
 @register.simple_tag()
 def django_version(*args, **kwargs):
     """ Return Django version string """