From 0c3e46e51bc7c1b392bd651bf4b8c49cba6d06af Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Sat, 6 Aug 2022 13:49:01 +0500 Subject: [PATCH] Remove mentions of the sibling hyphae sidebar Good night sweet prince --- cfg/config.go | 16 ++++++---------- help/en/config_file.myco | 1 - help/en/sibling_hyphae_section.myco | 13 ------------- help/view_help.html | 1 - help/web.go | 1 - l18n/en/ui.json | 3 +-- l18n/ru/ui.json | 3 +-- static/default.css | 12 ++---------- 8 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 help/en/sibling_hyphae_section.myco diff --git a/cfg/config.go b/cfg/config.go index e12f775..e4eb3b0 100644 --- a/cfg/config.go +++ b/cfg/config.go @@ -17,9 +17,8 @@ import ( // See https://mycorrhiza.wiki/hypha/configuration/fields for the // documentation. var ( - WikiName string - NaviTitleIcon string - UseSiblingHyphaeSidebar bool + WikiName string + NaviTitleIcon string HomeHypha string UserHypha string @@ -53,9 +52,8 @@ var WikiDir string // Config represents a Mycorrhiza wiki configuration file. This type is used // only when reading configs. type Config struct { - WikiName string `comment:"This name appears in the header and on various pages."` - 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."` + WikiName string `comment:"This name appears in the header and on various pages."` + NaviTitleIcon string `comment:"This icon is used in the breadcrumbs bar."` Hyphae Network Authorization @@ -111,9 +109,8 @@ type Telegram struct { // configuration. Call it sometime during the initialization. func ReadConfigFile(path string) error { cfg := &Config{ - WikiName: "Mycorrhiza Wiki", - NaviTitleIcon: "🍄", - UseSiblingHyphaeSidebar: false, + WikiName: "Mycorrhiza Wiki", + NaviTitleIcon: "🍄", Hyphae: Hyphae{ HomeHypha: "home", UserHypha: "u", @@ -174,7 +171,6 @@ func ReadConfigFile(path string) error { // Map the struct to the global variables WikiName = cfg.WikiName NaviTitleIcon = cfg.NaviTitleIcon - UseSiblingHyphaeSidebar = cfg.UseSiblingHyphaeSidebar HomeHypha = cfg.HomeHypha UserHypha = cfg.UserHypha HeaderLinksHypha = cfg.HeaderLinksHypha diff --git a/help/en/config_file.myco b/help/en/config_file.myco index 32a44a2..d2fb100 100644 --- a/help/en/config_file.myco +++ b/help/en/config_file.myco @@ -42,7 +42,6 @@ AllowRegistration = true === Root section * `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). -* `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] * `HomeHypha`: //string//. The name your home hypha has. **Default:** `home`. diff --git a/help/en/sibling_hyphae_section.myco b/help/en/sibling_hyphae_section.myco deleted file mode 100644 index a93f613..0000000 --- a/help/en/sibling_hyphae_section.myco +++ /dev/null @@ -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. \ No newline at end of file diff --git a/help/view_help.html b/help/view_help.html index b20e286..4f379b2 100644 --- a/help/view_help.html +++ b/help/view_help.html @@ -26,7 +26,6 @@
  • {{block "special pages" .}}Special pages{{end}} diff --git a/help/web.go b/help/web.go index 462a808..43c5ec3 100644 --- a/help/web.go +++ b/help/web.go @@ -29,7 +29,6 @@ var ( {{define "interface"}}Интерфейс{{end}} {{define "prevnext"}}Пред/след{{end}} {{define "top_bar"}}Верхняя панель{{end}} -{{define "sibling_hyphae"}}Гифы-сиблинги{{end}} {{define "rename"}}Переименовывание{{end}} {{define "special pages"}}Специальные страницы{{end}} {{define "recent_changes"}}Свежие правки{{end}} diff --git a/l18n/en/ui.json b/l18n/en/ui.json index 0ac55e9..68e49b3 100644 --- a/l18n/en/ui.json +++ b/l18n/en/ui.json @@ -14,8 +14,7 @@ "backlinks_link": "{{.n}} backlink%s", "backlinks_link+one": "", "backlinks_link+other": "s", - - "sibling_hyphae": "Sibling hyphae", + "subhyphae": "Subhyphae", "random_no_hyphae": "There are no hyphae", diff --git a/l18n/ru/ui.json b/l18n/ru/ui.json index abba6e4..3d5d52b 100644 --- a/l18n/ru/ui.json +++ b/l18n/ru/ui.json @@ -19,8 +19,7 @@ "backlinks_link+one": "ссылка", "backlinks_link+few": "ссылки", "backlinks_link+many": "ссылок", - - "sibling_hyphae": "Гифы-сиблинги", + "subhyphae": "Подгифы", "random_no_hyphae": "В этой вики нет гиф", diff --git a/static/default.css b/static/default.css index 83dbc11..a9aef10 100644 --- a/static/default.css +++ b/static/default.css @@ -60,7 +60,6 @@ header { width: 100%; } main { grid-column: 1 / span 1; grid-row: 2 / span 2; } main.main-width { margin-left: .5rem; } .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; } .layout-card { width: 100%; margin-left: -.5rem; } .edit-toolbar__buttons {display: grid; } @@ -76,7 +75,7 @@ header { width: 100%; } .layout-card {max-width: 18rem;} .main-width { margin: 0 auto; } 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; } .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; } @@ -173,12 +172,6 @@ caption { caption-side: top; font-size: small; } .subhyphae__link { display: block; padding: .25rem; text-decoration: none; } .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 */ /* Lighter stuff #eee */ ::-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; } td { border: #ddd 1px solid; } -.categories-card__link:hover, -.sibling-hyphae__link:hover { background-color: #eee; } +.categories-card__link:hover { background-color: #eee; } /* Dark theme! */ @media (prefers-color-scheme: dark) {