1
0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2025-01-07 10:20:26 +00:00

Remove mentions of the sibling hyphae sidebar

Good night sweet prince
This commit is contained in:
Timur Ismagilov 2022-08-06 13:49:01 +05:00
parent ac4c4d665c
commit 0c3e46e51b
8 changed files with 10 additions and 40 deletions

View File

@ -17,9 +17,8 @@ import (
// See https://mycorrhiza.wiki/hypha/configuration/fields for the // See https://mycorrhiza.wiki/hypha/configuration/fields for the
// documentation. // documentation.
var ( var (
WikiName string WikiName string
NaviTitleIcon string NaviTitleIcon string
UseSiblingHyphaeSidebar bool
HomeHypha string HomeHypha string
UserHypha string UserHypha string
@ -53,9 +52,8 @@ var WikiDir string
// Config represents a Mycorrhiza wiki configuration file. This type is used // Config represents a Mycorrhiza wiki configuration file. This type is used
// only when reading configs. // only when reading configs.
type Config struct { type Config struct {
WikiName string `comment:"This name appears in the header and on various pages."` WikiName string `comment:"This name appears in the header and on various pages."`
NaviTitleIcon string `comment:"This icon is used in the breadcrumbs bar."` NaviTitleIcon string `comment:"This icon is used in the breadcrumbs bar."`
UseSiblingHyphaeSidebar bool `comment:"You are discouraged from using the sibling hyphae sidebar on new wikis. Enable it on old wikis that depend on it heavily."`
Hyphae Hyphae
Network Network
Authorization Authorization
@ -111,9 +109,8 @@ type Telegram struct {
// configuration. Call it sometime during the initialization. // configuration. Call it sometime during the initialization.
func ReadConfigFile(path string) error { func ReadConfigFile(path string) error {
cfg := &Config{ cfg := &Config{
WikiName: "Mycorrhiza Wiki", WikiName: "Mycorrhiza Wiki",
NaviTitleIcon: "🍄", NaviTitleIcon: "🍄",
UseSiblingHyphaeSidebar: false,
Hyphae: Hyphae{ Hyphae: Hyphae{
HomeHypha: "home", HomeHypha: "home",
UserHypha: "u", UserHypha: "u",
@ -174,7 +171,6 @@ func ReadConfigFile(path string) error {
// Map the struct to the global variables // Map the struct to the global variables
WikiName = cfg.WikiName WikiName = cfg.WikiName
NaviTitleIcon = cfg.NaviTitleIcon NaviTitleIcon = cfg.NaviTitleIcon
UseSiblingHyphaeSidebar = cfg.UseSiblingHyphaeSidebar
HomeHypha = cfg.HomeHypha HomeHypha = cfg.HomeHypha
UserHypha = cfg.UserHypha UserHypha = cfg.UserHypha
HeaderLinksHypha = cfg.HeaderLinksHypha HeaderLinksHypha = cfg.HeaderLinksHypha

View File

@ -42,7 +42,6 @@ AllowRegistration = true
=== Root section === Root section
* `WikiName`: //string//. The name your wiki has. It is shown in the header by default and in other places. **Default:** `Mycorrhiza Wiki`. * `WikiName`: //string//. The name your wiki has. It is shown in the header by default and in other places. **Default:** `Mycorrhiza Wiki`.
* `NaviTitleIcon`: //string//. The icon shown before the colon in the navigational titles above each hypha. You may want to use an emoji or HTML here. **Default:** `🍄` (mushroom emoji). * `NaviTitleIcon`: //string//. The icon shown before the colon in the navigational titles above each hypha. You may want to use an emoji or HTML here. **Default:** `🍄` (mushroom emoji).
* `UseSiblingHyphaeSidebar`: //boolean//. Whether to show the [[/help/en/sibling_hyphae_section | sibling hyphae sidebar]]. You are discouraged from using the sibling hyphae sidebar on new wikis. Enable it on old wikis that depend on it heavily. **Default:** `false`.
=== [Hyphae] === [Hyphae]
* `HomeHypha`: //string//. The name your home hypha has. **Default:** `home`. * `HomeHypha`: //string//. The name your home hypha has. **Default:** `home`.

View File

@ -1,13 +0,0 @@
= Sibling hyphae section
On the right (or below on smaller devices) of hypha pages there is a special section that lists **sibling hyphae**.
> **Sibling hyphae** are hyphae that are subhyphae of the same hypha. For example, //Fruit/Apple// and //Fruit/Pear// are sibling hyphae to each other.
The sibling hyphae are listed alphabetically. The name of the hypha you are currently viewing is also part of the list. The rest are links that lead you to the hyphae.
Sometimes, there are numbers beside the links:
* **No number.** The hypha has no subhyphae.
* **One number.** The number indicates how many direct subhyphae it has.
* **Two numbers.** The first number is the number of direct subhyphae. The second number in parentheses is the number of indirect subhyphae.
For hypha //Fruit//, hyphae //Fruit/Apple// and //Fruit/Pear// would be direct subhyphae, and hyphae //Fruit/Apple/Red// and //Fruit/Apple/Green// would be indirect subhyphae.

View File

@ -26,7 +26,6 @@
<ul> <ul>
<li><a href="/help/en/prevnext">{{block "prevnext" .}}Previous/next{{end}}</a></li> <li><a href="/help/en/prevnext">{{block "prevnext" .}}Previous/next{{end}}</a></li>
<li><a href="/help/en/top_bar">{{block "top_bar" .}}Top bar{{end}}</a></li> <li><a href="/help/en/top_bar">{{block "top_bar" .}}Top bar{{end}}</a></li>
<li><a href="/help/en/sibling_hyphae_section">{{block "sibling_hyphae" .}}Sibling hyphae{{end}}</a></li>
</ul> </ul>
</li> </li>
<li>{{block "special pages" .}}Special pages{{end}} <li>{{block "special pages" .}}Special pages{{end}}

View File

@ -29,7 +29,6 @@ var (
{{define "interface"}}Интерфейс{{end}} {{define "interface"}}Интерфейс{{end}}
{{define "prevnext"}}Пред/след{{end}} {{define "prevnext"}}Пред/след{{end}}
{{define "top_bar"}}Верхняя панель{{end}} {{define "top_bar"}}Верхняя панель{{end}}
{{define "sibling_hyphae"}}Гифы-сиблинги{{end}}
{{define "rename"}}Переименовывание{{end}} {{define "rename"}}Переименовывание{{end}}
{{define "special pages"}}Специальные страницы{{end}} {{define "special pages"}}Специальные страницы{{end}}
{{define "recent_changes"}}Свежие правки{{end}} {{define "recent_changes"}}Свежие правки{{end}}

View File

@ -14,8 +14,7 @@
"backlinks_link": "{{.n}} backlink%s", "backlinks_link": "{{.n}} backlink%s",
"backlinks_link+one": "", "backlinks_link+one": "",
"backlinks_link+other": "s", "backlinks_link+other": "s",
"sibling_hyphae": "Sibling hyphae",
"subhyphae": "Subhyphae", "subhyphae": "Subhyphae",
"random_no_hyphae": "There are no hyphae", "random_no_hyphae": "There are no hyphae",

View File

@ -19,8 +19,7 @@
"backlinks_link+one": "ссылка", "backlinks_link+one": "ссылка",
"backlinks_link+few": "ссылки", "backlinks_link+few": "ссылки",
"backlinks_link+many": "ссылок", "backlinks_link+many": "ссылок",
"sibling_hyphae": "Гифы-сиблинги",
"subhyphae": "Подгифы", "subhyphae": "Подгифы",
"random_no_hyphae": "В этой вики нет гиф", "random_no_hyphae": "В этой вики нет гиф",

View File

@ -60,7 +60,6 @@ header { width: 100%; }
main { grid-column: 1 / span 1; grid-row: 2 / span 2; } main { grid-column: 1 / span 1; grid-row: 2 / span 2; }
main.main-width { margin-left: .5rem; } main.main-width { margin-left: .5rem; }
.markup-toolbar, .help-topics, .categories-card { grid-column: 2 / span 1; grid-row: 2 / span 1; } .markup-toolbar, .help-topics, .categories-card { grid-column: 2 / span 1; grid-row: 2 / span 1; }
.sibling-hyphae { grid-column: 2 / span 1; grid-row: 3 / span 1; }
.action-toolbar { grid-column: 2 / span 1; grid-row: 3 / span 1; } .action-toolbar { grid-column: 2 / span 1; grid-row: 3 / span 1; }
.layout-card { width: 100%; margin-left: -.5rem; } .layout-card { width: 100%; margin-left: -.5rem; }
.edit-toolbar__buttons {display: grid; } .edit-toolbar__buttons {display: grid; }
@ -76,7 +75,7 @@ header { width: 100%; }
.layout-card {max-width: 18rem;} .layout-card {max-width: 18rem;}
.main-width { margin: 0 auto; } .main-width { margin: 0 auto; }
main.main-width { grid-column: 2 / span 1; grid-row: 2 / span 3; margin: 0; } main.main-width { grid-column: 2 / span 1; grid-row: 2 / span 3; margin: 0; }
.sibling-hyphae, .markup-toolbar, .help-topics { grid-column: 3 / span 1; margin-left: -.5rem; grid-row: 2 / span 2; } .markup-toolbar, .help-topics { grid-column: 3 / span 1; margin-left: -.5rem; grid-row: 2 / span 2; }
.markup-toolbar { grid-column: 3 / span 1; grid-row: 2 / span 2; margin-left: -.5rem; } .markup-toolbar { grid-column: 3 / span 1; grid-row: 2 / span 2; margin-left: -.5rem; }
.action-toolbar, .categories-card { grid-column: 1 / span 1; grid-row: 2 / span 1; margin: 0 -.5rem 0 .5rem; justify-self: end; } .action-toolbar, .categories-card { grid-column: 1 / span 1; grid-row: 2 / span 1; margin: 0 -.5rem 0 .5rem; justify-self: end; }
.edit-toolbar__buttons { grid-template-columns: 1fr; } .edit-toolbar__buttons { grid-template-columns: 1fr; }
@ -173,12 +172,6 @@ caption { caption-side: top; font-size: small; }
.subhyphae__link { display: block; padding: .25rem; text-decoration: none; } .subhyphae__link { display: block; padding: .25rem; text-decoration: none; }
.subhyphae__link:hover { background: #eee; } .subhyphae__link:hover { background: #eee; }
.sibling-hyphae__list { padding: 0; margin: 0; }
.sibling-hyphae__entry { clear: both; }
.sibling-hyphae__count { display: inline-block; float: right; }
.sibling-hyphae__entry_this { padding: .25rem .5rem; font-weight: bold; }
.sibling-hyphae__link { text-decoration: none; display: block; padding: .25rem .5rem; }
/* Color stuff */ /* Color stuff */
/* Lighter stuff #eee */ /* Lighter stuff #eee */
::-webkit-file-upload-button, .btn { background-color: #eee; color: black; } ::-webkit-file-upload-button, .btn { background-color: #eee; color: black; }
@ -218,8 +211,7 @@ blockquote { border-left: 2px #999 solid; }
.prevnext { border-top: #eee 1px solid; clear: both; } .prevnext { border-top: #eee 1px solid; clear: both; }
td { border: #ddd 1px solid; } td { border: #ddd 1px solid; }
.categories-card__link:hover, .categories-card__link:hover { background-color: #eee; }
.sibling-hyphae__link:hover { background-color: #eee; }
/* Dark theme! */ /* Dark theme! */
@media (prefers-color-scheme: dark) { @media (prefers-color-scheme: dark) {