From 238a913ce3f819d2405cccfdd5edd31693ee4b6b Mon Sep 17 00:00:00 2001 From: Matt Baer Date: Thu, 11 Apr 2019 21:33:33 -0400 Subject: [PATCH] Make WriteFreely spacing consistent --- README.md | 2 +- config.ini.example | 2 +- config/setup.go | 2 +- pages.go | 2 +- pages/landing.tmpl | 4 ++-- postrender.go | 2 +- templates.go | 2 +- templates/collection-post.tmpl | 2 +- templates/collection-tags.tmpl | 2 +- templates/collection.tmpl | 4 ++-- templates/include/footer.tmpl | 4 ++-- templates/password-collection.tmpl | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index ab814c4..8ba94ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@  

- Write Freely + WriteFreely

diff --git a/config.ini.example b/config.ini.example index 10661bc..dcbd6ee 100644 --- a/config.ini.example +++ b/config.ini.example @@ -11,7 +11,7 @@ host = db port = 3306 [app] -site_name = Write Freely Example Blog! +site_name = WriteFreely Example Blog! host = http://localhost:8080 theme = write disable_js = false diff --git a/config/setup.go b/config/setup.go index 9161d40..4950bc3 100644 --- a/config/setup.go +++ b/config/setup.go @@ -47,7 +47,7 @@ func Configure(fname string) (*SetupData, error) { intro := color.New(color.Bold, color.FgWhite).PrintlnFunc() fmt.Println() - intro(" ✍ Write Freely Configuration ✍") + intro(" ✍ WriteFreely Configuration ✍") fmt.Println() fmt.Println(wordwrap.WrapString(" This quick configuration process will "+action+" the application's config file, "+fname+".\n\n It validates your input along the way, so you can be sure any future errors aren't caused by a bad configuration. If you'd rather configure your server manually, instead run: writefreely --create-config and edit that file.", 75)) fmt.Println() diff --git a/pages.go b/pages.go index de8f9b8..ddbd132 100644 --- a/pages.go +++ b/pages.go @@ -71,7 +71,7 @@ func defaultAboutPage(cfg *config.Config) string { } func defaultPrivacyPolicy(cfg *config.Config) string { - return `[Write Freely](https://writefreely.org), the software that powers this site, is built to enforce your right to privacy by default. + return `[WriteFreely](https://writefreely.org), the software that powers this site, is built to enforce your right to privacy by default. It retains as little data about you as possible, not even requiring an email address to sign up. However, if you _do_ give us your email address, it is stored encrypted in our database. We salt and hash your account's password. diff --git a/pages/landing.tmpl b/pages/landing.tmpl index 4be9192..5710933 100644 --- a/pages/landing.tmpl +++ b/pages/landing.tmpl @@ -110,14 +110,14 @@ form dd {

Join the Fediverse

-

The fediverse is a large network of platforms that all speak a common language. Imagine if you could reply to Instagram posts from Twitter, or interact with your favorite Medium blogs from Facebook — federated alternatives like PixelFed, Mastodon, and Write Freely enable you to do these types of things.

+

The fediverse is a large network of platforms that all speak a common language. Imagine if you could reply to Instagram posts from Twitter, or interact with your favorite Medium blogs from Facebook — federated alternatives like PixelFed, Mastodon, and WriteFreely enable you to do these types of things.

Write More Socially

-

Write Freely can communicate with other federated platforms like Mastodon, so people can follow your blogs, bookmark their favorite posts, and boost them to their followers. Sign up above to create a blog and join the fediverse.

+

WriteFreely can communicate with other federated platforms like Mastodon, so people can follow your blogs, bookmark their favorite posts, and boost them to their followers. Sign up above to create a blog and join the fediverse.

{{ end }} diff --git a/postrender.go b/postrender.go index 0aa9a01..31a3163 100644 --- a/postrender.go +++ b/postrender.go @@ -185,7 +185,7 @@ func postDescription(content, title, friendlyId string) string { maxLen := 140 if content == "" { - content = "Write Freely is a painless, simple, federated blogging platform." + content = "WriteFreely is a painless, simple, federated blogging platform." } else { fmtStr := "%s" truncation := 0 diff --git a/templates.go b/templates.go index 802856f..0f93cb9 100644 --- a/templates.go +++ b/templates.go @@ -188,6 +188,6 @@ func localHTML(term, lang string) template.HTML { if s == "" { s = l10n.Strings("")[term] } - s = strings.Replace(s, "write.as", "write freely", 1) + s = strings.Replace(s, "write.as", "writefreely", 1) return template.HTML(s) } diff --git a/templates/collection-post.tmpl b/templates/collection-post.tmpl index fe4cee8..06bfa67 100644 --- a/templates/collection-post.tmpl +++ b/templates/collection-post.tmpl @@ -9,7 +9,7 @@ - + {{if gt .Views 1}} diff --git a/templates/collection-tags.tmpl b/templates/collection-tags.tmpl index 8ef4816..6849fee 100644 --- a/templates/collection-tags.tmpl +++ b/templates/collection-tags.tmpl @@ -62,7 +62,7 @@ {{ end }} diff --git a/templates/collection.tmpl b/templates/collection.tmpl index a77ba5a..18942a9 100644 --- a/templates/collection.tmpl +++ b/templates/collection.tmpl @@ -13,7 +13,7 @@ {{if not .IsPrivate}}{{end}} - + @@ -100,7 +100,7 @@ {{ end }} diff --git a/templates/include/footer.tmpl b/templates/include/footer.tmpl index e92878a..252699d 100644 --- a/templates/include/footer.tmpl +++ b/templates/include/footer.tmpl @@ -5,7 +5,7 @@ @@ -24,7 +24,7 @@

WriteFreely

diff --git a/templates/password-collection.tmpl b/templates/password-collection.tmpl index d6116af..e0b755d 100644 --- a/templates/password-collection.tmpl +++ b/templates/password-collection.tmpl @@ -49,7 +49,7 @@