Merge pull request #102 from pyelias/sort-stuff

Sort hypha and user lists

l18n/l18n.go

@@ -1,6 +1,6 @@
 // Code generated by go-localize; DO NOT EDIT.
 // This file was generated by robots at
-// 2021-10-01 12:35:00.027192 +0300 MSK m=+0.003424668
+// 2021-10-01 01:05:27.197649651 -0400 EDT m=+0.002749572
 
 package l18n
 

views/stuff.qtpl

@@ -1,4 +1,5 @@
 {% import "path/filepath" %}
+{% import "sort" %}
 {% import "github.com/bouncepaw/mycorrhiza/cfg" %}
 {% import "github.com/bouncepaw/mycorrhiza/hyphae" %}
 {% import "github.com/bouncepaw/mycorrhiza/user" %}
@@ -213,6 +214,9 @@ for u := range user.YieldUsers() {
 		editors = append(editors, u.Name)
 	}
 }
+sort.Strings(admins)
+sort.Strings(moderators)
+sort.Strings(editors)
 %}
 	<section>
 		<h2>{%s lc.Get("ui.users_admins") %}</h2>
@@ -242,11 +246,20 @@ for u := range user.YieldUsers() {
 	<h1>{%s lc.Get("ui.list_heading") %}</h1>
 	<p>{%s lc.GetPlural("ui.list_desc", hyphae.Count()) %}</p>
 	<ul class="hypha-list">
-		{% for h := range hyphae.YieldExistingHyphae() %}
+		{% code 
+		hyphaNames := make(chan string)
+		sortedHypha := hyphae.PathographicSort(hyphaNames)
+		for hypha := range hyphae.YieldExistingHyphae() {
+			hyphaNames <- hypha.Name
+		}
+		close(hyphaNames)
+		%}
+		{% for hyphaName := range sortedHypha %}
+		{% code hypha := hyphae.ByName(hyphaName) %}
 		<li class="hypha-list__entry">
-			<a class="hypha-list__link" href="/hypha/{%s h.Name %}">{%s util.BeautifulName(h.Name) %}</a>
+			<a class="hypha-list__link" href="/hypha/{%s hypha.Name %}">{%s util.BeautifulName(hypha.Name) %}</a>
-			{% if h.BinaryPath != "" %}
+			{% if hypha.BinaryPath != "" %}
-			<span class="hypha-list__amnt-type">{%s filepath.Ext(h.BinaryPath)[1:] %}</span>
+			<span class="hypha-list__amnt-type">{%s filepath.Ext(hypha.BinaryPath)[1:] %}</span>
 			{% endif %}
 		</li>
 		{% endfor %}