diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fe3438..366a6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog This file keeps track of changes in a human-readable fashion +## v1.1.4 +* Fixed HTML `lang` tag +* Theme CSS link is now only present if non-default is set +* Improved template consistency (backend) + ## v1.1.3 This release mostly consists of backend improvements * List items no longer replace hyphens with spaces for consistency diff --git a/README.md b/README.md index 51e5fc9..46674fa 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ port=7101 # What port to run on (probably leave on 7101 if using docker) timezone=Local # IANA Time zone database identifier ("UTC", Local", "Europe/Moscow" etc.), Defaults to Local if can't parse. grace_period=0s # Time after a new day begins, but before the switch to next day's file. e.g. 3h26m - files will change at 3:26am language=en # ISO-639 language code (available - en, ru) -theme=default # Picked theme (available - default, high-contrast, lavender, gruvbox, sans) +theme="" # Picked theme (available - default (if left empty), high-contrast, lavender, gruvbox, sans) title=🌺 Hibiscus.txt # The text in the header log_to_file=false # Whether to write logs to a file log_file=config/log.txt # Where to store the log file if it is enabled diff --git a/config.go b/config.go index ab96f02..6316dee 100644 --- a/config.go +++ b/config.go @@ -41,7 +41,7 @@ var DefaultConfig = Config{ Timezone: time.Local, GraceTime: 0, Language: "en", - Theme: "default", + Theme: "", Title: "🌺 Hibiscus.txt", LogToFile: false, LogFile: "config/log.txt", diff --git a/i18n/en.json b/i18n/en.json index b058dae..6ce3567 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,4 +1,6 @@ { + "lang": "en-UK", + "title.today": "Your day so far", "title.days": "Previous days", "title.notes": "Notes", diff --git a/i18n/ru.json b/i18n/ru.json index b450647..ac34428 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -1,4 +1,6 @@ { + "lang": "ru", + "title.today": "БСгодняшний дСнь", "title.days": "ΠŸΡ€Π΅Π΄Ρ‹Π΄ΡƒΡ‰ΠΈΠ΅ Π΄Π½ΠΈ", "title.notes": "Π—Π°ΠΌΠ΅Ρ‚ΠΊΠΈ", @@ -11,7 +13,7 @@ "link.info": "систСмная информация", "time.date": "БСгодня", - "time.grace": "Π»ΡŒΠ³ΠΎΡ‚Π½Ρ‹ΠΉ ΠΏΠ΅Ρ€ΠΈΠΎΠ΄", + "time.grace": "рСдактируСтся Π²Ρ‡Π΅Ρ€Π°ΡˆΠ½ΠΈΠΉ дСнь", "button.save": "Π‘ΠΎΡ…Ρ€Π°Π½ΠΈΡ‚ΡŒ", "button.notes": "Новая Π·Π°ΠΌΠ΅Ρ‚ΠΊΠ°", "prompt.notes": "НазваниС Π·Π°ΠΌΠ΅Ρ‚ΠΊΠΈ", diff --git a/info.go b/info.go index 4691f46..53fc8f5 100644 --- a/info.go +++ b/info.go @@ -15,7 +15,7 @@ type AppInfo struct { // Info contains app information. var Info = AppInfo{ - Version: "1.1.3", + Version: "1.1.4", SourceLink: "https://git.a71.su/Andrew71/hibiscus", } diff --git a/pages/base.html b/pages/base.html index 280ff4d..d1f0f67 100644 --- a/pages/base.html +++ b/pages/base.html @@ -1,11 +1,11 @@ -{{define "header"}} +{{ define "header" }}

{{ config.Title }}

-

{{translatableText "time.date"}} a place

+

{{ translatableText "time.date" }} a place

-{{end}} +{{ end }} -{{define "base"}} +{{- define "base" -}} @@ -14,16 +14,16 @@ - + {{- if config.Theme -}}{{ end }} Hibiscus.txt - {{template "header" .}} + {{- template "header" . -}}
- {{template "main" .}} + {{- template "main" . -}}
- {{template "footer" .}} + {{- template "footer" . -}} -{{end}} +{{ end }} -{{define "footer"}} +{{ define "footer" }} -{{end}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/pages/edit.html b/pages/edit.html index dca9637..0598395 100644 --- a/pages/edit.html +++ b/pages/edit.html @@ -1,7 +1,7 @@ -{{define "main"}} +{{ define "main" }}

-{{end}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/pages/entry.html b/pages/entry.html index 11834e5..e61e9fd 100644 --- a/pages/entry.html +++ b/pages/entry.html @@ -1,4 +1,4 @@ -{{define "main"}} +{{ define "main" }}

-{{end}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/pages/info.html b/pages/info.html index 92ab91a..584e8e4 100644 --- a/pages/info.html +++ b/pages/info.html @@ -1,4 +1,4 @@ -{{define "main"}} +{{ define "main" }}

{{ translatableText "title.info" }}

-{{end}} \ No newline at end of file +{{ end }} \ No newline at end of file diff --git a/pages/list.html b/pages/list.html index f902047..5513cb2 100644 --- a/pages/list.html +++ b/pages/list.html @@ -1,9 +1,9 @@ -{{define "main"}} -

{{.Title}}

-

{{.Description}}

+{{ define "main" }} +

{{ .Title }}

+

{{ .Description }}

{{end}} \ No newline at end of file diff --git a/public/themes/default.css b/public/themes/default.css deleted file mode 100644 index d8ee906..0000000 --- a/public/themes/default.css +++ /dev/null @@ -1 +0,0 @@ -/* Default theme is defined in main.css */ \ No newline at end of file