bendns' repos / cgit
the repository which powers this website
Implement themed diff page
Browse Source
RunasSudo 9 months ago
parent 6fbf6cb · commit 7f5688d
Diffstat
-rw-r--r--cgit.mk1
-rw-r--r--cmd.c3
-rw-r--r--themed/commit.html2
-rw-r--r--themed/diff.html15
-rw-r--r--ui-diff.h1
5 files changed, 20 insertions, 2 deletions
diff --git a/cgit.mk b/cgit.mk
index 746ddae4..ff1c6ef7 100644
--- a/cgit.mk
+++ b/cgit.mk
@@ -101,6 +101,7 @@ CGIT_OBJ_NAMES += themed/mincrypt_sha256.o
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/base.html
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/index.html
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/commit.html
+CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/diff.html
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/log.html
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/refs.html
CGIT_THEMED_INPUTS += $(CGIT_PREFIX)themed/summary.html
diff --git a/cmd.c b/cmd.c
index 086c812a..362ec143 100644
--- a/cmd.c
+++ b/cmd.c
@@ -85,7 +85,8 @@ static void commit_fn(void)
static void diff_fn(void)
{
- cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
+ //cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 1, 0);
+ cgit_print_diff_page();
}
static void rawdiff_fn(void)
diff --git a/themed/commit.html b/themed/commit.html
index d7fafde9..a3da15e3 100644
--- a/themed/commit.html
+++ b/themed/commit.html
@@ -55,7 +55,7 @@
</span>
</div>
</div>
- <div class="diff-panel">
+ <div class="diff-panel overflow-x-auto">
{# Diff panel #}
{! cgit_print_diff(ctx.qry.oid, NULL, NULL, 0, 0); !}
</div>
diff --git a/themed/diff.html b/themed/diff.html
new file mode 100644
index 00000000..40c5f086
--- /dev/null
+++ b/themed/diff.html
@@ -0,0 +1,15 @@
+{! #include "../ui-diff.h" !}
+
+{% page cgit_print_diff_page %}
+{! page_start(); !}
+{! repo_header(); !}
+ <main class="max-w-[1280px] mx-auto py-4">{# Main content #}
+{! repo_description_panel(); !}
+{! repo_summary_bar(); !}
+ <div class="diff-panel overflow-x-auto">
+ {# Diff panel #}
+ {! cgit_print_diff(ctx.qry.oid, ctx.qry.oid2, ctx.qry.path, 0, 0); !}
+ </div>
+ </main>
+{! page_end(); !}
+{% endpage %}
diff --git a/ui-diff.h b/ui-diff.h
index 39264a16..7adcb2ed 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -5,6 +5,7 @@ extern void cgit_print_diff_ctrls(void);
extern void cgit_print_diff(const char *new_hex, const char *old_hex,
const char *prefix, int show_ctrls, int raw);
+extern void cgit_print_diff_page(void);
extern struct diff_filespec *cgit_get_current_old_file(void);
extern struct diff_filespec *cgit_get_current_new_file(void);