Make a better recent changes page

bouncepaw · Nov 4, 2020 · 1fbbf81 · 1fbbf81
1 parent 7a0e9eb
commit 1fbbf81
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 71 deletions.
diff --git a/history/history.go b/history/history.go
@@ -68,7 +68,7 @@ func (rev Revision) HyphaeLinks() (html string) {
 				if len(set) > 1 {
 					html += `<span aria-hidden="true">, </span>`
 				}
-				html += fmt.Sprintf(`<a href="/rev/%[1]s/%[2]s">%[2]s</a>`, rev.Hash, hyphaName)
+				html += fmt.Sprintf(`<a href="/page/%[1]s">%[1]s</a>`, hyphaName)
 			}
 		}
 	}
@@ -77,10 +77,10 @@ func (rev Revision) HyphaeLinks() (html string) {
 
 func (rev Revision) RecentChangesEntry() (html string) {
 	return fmt.Sprintf(`
-<li><time>%s</time></li>
-<li>%s</li>
-<li>%s</li>
-<li>%s</li>
+<li class="rc-entry__time"><time>%s</time></li>
+<li class="rc-entry__hash">%s</li>
+<li class="rc-entry__links">%s</li>
+<li class="rc-entry__msg">%s</li>
 `, rev.TimeString(), rev.Hash, rev.HyphaeLinks(), rev.Message)
 }
 

diff --git a/main.go b/main.go
@@ -92,7 +92,7 @@ func handlerRecentChanges(w http.ResponseWriter, rq *http.Request) {
 		noPrefix = strings.TrimPrefix(rq.URL.String(), "/recent-changes/")
 		n, err   = strconv.Atoi(noPrefix)
 	)
-	if err == nil {
+	if err == nil && n < 101 {
 		util.HTTP200Page(w, base(strconv.Itoa(n)+" recent changes", history.RecentChanges(n)))
 	} else {
 		http.Redirect(w, rq, "/recent-changes/20", http.StatusSeeOther)

diff --git a/markup/lexer.go b/markup/lexer.go
@@ -67,7 +67,7 @@ func wikilink(src string, state *GemLexerState) (href, text, class string) {
 	case strings.ContainsRune(href, ':'):
 		class = "wikilink_external"
 	default:
-		if !HyphaExists(href) {
+		if !HyphaExists(canonicalName(href)) {
 			class += " wikilink_new"
 		}
 		href = path.Join("/page", href)

diff --git a/templates/css.qtpl b/templates/css.qtpl
@@ -40,4 +40,9 @@ nav ul {display:flex; padding-left:0; flex-wrap:wrap; margin-top:0;}
 nav ul li {list-style-type:none;margin-right:1rem;}
 
 #new-name {width:100%;}
+
+.rc-entry { display: grid; list-style-type: none; padding: .25rem; background-color: #eee; grid-template-columns: 1fr 1fr; }
+.rc-entry__time { font-style: italic; }
+.rc-entry__hash { font-style: italic; text-align: right; }
+.rc-entry__links { grid-column: 1 / span 2; }
 {% endfunc %}
diff --git a/templates/css.qtpl.go b/templates/css.qtpl.go
diff --git a/templates/recent_changes.qtpl b/templates/recent_changes.qtpl
@@ -1,6 +1,7 @@
 {% func RecentChangesHTML(changes []string, n int) %}
 <main class="recent-changes">
 	<h1>Recent Changes</h1>
+	<p><a href="/">← Back</a></p>
 
 	<nav class="recent-changes__count">
 		See 
@@ -29,7 +30,7 @@
 		<p>Could not find any recent changes.</p>
 	{% else %}
 		{% for i, entry := range changes %}
-		<ul class="recent-changes__entry" role="article"
+		<ul class="recent-changes__entry rc-entry" role="article"
 		    aria-setsize="{%d n %}" aria-posinset="{%d i %}">
 			 {%s= entry %}
 		</ul>

diff --git a/templates/recent_changes.qtpl.go b/templates/recent_changes.qtpl.go