bendns' repos / cgit
the repository which powers this website
Fix behaviour of tree view when viewing root of commit
Browse Source
RunasSudo 9 months ago
parent 8f023f4 · commit bc551c0
Diffstat
-rw-r--r--themed/base.html2
-rw-r--r--themed/summary.html22
-rw-r--r--themed/tree.html2
3 files changed, 16 insertions, 10 deletions
diff --git a/themed/base.html b/themed/base.html
index 4b8a79dc..ecf79967 100644
--- a/themed/base.html
+++ b/themed/base.html
@@ -31,7 +31,7 @@
{# Heroicons micro list-bullet #}
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="size-4 self-center text-gray-500"><path d="M3 4.75a1 1 0 1 0 0-2 1 1 0 0 0 0 2ZM6.25 3a.75.75 0 0 0 0 1.5h7a.75.75 0 0 0 0-1.5h-7ZM6.25 7.25a.75.75 0 0 0 0 1.5h7a.75.75 0 0 0 0-1.5h-7ZM6.25 11.5a.75.75 0 0 0 0 1.5h7a.75.75 0 0 0 0-1.5h-7ZM4 12.25a1 1 0 1 1-2 0 1 1 0 0 1 2 0ZM3 9a1 1 0 1 0 0-2 1 1 0 0 0 0 2Z" /></svg>
<span class="font-semibold self-baseline">
- {% if strcmp(ctx.qry.page, "tree") == 0 && ctx.qry.oid %}
+ {% if (strcmp(ctx.qry.page, "tree") == 0 || strcmp(ctx.qry.page, "summary") == 0) && ctx.qry.oid %}
{! short_commit_id(ctx.qry.oid); !}
{% else %}
{{ ctx.qry.head }}
diff --git a/themed/summary.html b/themed/summary.html
index 14b07274..4a3ca3f2 100644
--- a/themed/summary.html
+++ b/themed/summary.html
@@ -31,7 +31,7 @@
}
!}
-{% page cgit_print_summary %}
+{% block cgit_print_summary_impl %}
{! page_start(); !}
{! repo_header(); !}
<main class="max-w-[1280px] mx-auto py-4">{# Main content #}
@@ -40,9 +40,11 @@
<div class="grid grid-cols-[auto_1fr_auto_auto] border border-gray-300 rounded-md mb-4">
{# Latest commit panel (specify rounded-t-md so background does not cover border) #}
{!
- // Get latest commit
+ char *hex = ctx.qry.oid;
+ if (!hex) { hex = ctx.qry.head; }
+
struct object_id oid;
- if (repo_get_oid(the_repository, ctx.qry.head, &oid)) {
+ if (repo_get_oid(the_repository, hex, &oid)) {
die("Bad object id");
}
struct commit *commit = lookup_commit_reference(the_repository, &oid);
@@ -56,13 +58,13 @@
<span class="font-semibold">{{ info->author }}</span>
<a href="{! cgit_shared_reporevlink_url("commit", ctx.qry.head, oid_to_hex(&commit->object.oid), ctx.qry.vpath); !}" class="ml-2 text-gray-500 hover:text-blue-600 hover:underline">{{ info->subject }}</a>
<div class="flex-1"></div>
- <span class="text-gray-500">
+ <span class="text-gray-500">
<a href="{! cgit_shared_reporevlink_url("commit", ctx.qry.head, oid_to_hex(&commit->object.oid), ctx.qry.vpath); !}" class="font-mono hover:text-blue-600 hover:underline">
{! short_commit_id(oid_to_hex(&commit->object.oid)); !}
-</a>
-&middot;
-{! cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2); !} ago
-</span>
+ </a>
+ &middot;
+ {! cgit_print_age(info->committer_date, info->committer_tz, TM_WEEK * 2); !} ago
+ </span>
</div>
{# Files #}
{!
@@ -102,4 +104,8 @@
{% endif %}
</main>
{! page_end(); !}
+{% endblock %}
+
+{% page cgit_print_summary %}
+{! cgit_print_summary_impl(); !}
{% endpage %}
diff --git a/themed/tree.html b/themed/tree.html
index 5ad6a112..f1a6a834 100644
--- a/themed/tree.html
+++ b/themed/tree.html
@@ -151,7 +151,7 @@
{% page cgit_print_tree %}
{!
// Redirect to summary page if no subdirectory
- if (!ctx.qry.path) { return cgit_print_summary(); }
+ if (!ctx.qry.path) { return cgit_print_summary_impl(); }
!}
{! page_start(); !}
{! repo_header(); !}