Merge branch 'fireinfo-wip' into new-design

[ipfire.org.git] / src / templates / fireinfo / profile.html

diff --git a/src/templates/fireinfo/profile.html b/src/templates/fireinfo/profile.html
index d85c9e5e1f7c0e07813987ea75dbdcede1b86229..6c0da12ecef72780d31942c68da36d9966312c84 100644 (file)
--- a/src/templates/fireinfo/profile.html
+++ b/src/templates/fireinfo/profile.html
@@ -15,36 +15,16 @@
        </section>
 
        <div class="container">
-               <div class="columns">
-                       <div class="column is-10">
-                               {% if profile.appliance_id %}
-                                       <div class="columns">
-                                               <div class="column is-7">
-                                                       <small>{{ _("This is a") }}</small>
-                                                       <h5 class="title is-5 is-lwl">{{ profile.appliance }}</h5>
-                                               </div>
-
-                                               <div class="column is-5">
-                                                       <a class="button is-lwl" href="https://www.lightningwirelabs.com">
-                                                               {{ _("Go to Lightning Wire Labs") }} <span class="fas fa-external-link-alt ml-2"></span>
-                                                       </a>
-                                               </div>
-                                       </div>
-                               {% end %}
-                       </div>
-               </div>
-
-
                                <div class="card mb-5">
                                        <div class="card-body">
                                                <div class="row">
                                                        <div class="col-12 col-sm-8 mb-4">
                                                                <h5 class="card-title mb-0">
-                                                                       {{ _("Running %s") % profile.release }}
+                                                                       {{ _("Running %s") % profile.system.release }}
                                                                </h5>
 
                                                                <small class="text-muted">
-                                                                       {{ _("Last update %s") % locale.format_date(profile.time_updated) }}
+                                                                       {{ _("Last update %s") % locale.format_date(profile.last_updated_at) }}
                                                                </small>
                                                        </div>
 
@@ -64,7 +44,7 @@
                                                </div>
 
                                                <dl class="row mb-0">
-                                                       {% if profile.virtual %}
+                                                       {% if profile.is_virtual() %}
                                                                <dt class="col-sm-3">{{ _("Hypervisor") }}</dt>
                                                                <dd class="col-sm-9">
                                                                        {% if profile.hypervisor == "VMWare" %}
@@ -75,19 +55,19 @@
                                                                                {{ profile.hypervisor }}
                                                                        {% end %}
                                                                </dd>
-                                                       {% elif not profile.appliance_id and profile.system %}
+                                                       {% elif profile.system %}
                                                                <dt class="col-sm-3">{{ _("System") }}</dt>
                                                                <dd class="col-sm-9">
-                                                                       {% if profile.system_vendor %}
-                                                                               {{ profile.system_vendor }}
+                                                                       {% if profile.system.vendor %}
+                                                                               {{ profile.system.vendor }}
                                                                        {% end %}
 
-                                                                       {% if profile.system_vendor and profile.system_model %}
+                                                                       {% if profile.system.vendor and profile.system.model %}
                                                                                &dash;
                                                                        {% end %}
 
-                                                                       {% if profile.system_model %}
-                                                                               {{ profile.system_model }}
+                                                                       {% if profile.system.model %}
+                                                                               {{ profile.system.model }}
                                                                        {% end %}
                                                                </dd>
                                                        {% end %}
@@ -128,10 +108,10 @@
                                                                </dd>
                                                        {% end %}
 
-                                                       {% if profile.storage %}
+                                                       {% if profile.system.storage %}
                                                                <dt class="col-md-3">{{ _("Storage") }}</dt>
                                                                <dd class="col-md-9">
-                                                                       {{ format_size(profile.storage) }}
+                                                                       {{ format_size(profile.system.storage) }}
                                                                </dd>
                                                        {% end %}
 
@@ -142,10 +122,10 @@
                                                                </dd>
                                                        {% end %}
 
-                                                       {% if profile.language %}
+                                                       {% if profile.system.language %}
                                                                <dt class="col-md-3">{{ _("Language") }}</dt>
                                                                <dd class="col-md-9">
-                                                                       {{ format_language_name(profile.language) }}
+                                                                       {{ format_language_name(profile.system.language) }}
                                                                </dd>
                                                        {% end %}
                                                </dl>