spelling: into
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
parent
7feea370ed
commit
8834253502
|
@ -504,7 +504,7 @@ func login(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
// User has no email set, so check if they haven't added a password, either,
|
// User has no email set, so check if they haven't added a password, either,
|
||||||
// so we can return a more helpful error message.
|
// so we can return a more helpful error message.
|
||||||
if hasPass, _ := app.db.IsUserPassSet(u.ID); !hasPass {
|
if hasPass, _ := app.db.IsUserPassSet(u.ID); !hasPass {
|
||||||
log.Info("Tried logging in to %s, but no password or email.", signin.Alias)
|
log.Info("Tried logging into %s, but no password or email.", signin.Alias)
|
||||||
return impart.HTTPError{http.StatusPreconditionFailed, "This user never added a password or email address. Please contact us for help."}
|
return impart.HTTPError{http.StatusPreconditionFailed, "This user never added a password or email address. Please contact us for help."}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
2
pages.go
2
pages.go
|
@ -75,7 +75,7 @@ func defaultPrivacyPolicy(cfg *config.Config) string {
|
||||||
|
|
||||||
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.
|
||||||
|
|
||||||
We store log files, or data about what happens on our servers. We also use cookies to keep you logged in to your account.
|
We store log files, or data about what happens on our servers. We also use cookies to keep you logged into your account.
|
||||||
|
|
||||||
Beyond this, it's important that you trust whoever runs **` + cfg.App.SiteName + `**. Software can only do so much to protect you -- your level of privacy protections will ultimately fall on the humans that run this particular service.`
|
Beyond this, it's important that you trust whoever runs **` + cfg.App.SiteName + `**. Software can only do so much to protect you -- your level of privacy protections will ultimately fall on the humans that run this particular service.`
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
{{define "head"}}<title>Log in — {{.SiteName}}</title>
|
{{define "head"}}<title>Log in — {{.SiteName}}</title>
|
||||||
<meta name="description" content="Log in to {{.SiteName}}.">
|
<meta name="description" content="Log into {{.SiteName}}.">
|
||||||
<meta itemprop="description" content="Log in to {{.SiteName}}.">
|
<meta itemprop="description" content="Log into {{.SiteName}}.">
|
||||||
<style>
|
<style>
|
||||||
input{margin-bottom:0.5em;}
|
input{margin-bottom:0.5em;}
|
||||||
</style>
|
</style>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{define "content"}}
|
{{define "content"}}
|
||||||
<div class="tight content-container">
|
<div class="tight content-container">
|
||||||
<h1>Log in to {{.SiteName}}</h1>
|
<h1>Log into {{.SiteName}}</h1>
|
||||||
|
|
||||||
{{if .Flashes}}<ul class="errors">
|
{{if .Flashes}}<ul class="errors">
|
||||||
{{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
|
{{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
|
||||||
|
|
|
@ -45,7 +45,7 @@ input.copy-text {
|
||||||
{{if .NewPassword}}<div class="alert success">
|
{{if .NewPassword}}<div class="alert success">
|
||||||
<p>This user's password has been reset to:</p>
|
<p>This user's password has been reset to:</p>
|
||||||
<p><input type="text" class="copy-text" value="{{.NewPassword}}" onfocus="if (this.select) this.select(); else this.setSelectionRange(0, this.value.length);" readonly /></p>
|
<p><input type="text" class="copy-text" value="{{.NewPassword}}" onfocus="if (this.select) this.select(); else this.setSelectionRange(0, this.value.length);" readonly /></p>
|
||||||
<p>They can use this new password to log in to their account. <strong>This will only be shown once</strong>, so be sure to copy it and send it to them now.</p>
|
<p>They can use this new password to log into their account. <strong>This will only be shown once</strong>, so be sure to copy it and send it to them now.</p>
|
||||||
{{if .ClearEmail}}<p>Their email address is: <a href="mailto:{{.ClearEmail}}">{{.ClearEmail}}</a></p>{{end}}
|
{{if .ClearEmail}}<p>Their email address is: <a href="mailto:{{.ClearEmail}}">{{.ClearEmail}}</a></p>{{end}}
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
|
@ -55,7 +55,7 @@ h3 { font-weight: normal; }
|
||||||
<div class="option">
|
<div class="option">
|
||||||
<h3>Passphrase</h3>
|
<h3>Passphrase</h3>
|
||||||
<div class="section">
|
<div class="section">
|
||||||
{{if and (not .HasPass) (not .IsLogOut)}}<div class="alert info"><p>Add a passphrase to easily log in to your account.</p></div>{{end}}
|
{{if and (not .HasPass) (not .IsLogOut)}}<div class="alert info"><p>Add a passphrase to easily log into your account.</p></div>{{end}}
|
||||||
{{if .HasPass}}<p>Current passphrase</p>
|
{{if .HasPass}}<p>Current passphrase</p>
|
||||||
<input type="password" name="current-pass" placeholder="Current passphrase" tabindex="1" /> <input class="show" type="checkbox" id="show-cur-pass" /><label for="show-cur-pass"> Show</label>
|
<input type="password" name="current-pass" placeholder="Current passphrase" tabindex="1" /> <input class="show" type="checkbox" id="show-cur-pass" /><label for="show-cur-pass"> Show</label>
|
||||||
<p>New passphrase</p>
|
<p>New passphrase</p>
|
||||||
|
|
Loading…
Reference in New Issue