[UPDT] BASE: Added display inline to company image

base/models.py

@@ -106,10 +106,9 @@ class Company(HorillaModel):
         return str(self.company)
 
     def company_icon_with_name(self):
-        from django.utils.html import format_html
 
         return format_html(
-            '<img src="{}" style="width: 30px; border-radius: 100%" class="oh-profile__image" alt="" /> {}',
+            '<img src="{}" style="width: 30px; border-radius: 100%; display:inline;" class="oh-profile__image" alt="" /> {}',
             self.icon.url,
             self.company,
         )

base/templates/base/mail_server/mail_server.html

@@ -17,7 +17,7 @@
 {% include "generic/components.html" %}
 <div class="oh-inner-sidebar-content">
 	{% if perms.base.view_dynamicemailconfiguration %}
-		<div class="oh-inner-sidebar-content__header d-flex justify-content-between align-items-center">
+		{% comment %} <div class="oh-inner-sidebar-content__header d-flex justify-content-between align-items-center">
 			<h2 class="oh-inner-sidebar-content__title">{% trans "Mail Servers" %}</h2>
 			{% if perms.base.add_dynamicemailconfiguration %}
 				<button class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
@@ -27,8 +27,16 @@
 					{% trans "Create" %}
 				</button>
 			{% endif %}
-		</div>
-		{% if mail_servers %}
+		</div> {% endcomment %}
+
+		<div hx-get="{% url 'mail-server-nav' %}" hx-trigger="load"></div>
+
+        <div class="oh-checkpoint-badge mb-2" id="selectedInstances" data-ids="[]" data-clicked="" style="display: none"></div>
+        <div class="oh-wrapper" id="listContainer">
+            <div class="animated-background"></div>
+        </div>
+
+		{% comment %} {% if mail_servers %}
 			{% include 'base/mail_server/mail_server_view.html' %}
 		{% else %}
 			<div style="display: flex; flex-direction: column; justify-content: center; align-items: center; height: 100%;">
@@ -36,7 +44,7 @@
 					src="{% static 'images/ui/email.png' %}" class="" alt="Page not found. 404." />
 				<h5 class="oh-404__subtitle">{% trans "There is no mail server at this moment." %}</h5>
 			</div>
-		{% endif %}
+		{% endif %} {% endcomment %}
 	{% endif %}
 </div>