mirror
/
writefreely
mirror of https://github.com/writeas/writefreely
2
0
Fork 0
Code Issues Releases Wiki Activity

Make WriteFreely spacing consistent

Browse Source
pull/95/head
Matt Baer 6 years ago
parent 63a2225b7f
commit 238a913ce3
12 changed files with 15 additions and 15 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      README.md
  2. 2
      config.ini.example
  3. 2
      config/setup.go
  4. 2
      pages.go
  5. 4
      pages/landing.tmpl
  6. 2
      postrender.go
  7. 2
      templates.go
  8. 2
      templates/collection-post.tmpl
  9. 2
      templates/collection-tags.tmpl
  10. 4
      templates/collection.tmpl
  11. 4
      templates/include/footer.tmpl
  12. 2
      templates/password-collection.tmpl

2
README.md
Unescape View File

@ -1,6 +1,6 @@
   
<p align="center"> <p align="center">
<a href="https://writefreely.org"><img src="https://writefreely.org/img/writefreely.svg" width="350px" alt="Write Freely" /></a> <a href="https://writefreely.org"><img src="https://writefreely.org/img/writefreely.svg" width="350px" alt="WriteFreely" /></a>
</p> </p>
<hr /> <hr />
<p align="center"> <p align="center">

2
config.ini.example
Unescape View File

@ -11,7 +11,7 @@ host = db
port = 3306 port = 3306
[app] [app]
site_name = Write Freely Example Blog! site_name = WriteFreely Example Blog!
host = http://localhost:8080 host = http://localhost:8080
theme = write theme = write
disable_js = false disable_js = false

2
config/setup.go
Unescape View File

@ -47,7 +47,7 @@ func Configure(fname string) (*SetupData, error) {
intro := color.New(color.Bold, color.FgWhite).PrintlnFunc() intro := color.New(color.Bold, color.FgWhite).PrintlnFunc()
fmt.Println() fmt.Println()
intro(" ✍ Write Freely Configuration ✍") intro(" ✍ WriteFreely Configuration ✍")
fmt.Println() 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(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() fmt.Println()

2
pages.go
Unescape View File

@ -71,7 +71,7 @@ func defaultAboutPage(cfg *config.Config) string {
} }
func defaultPrivacyPolicy(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. 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.

4
pages/landing.tmpl
Unescape View File

@ -110,14 +110,14 @@ form dd {
<div class="content-container snug"> <div class="content-container snug">
<h2>Join the Fediverse</h2> <h2>Join the Fediverse</h2>
<p>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 &mdash; federated alternatives like <a href="https://pixelfed.org/" target="pixel">PixelFed</a>, <a href="https://joinmastodon.org/" target="masto">Mastodon</a>, and Write Freely enable you to do these types of things.</p> <p>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 &mdash; federated alternatives like <a href="https://pixelfed.org/" target="pixel">PixelFed</a>, <a href="https://joinmastodon.org/" target="masto">Mastodon</a>, and WriteFreely enable you to do these types of things.</p>
<div style="text-align:center"> <div style="text-align:center">
<iframe style="width: 560px; height: 315px; max-width: 100%;" sandbox="allow-same-origin allow-scripts" src="https://video.writeas.org/videos/embed/cc55e615-d204-417c-9575-7b57674cc6f3" frameborder="0" allowfullscreen></iframe> <iframe style="width: 560px; height: 315px; max-width: 100%;" sandbox="allow-same-origin allow-scripts" src="https://video.writeas.org/videos/embed/cc55e615-d204-417c-9575-7b57674cc6f3" frameborder="0" allowfullscreen></iframe>
</div> </div>
<h2>Write More Socially</h2> <h2>Write More Socially</h2>
<p>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.</p> <p>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.</p>
</div> </div>
{{ end }} {{ end }}

2
postrender.go
Unescape View File

@ -185,7 +185,7 @@ func postDescription(content, title, friendlyId string) string {
maxLen := 140 maxLen := 140
if content == "" { if content == "" {
content = "Write Freely is a painless, simple, federated blogging platform." content = "WriteFreely is a painless, simple, federated blogging platform."
} else { } else {
fmtStr := "%s" fmtStr := "%s"
truncation := 0 truncation := 0

2
templates.go
Unescape View File

@ -188,6 +188,6 @@ func localHTML(term, lang string) template.HTML {
if s == "" { if s == "" {
s = l10n.Strings("")[term] s = l10n.Strings("")[term]
} }
s = strings.Replace(s, "write.as", "<a href=\"https://writefreely.org\">write freely</a>", 1) s = strings.Replace(s, "write.as", "<a href=\"https://writefreely.org\">writefreely</a>", 1)
return template.HTML(s) return template.HTML(s)
} }

2
templates/collection-post.tmpl
Unescape View File

@ -9,7 +9,7 @@
<link rel="shortcut icon" href="/favicon.ico" /> <link rel="shortcut icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="canonical" href="{{.CanonicalURL}}" /> <link rel="canonical" href="{{.CanonicalURL}}" />
<meta name="generator" content="Write Freely"> <meta name="generator" content="WriteFreely">
<meta name="title" content="{{.PlainDisplayTitle}} {{localhtml "title dash" .Language.String}} {{if .Collection.Title}}{{.Collection.Title}}{{else}}{{.Collection.Alias}}{{end}}"> <meta name="title" content="{{.PlainDisplayTitle}} {{localhtml "title dash" .Language.String}} {{if .Collection.Title}}{{.Collection.Title}}{{else}}{{.Collection.Alias}}{{end}}">
<meta name="description" content="{{.Summary}}"> <meta name="description" content="{{.Summary}}">
{{if gt .Views 1}}<meta name="twitter:label1" value="Views"> {{if gt .Views 1}}<meta name="twitter:label1" value="Views">

2
templates/collection-tags.tmpl
Unescape View File

@ -62,7 +62,7 @@
<footer dir="ltr"> <footer dir="ltr">
<hr> <hr>
<nav> <nav>
<p style="font-size: 0.9em"><a class="home pubd" href="/">{{.SiteName}}</a> &middot; powered by <a style="margin-left:0" href="https://writefreely.org">write freely</a></p> <p style="font-size: 0.9em"><a class="home pubd" href="/">{{.SiteName}}</a> &middot; powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a></p>
</nav> </nav>
</footer> </footer>
{{ end }} {{ end }}

4
templates/collection.tmpl
Unescape View File

@ -13,7 +13,7 @@
{{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} &raquo; Feed" href="{{.CanonicalURL}}feed/" />{{end}} {{if not .IsPrivate}}<link rel="alternate" type="application/rss+xml" title="{{.DisplayTitle}} &raquo; Feed" href="{{.CanonicalURL}}feed/" />{{end}}
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="generator" content="Write Freely"> <meta name="generator" content="WriteFreely">
<meta name="description" content="{{.Description}}"> <meta name="description" content="{{.Description}}">
<meta itemprop="name" content="{{.DisplayTitle}}"> <meta itemprop="name" content="{{.DisplayTitle}}">
<meta itemprop="description" content="{{.Description}}"> <meta itemprop="description" content="{{.Description}}">
@ -100,7 +100,7 @@
<footer> <footer>
<hr /> <hr />
<nav dir="ltr"> <nav dir="ltr">
{{if not .SingleUser}}<a class="home pubd" href="/">{{.SiteName}}</a> &middot; {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">write freely</a> {{if not .SingleUser}}<a class="home pubd" href="/">{{.SiteName}}</a> &middot; {{end}}powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
</nav> </nav>
</footer> </footer>
{{ end }} {{ end }}

4
templates/include/footer.tmpl
Unescape View File

@ -5,7 +5,7 @@
<nav> <nav>
<a class="home" href="/">{{.SiteName}}</a> <a class="home" href="/">{{.SiteName}}</a>
<a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a> <a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a>
<a href="https://developers.write.as/" title="Build on Write Freely with our open developer API.">developers</a> <a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a>
<a href="https://github.com/writeas/writefreely">source code</a> <a href="https://github.com/writeas/writefreely">source code</a>
<a href="https://writefreely.org">writefreely {{.Version}}</a> <a href="https://writefreely.org">writefreely {{.Version}}</a>
</nav> </nav>
@ -24,7 +24,7 @@
<h3><a href="https://writefreely.org" style="color:#444;text-transform:lowercase;">WriteFreely</a></h3> <h3><a href="https://writefreely.org" style="color:#444;text-transform:lowercase;">WriteFreely</a></h3>
<ul> <ul>
<li><a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a></li> <li><a href="https://writefreely.org/guide/{{.OfficialVersion}}" target="guide">writer's guide</a></li>
<li><a href="https://developers.write.as/" title="Build on Write Freely with our open developer API.">developers</a></li> <li><a href="https://developers.write.as/" title="Build on WriteFreely with our open developer API.">developers</a></li>
<li><a href="https://github.com/writeas/writefreely">source code</a></li> <li><a href="https://github.com/writeas/writefreely">source code</a></li>
<li style="margin-top:0.8em">{{.Version}}</li> <li style="margin-top:0.8em">{{.Version}}</li>
</ul> </ul>

2
templates/password-collection.tmpl
Unescape View File

@ -49,7 +49,7 @@
<footer> <footer>
<hr /> <hr />
<nav dir="ltr"> <nav dir="ltr">
<a class="home pubd" href="/">{{.SiteName}}</a> &middot; powered by <a style="margin-left:0" href="https://writefreely.org">write freely</a> <a class="home pubd" href="/">{{.SiteName}}</a> &middot; powered by <a style="margin-left:0" href="https://writefreely.org">writefreely</a>
</nav> </nav>
</footer> </footer>
</body> </body>

Write Preview
Loading…
Cancel
Save