mirror of
				https://github.com/osmarks/mycorrhiza.git
				synced 2025-10-30 15:13:02 +00:00 
			
		
		
		
	Replace /page/ with /hypha/ everywhere
This commit is contained in:
		| @@ -141,7 +141,7 @@ func (rev *Revision) asHistoryEntry(hyphaName string) (html string) { | |||||||
| 	author := "" | 	author := "" | ||||||
| 	if rev.Username != "anon" { | 	if rev.Username != "anon" { | ||||||
| 		author = fmt.Sprintf(` | 		author = fmt.Sprintf(` | ||||||
| 		<span class="history-entry__author">by <a href="/page/%[1]s/%[2]s" rel="author">%[2]s</span>`, cfg.UserHypha, rev.Username) | 		<span class="history-entry__author">by <a href="/hypha/%[1]s/%[2]s" rel="author">%[2]s</span>`, cfg.UserHypha, rev.Username) | ||||||
| 	} | 	} | ||||||
| 	return fmt.Sprintf(` | 	return fmt.Sprintf(` | ||||||
| <li class="history__entry"> | <li class="history__entry"> | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ | |||||||
| 		<br/> | 		<br/> | ||||||
| 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | ||||||
| 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | ||||||
| 		<a href="/page/{%s hyphaName %}" class="edit-form__cancel">Cancel</a> | 		<a href="/hypha/{%s hyphaName %}" class="edit-form__cancel">Cancel</a> | ||||||
| 	</form> | 	</form> | ||||||
| </main> | </main> | ||||||
| {%s= Toolbar(user.FromRequest(rq)) %} | {%s= Toolbar(user.FromRequest(rq)) %} | ||||||
| @@ -100,7 +100,7 @@ | |||||||
| 		<br/> | 		<br/> | ||||||
| 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | ||||||
| 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | ||||||
| 		<a href="/page/{%s hyphaName %}" class="edit-form__cancel">Cancel</a> | 		<a href="/hypha/{%s hyphaName %}" class="edit-form__cancel">Cancel</a> | ||||||
| 	</form> | 	</form> | ||||||
| 	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p> | 	<p class="warning">Note that the hypha is not saved yet. You can preview the changes ↓</p> | ||||||
| 	<article class="edit__preview">{%s= renderedPage %}</article> | 	<article class="edit__preview">{%s= renderedPage %}</article> | ||||||
|   | |||||||
| @@ -207,7 +207,7 @@ func StreamEditHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, text | |||||||
| 		<br/> | 		<br/> | ||||||
| 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | ||||||
| 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | ||||||
| 		<a href="/page/`) | 		<a href="/hypha/`) | ||||||
| //line views/mutators.qtpl:83 | //line views/mutators.qtpl:83 | ||||||
| 	qw422016.E().S(hyphaName) | 	qw422016.E().S(hyphaName) | ||||||
| //line views/mutators.qtpl:83 | //line views/mutators.qtpl:83 | ||||||
| @@ -290,7 +290,7 @@ func StreamPreviewHTML(qw422016 *qt422016.Writer, rq *http.Request, hyphaName, t | |||||||
| 		<br/> | 		<br/> | ||||||
| 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | 		<input type="submit" name="action" value="Save" class="edit-form__save"/> | ||||||
| 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | 		<input type="submit" name="action" value="Preview" class="edit-form__preview"> | ||||||
| 		<a href="/page/`) | 		<a href="/hypha/`) | ||||||
| //line views/mutators.qtpl:103 | //line views/mutators.qtpl:103 | ||||||
| 	qw422016.E().S(hyphaName) | 	qw422016.E().S(hyphaName) | ||||||
| //line views/mutators.qtpl:103 | //line views/mutators.qtpl:103 | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ type navEntry struct { | |||||||
| 	title string | 	title string | ||||||
| } | } | ||||||
| var navEntries = []navEntry{ | var navEntries = []navEntry{ | ||||||
| 	{"page", "Hypha"}, | 	{"hypha", "Hypha"}, | ||||||
| 	{"edit", "Edit"}, | 	{"edit", "Edit"}, | ||||||
| 	{"attachment", "Attachment"}, | 	{"attachment", "Attachment"}, | ||||||
| 	{"history", "History"}, | 	{"history", "History"}, | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ type navEntry struct { | |||||||
| } | } | ||||||
|  |  | ||||||
| var navEntries = []navEntry{ | var navEntries = []navEntry{ | ||||||
| 	{"page", "Hypha"}, | 	{"hypha", "Hypha"}, | ||||||
| 	{"edit", "Edit"}, | 	{"edit", "Edit"}, | ||||||
| 	{"attachment", "Attachment"}, | 	{"attachment", "Attachment"}, | ||||||
| 	{"history", "History"}, | 	{"history", "History"}, | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ If `contents` == "", a helpful message is shown instead. | |||||||
| 	relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) | 	relatives, subhyphae, prevHyphaName, nextHyphaName := tree.Tree(h.Name) | ||||||
| 	u := user.FromRequest(rq) | 	u := user.FromRequest(rq) | ||||||
| %} | %} | ||||||
| {%= NavHTML(rq, h.Name, "page") %} | {%= NavHTML(rq, h.Name, "hypha") %} | ||||||
| <div class="layout"> | <div class="layout"> | ||||||
| <main class="main-width"> | <main class="main-width"> | ||||||
| 	<article> | 	<article> | ||||||
|   | |||||||
| @@ -241,7 +241,7 @@ func StreamHyphaHTML(qw422016 *qt422016.Writer, rq *http.Request, h *hyphae.Hyph | |||||||
| 	qw422016.N().S(` | 	qw422016.N().S(` | ||||||
| `) | `) | ||||||
| //line views/readers.qtpl:83 | //line views/readers.qtpl:83 | ||||||
| 	StreamNavHTML(qw422016, rq, h.Name, "page") | 	StreamNavHTML(qw422016, rq, h.Name, "hypha") | ||||||
| //line views/readers.qtpl:83 | //line views/readers.qtpl:83 | ||||||
| 	qw422016.N().S(` | 	qw422016.N().S(` | ||||||
| <div class="layout"> | <div class="layout"> | ||||||
|   | |||||||
| @@ -68,19 +68,19 @@ for u := range user.YieldUsers() { | |||||||
| 	<section> | 	<section> | ||||||
| 		<h2>Admins</h2> | 		<h2>Admins</h2> | ||||||
| 		<ol>{% for _, name := range admins %} | 		<ol>{% for _, name := range admins %} | ||||||
| 			<li><a href="/page/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | 			<li><a href="/hypha/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | ||||||
| 		{% endfor %}</ol> | 		{% endfor %}</ol> | ||||||
| 	</section> | 	</section> | ||||||
| 	<section> | 	<section> | ||||||
| 		<h2>Moderators</h2> | 		<h2>Moderators</h2> | ||||||
| 		<ol>{% for _, name := range moderators %} | 		<ol>{% for _, name := range moderators %} | ||||||
| 			<li><a href="/page/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | 			<li><a href="/hypha/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | ||||||
| 		{% endfor %}</ol> | 		{% endfor %}</ol> | ||||||
| 	</section> | 	</section> | ||||||
| 	<section> | 	<section> | ||||||
| 		<h2>Editors</h2> | 		<h2>Editors</h2> | ||||||
| 		<ol>{% for _, name := range editors %} | 		<ol>{% for _, name := range editors %} | ||||||
| 			<li><a href="/page/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | 			<li><a href="/hypha/{%s cfg.UserHypha %}/{%s name %}">{%s name %}</a></li> | ||||||
| 		{% endfor %}</ol> | 		{% endfor %}</ol> | ||||||
| 	</section> | 	</section> | ||||||
| </main> | </main> | ||||||
| @@ -119,7 +119,7 @@ for u := range user.YieldUsers() { | |||||||
| 			<li><b>Administrators:</b> {%- for i, username := range user.ListUsersWithGroup("admin") -%} | 			<li><b>Administrators:</b> {%- for i, username := range user.ListUsersWithGroup("admin") -%} | ||||||
| 				{%- if i > 0 -%}<span aria-hidden="true">, </span> | 				{%- if i > 0 -%}<span aria-hidden="true">, </span> | ||||||
| 				{%- endif -%} | 				{%- endif -%} | ||||||
| 				<a href="/page/{%s cfg.UserHypha %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li> | 				<a href="/hypha/{%s cfg.UserHypha %}/{%s username %}">{%s username %}</a>{%- endfor -%}</li> | ||||||
| 		{%- else -%} | 		{%- else -%} | ||||||
| 			<li>This wiki does not use authorization</li> | 			<li>This wiki does not use authorization</li> | ||||||
| 		{%- endif -%} | 		{%- endif -%} | ||||||
|   | |||||||
| @@ -175,7 +175,7 @@ func StreamUserListHTML(qw422016 *qt422016.Writer) { | |||||||
| 	for _, name := range admins { | 	for _, name := range admins { | ||||||
| //line views/stuff.qtpl:70 | //line views/stuff.qtpl:70 | ||||||
| 		qw422016.N().S(` | 		qw422016.N().S(` | ||||||
| 			<li><a href="/page/`) | 			<li><a href="/hypha/`) | ||||||
| //line views/stuff.qtpl:71 | //line views/stuff.qtpl:71 | ||||||
| 		qw422016.E().S(cfg.UserHypha) | 		qw422016.E().S(cfg.UserHypha) | ||||||
| //line views/stuff.qtpl:71 | //line views/stuff.qtpl:71 | ||||||
| @@ -201,7 +201,7 @@ func StreamUserListHTML(qw422016 *qt422016.Writer) { | |||||||
| 	for _, name := range moderators { | 	for _, name := range moderators { | ||||||
| //line views/stuff.qtpl:76 | //line views/stuff.qtpl:76 | ||||||
| 		qw422016.N().S(` | 		qw422016.N().S(` | ||||||
| 			<li><a href="/page/`) | 			<li><a href="/hypha/`) | ||||||
| //line views/stuff.qtpl:77 | //line views/stuff.qtpl:77 | ||||||
| 		qw422016.E().S(cfg.UserHypha) | 		qw422016.E().S(cfg.UserHypha) | ||||||
| //line views/stuff.qtpl:77 | //line views/stuff.qtpl:77 | ||||||
| @@ -227,7 +227,7 @@ func StreamUserListHTML(qw422016 *qt422016.Writer) { | |||||||
| 	for _, name := range editors { | 	for _, name := range editors { | ||||||
| //line views/stuff.qtpl:82 | //line views/stuff.qtpl:82 | ||||||
| 		qw422016.N().S(` | 		qw422016.N().S(` | ||||||
| 			<li><a href="/page/`) | 			<li><a href="/hypha/`) | ||||||
| //line views/stuff.qtpl:83 | //line views/stuff.qtpl:83 | ||||||
| 		qw422016.E().S(cfg.UserHypha) | 		qw422016.E().S(cfg.UserHypha) | ||||||
| //line views/stuff.qtpl:83 | //line views/stuff.qtpl:83 | ||||||
| @@ -399,7 +399,7 @@ func StreamAboutHTML(qw422016 *qt422016.Writer) { | |||||||
| //line views/stuff.qtpl:121 | //line views/stuff.qtpl:121 | ||||||
| 			} | 			} | ||||||
| //line views/stuff.qtpl:121 | //line views/stuff.qtpl:121 | ||||||
| 			qw422016.N().S(`				<a href="/page/`) | 			qw422016.N().S(`				<a href="/hypha/`) | ||||||
| //line views/stuff.qtpl:122 | //line views/stuff.qtpl:122 | ||||||
| 			qw422016.E().S(cfg.UserHypha) | 			qw422016.E().S(cfg.UserHypha) | ||||||
| //line views/stuff.qtpl:122 | //line views/stuff.qtpl:122 | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ func httpErr(w http.ResponseWriter, status int, name, title, errMsg string) { | |||||||
| 		views.BaseHTML( | 		views.BaseHTML( | ||||||
| 			title, | 			title, | ||||||
| 			fmt.Sprintf( | 			fmt.Sprintf( | ||||||
| 				`<main class="main-width"><p>%s. <a href="/page/%s">Go back to the hypha.<a></p></main>`, | 				`<main class="main-width"><p>%s. <a href="/hypha/%s">Go back to the hypha.<a></p></main>`, | ||||||
| 				errMsg, | 				errMsg, | ||||||
| 				name, | 				name, | ||||||
| 			), | 			), | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 handlerug
					handlerug