diff --git a/app/port/templates/port/port_detail.html b/app/port/templates/port/port_detail.html index 1bbd871..ca6bf60 100644 --- a/app/port/templates/port/port_detail.html +++ b/app/port/templates/port/port_detail.html @@ -121,13 +121,14 @@ {% endif %} {{ builder.display_name }} + ({{ builder.name }}) {% if latest_build.files.all|length > 0 %} {% endif %} {% if latest_build.files.all|length > 0 %} -
-
Installations
+
Installations (30 days)

{{count.all}}

-
Requested Installations
+
Requested Installations (30 days)

{{ count.requested }}

{% if port.livecheck.result %}
Livecheck results
-

{{ port.livecheck.result }}

-

livecheck ran at: {{ port.livecheck.updated_at|date:"y-m-d h:i" }}

+

{{ port.livecheck.result }}

+

livecheck ran at: {{ port.livecheck.updated_at|date:"y-m-d h:i" }}

{% elif port.livecheck.error %}
Livecheck error
-

{{ port.livecheck.error }}

-

livecheck ran at: {{ port.livecheck.updated_at|date:"y-m-d h:i" }}

+

{{ port.livecheck.error }}

+

livecheck ran at: {{ port.livecheck.updated_at|date:"y-m-d h:i" }}

{% endif %} diff --git a/app/port/templates/port/port_detail_stats.html b/app/port/templates/port/port_detail_stats.html index b249401..5b4c8dc 100644 --- a/app/port/templates/port/port_detail_stats.html +++ b/app/port/templates/port/port_detail_stats.html @@ -27,8 +27,8 @@ {% endfor %} - until - {% for i in allowed_days|slice:"1:" %} @@ -41,7 +41,7 @@
{% if count.all > 0 %} -

Statistics:

+

Statistics:

@@ -89,7 +89,7 @@
Total Installations


-

Port installations by month

+

Port installations by month


diff --git a/app/port/views.py b/app/port/views.py index e2b6082..bfad295 100644 --- a/app/port/views.py +++ b/app/port/views.py @@ -35,7 +35,7 @@ def port_detail(request, name): return render(request, 'port/exceptions/port_not_found.html', {'name': name}) this_builds = BuildHistory.objects.filter(port_name__iexact=name).order_by('-time_start').prefetch_related('files') - builders = Builder.objects.all().prefetch_related(Prefetch('builds', queryset=this_builds, to_attr='latest_builds')).annotate(version_array=StringToArray('display_name'),).order_by('-version_array') + builders = Builder.objects.all().prefetch_related(Prefetch('builds', queryset=this_builds, to_attr='latest_builds')).annotate(version_array=StringToArray('name'),).order_by('-version_array') dependents = Dependency.objects.filter(dependencies__id=port.id).select_related('port_name').order_by(Lower('port_name__name')) last_30_days = datetime.datetime.now(tz=datetime.timezone.utc)-datetime.timedelta(days=30) diff --git a/app/static/css/main.css b/app/static/css/main.css index 0fa8f37..b5678f3 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -147,4 +147,16 @@ body{ .bg-el { background-color: #FAFAFA !important; font-size: 14px !important; -} \ No newline at end of file +} + +.f14 { + font-size: 14px !important; +} + +.f12 { + font-size: 12px !important; +} + +.f10 { + font-size: 10px !important; +}