summary refs log tree commit diff
path: root/www
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-12-18 23:37:45 -0500
committerJune McEnroe <june@causal.agency>2019-12-18 23:39:54 -0500
commit62b345dc27d1fa61c6dbe9e02b684f6efe347280 (patch)
treef33c8d645070e49bb34a6c26e0a2d5174d2ee769 /www
parentCustomize cgit CSS (diff)
downloadsrc-62b345dc27d1fa61c6dbe9e02b684f6efe347280.tar.gz
src-62b345dc27d1fa61c6dbe9e02b684f6efe347280.zip
Hide line numbers when rendering mdoc
Hack: output an extra <td> after rendering mdoc so that line numbers can
be hidden based on there being three. This required splitting
source-filter and about-filter since on about pages there is no table.
Diffstat (limited to 'www')
-rw-r--r--www/git.causal.agency/Makefile2
-rw-r--r--www/git.causal.agency/about-filter.sh13
-rw-r--r--www/git.causal.agency/cgitrc2
-rw-r--r--www/git.causal.agency/custom.css4
-rw-r--r--www/git.causal.agency/source-filter.sh6
5 files changed, 21 insertions, 6 deletions
diff --git a/www/git.causal.agency/Makefile b/www/git.causal.agency/Makefile
index bba51f40..8b87920f 100644
--- a/www/git.causal.agency/Makefile
+++ b/www/git.causal.agency/Makefile
@@ -3,7 +3,7 @@ WWW = /usr/local/www/cgit
 LIBEXEC = /usr/local/libexec
 
 BIN = ../../bin
-BINS = source-filter ttpre hi
+BINS = about-filter source-filter ttpre hi
 
 install: cgitrc custom.css ${BINS}
 	install -m 644 cgitrc ${ETC}
diff --git a/www/git.causal.agency/about-filter.sh b/www/git.causal.agency/about-filter.sh
new file mode 100644
index 00000000..216c86e9
--- /dev/null
+++ b/www/git.causal.agency/about-filter.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+case "$1" in
+	(*.[1-9])
+		/usr/bin/mandoc -T utf8 \
+			| /usr/local/libexec/ttpre \
+			| /usr/bin/sed -E \
+				's,([a-z0-9_-]+)[(]([1-9])[)],<a href="\1.\2">&</a>,g'
+		;;
+	(*)
+		exec /usr/local/libexec/hi -l text -f html
+		;;
+esac
diff --git a/www/git.causal.agency/cgitrc b/www/git.causal.agency/cgitrc
index 4a1aa904..0578ecbb 100644
--- a/www/git.causal.agency/cgitrc
+++ b/www/git.causal.agency/cgitrc
@@ -14,7 +14,7 @@ branch-sort=age
 
 css=/custom.css
 email-filter=/usr/local/libexec/cgit-email
-about-filter=/usr/local/libexec/source-filter
+about-filter=/usr/local/libexec/about-filter
 source-filter=/usr/local/libexec/source-filter
 
 readme=:README.7
diff --git a/www/git.causal.agency/custom.css b/www/git.causal.agency/custom.css
index 66cdc185..a5095054 100644
--- a/www/git.causal.agency/custom.css
+++ b/www/git.causal.agency/custom.css
@@ -35,6 +35,10 @@ div#cgit table.list tr.nohover-highlight:hover:nth-child(even) {
 	background: inherit;
 }
 
+div#cgit table.blob td.linenumbers:nth-last-child(3) {
+	display: none;
+}
+
 div#cgit table.blob td.linenumbers a:target {
 	color: goldenrod;
 	text-decoration: underline;
diff --git a/www/git.causal.agency/source-filter.sh b/www/git.causal.agency/source-filter.sh
index ce9e3f8b..868859b4 100644
--- a/www/git.causal.agency/source-filter.sh
+++ b/www/git.causal.agency/source-filter.sh
@@ -2,10 +2,8 @@
 
 case "$1" in
 	(*.[1-9])
-		/usr/bin/mandoc -T utf8 \
-			| /usr/local/libexec/ttpre \
-			| /usr/bin/sed -E \
-				's,([a-z0-9_-]+)[(]([1-9])[)],<a href="\1.\2">&</a>,g'
+		/usr/local/libexec/about-filter "$@"
+		printf '</code></pre></td><td><pre><code>'
 		;;
 	(*)
 		exec /usr/local/libexec/hi -t -n "$1" -f html -o anchor
field in the next patch. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12html: remove redundant htmlfd variableJohn Keeping This is never changed from STDOUT_FILENO, so just use that value directly. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12tests: add Valgrind supportJohn Keeping Now running tests with the "--valgrind" option will run cgit under Valgrind instead of all Git commands. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-12cache: don't leave cache_slot fields uninitializedJohn Keeping Valgrind says: ==18344== Conditional jump or move depends on uninitialised value(s) ==18344== at 0x406C83: open_slot (cache.c:63) ==18344== by 0x407478: cache_ls (cache.c:403) ==18344== by 0x404C9A: process_request (cgit.c:639) ==18344== by 0x406BD2: fill_slot (cache.c:190) ==18344== by 0x4071A0: cache_process (cache.c:284) ==18344== by 0x404461: main (cgit.c:952) ==18344== Uninitialised value was created by a stack allocation ==18344== at 0x40738B: cache_ls (cache.c:375) This is caused by the keylen field being used to calculate whether or not a slot is matched. We never then check the value of this and the length of data read depends on the key length read from the file so this isn't dangerous, but it's nice to avoid branching based on uninitialized data. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-01-10filter: split filter functions into their own fileJason A. Donenfeld A first step for more interesting things. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-10filter: make exit status localJason A. Donenfeld It's only used in one place, and not useful to have around since close_filter will die() if exit_status isn't what it expects, anyway. So this is best as just a local variable instead of as part of the struct. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2014-01-10parsing: fix header typoJason A. Donenfeld 2014-01-10cgit.c: Fix comment on bit mask hackLukas Fleischer * Formatting and spelling fixes. * A bit mask with the size of one byte only allows for storing 8 (not 255!) different flags. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10cgit.c: Use "else" for mutually exclusive branchesLukas Fleischer When parsing command line arguments, no pair of command line options can ever match simultaneously. Use "else if" blocks to reflect this. This change improves both readability and speed. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10ui-snapshot.c: Do not reinvent suffixcmp()Lukas Fleischer Use suffixcmp() from Git instead of reimplementing it. This is a preparation for moving to ends_with() in Git 1.8.6. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Refactor cgit_parse_snapshots_mask()Lukas Fleischer Use Git string lists instead of str{spn,cspn,ncmp}() magic. This significantly improves readability. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Disallow use of undocumented snapshot delimitersLukas Fleischer Since the introduction of selective snapshot format configuration in dc3c9b5 (allow selective enabling of snapshots, 2007-07-21), we allowed seven different delimiters for snapshot formats, while the documentation has always been clear about spaces being the only valid delimiter: The value is a space-separated list of zero or more of the values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Supporting the undocumented delimiters makes the code unnecessarily complex. Remove them. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-10Replace most uses of strncmp() with prefixcmp()Lukas Fleischer This is a preparation for replacing all prefix checks with either strip_prefix() or starts_with() when Git 1.8.6 is released. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-09README: Fix dependenciesLukas Fleischer * Remove the dependency on Git (which can be obtained automatically when building, using either the Git submodule or `make get-git`). * Use proper upstream names of dependencies. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08README: Spelling and formatting fixesLukas Fleischer * Several small spelling and capitalization fixes. * Use consistent and better-looking formatting that is compatible with AsciiDoc (and partly compatible with RST). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-01-08Fix UTF-8 with syntax-highlighting.pyPřemysl Janouch Previously the script tried to encode output from Pygments with the ASCII codec, which failed. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Add a suggestion to the manpagePřemysl Janouch So that people wishing to use "enable-http-clone" don't have to find out the correct settings on their own. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix the example configurationPřemysl Janouch "enable-git-clone" doesn't exist, replaced with "enable-http-clone". Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix about-formatting.shPřemysl Janouch dash failed to parse the script. Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08Fix some spelling errorsPřemysl Janouch Signed-off-by: Přemysl Janouch <p.janouch@gmail.com> 2014-01-08filters: highlight.sh: add css comments for highlight 2.6 and 3.8Ferry Huberts