Merge branch 'fireinfo-wip' into new-design

diff --cc src/templates/fireinfo/admin.html
index d708595d7674f5b10c1d379f5349b9ee45caf465,b33989df1faf552b051673b37afb1f11c55b8c3b..dc095e7e367de7b3e77b235ffc1614693bfed3ab
--- 1/src/templates/fireinfo/admin.html
--- 2/src/templates/fireinfo/admin.html
+++ b/src/templates/fireinfo/admin.html
@@@ -8,8 -8,8 +8,8 @@@
                        <div class="columns">
                                <div class="column">
                                        <div class="has-text-centered">
 -                                              <h1 class="title is-1">{{ "{:,d}".format(total) }}</h1>
 +                                              <h1 class="title">{{ "{:,d}".format(total) }}</h1>
-                                               <h4 class="title is-4">{{ _("Total amount of profiles") }}</h4>
+                                               <h4 class="title is-4">{{ _("Total Profiles") }}</h4>
                                        </div>
                                </div>
  

diff --cc src/templates/fireinfo/driver.html
Simple merge

diff --cc src/templates/fireinfo/index.html
index bd1e203f4c2840ac5a920ea8bb410fa17fbf4df1,e283a46e2360ab5edaf2bb74d186868c60bb2bbf..9a67dffa6ba53978e23b7332ae73e3d81d2689be
--- 1/src/templates/fireinfo/index.html
--- 2/src/templates/fireinfo/index.html
+++ b/src/templates/fireinfo/index.html
@@@ -34,10 -34,12 +34,12 @@@
                <div class="container">
                        <div class="columns is-vcentered">
                                {% if latest_release %}
+                                       {% set usage = latest_release.get_usage(when=when) %}
+ 
                                        <div class="column is-half is-centered">
                                                <div>
 -                                                      <h1 class="title is-1 has-text-primary">
 +                                                      <h1 class="title has-text-primary">
-                                                               {{ "%.2f%%" % (latest_release.penetration * 100) }}
+                                                               {{ "%.2f%%" % (usage * 100) }}
                                                        </h1>
  
                                                        <h5 class="title is-5">

diff --cc src/templates/fireinfo/processors.html
Simple merge

diff --cc src/templates/fireinfo/profile.html
Simple merge

diff --cc src/templates/fireinfo/releases.html
Simple merge