Page MenuHomeMusing Studio
Files F10494231

No OneTemporary
Actions

View Options

diff --git a/static/img/mark/gitlab.png b/static/img/mark/gitlab.png
new file mode 100644
index 0000000..214b0ad
Binary files /dev/null and b/static/img/mark/gitlab.png differ
diff --git a/static/img/mark/slack.png b/static/img/mark/slack.png
new file mode 100644
index 0000000..33b4abc
Binary files /dev/null and b/static/img/mark/slack.png differ
diff --git a/static/img/mark/writeas.png b/static/img/mark/writeas.png
new file mode 100644
index 0000000..777885b
Binary files /dev/null and b/static/img/mark/writeas.png differ
diff --git a/templates/user/settings.tmpl b/templates/user/settings.tmpl
index a403feb..8ade8ad 100644
--- a/templates/user/settings.tmpl
+++ b/templates/user/settings.tmpl
@@ -1,118 +1,146 @@
{{define "settings"}}
{{template "header" .}}
<style type="text/css">
.option { margin: 2em 0em; }
h3 { font-weight: normal; }
-.section > *:not(input) { font-size: 0.86em; }
+.section p, .section label {
+ font-size: 0.86em;
+}
+.oauth-provider img {
+ max-height: 2.75em;
+ vertical-align: middle;
+}
</style>
<div class="content-container snug">
{{if .Silenced}}
{{template "user-silenced"}}
{{end}}
<h1>{{if .IsLogOut}}Before you go...{{else}}Account Settings {{if .IsAdmin}}<a href="/admin">admin settings</a>{{end}}{{end}}</h1>
{{if .Flashes}}<ul class="errors">
{{range .Flashes}}<li class="urgent">{{.}}</li>{{end}}
</ul>{{end}}
{{ if .IsLogOut }}
<div class="alert info">
<p class="introduction">Please add an <strong>email address</strong> and/or <strong>passphrase</strong> so you can log in again later.</p>
</div>
{{ else }}
<div>
<p>Change your account settings here.</p>
</div>
<form method="post" action="/api/me/self" autocomplete="false">
<div class="option">
<h3>Username</h3>
<div class="section">
<input type="text" name="username" value="{{.Username}}" tabindex="1" />
<input type="submit" value="Update" style="margin-left: 1em;" />
</div>
</div>
</form>
{{ end }}
<form method="post" action="/api/me/self" autocomplete="false">
<input type="hidden" name="logout" value="{{.IsLogOut}}" />
<div class="option">
<h3>Passphrase</h3>
<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 .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>
<p>New passphrase</p>
{{end}}
{{if .IsLogOut}}<input type="text" value="{{.Username}}" style="display:none" />{{end}}
<input type="password" name="new-pass" autocomplete="new-password" placeholder="New passphrase" tabindex="{{if .IsLogOut}}1{{else}}2{{end}}" /> <input class="show" type="checkbox" id="show-new-pass" /><label for="show-new-pass"> Show</label>
</div>
</div>
<div class="option">
<h3>Email</h3>
<div class="section">
{{if and (not .Email) (not .IsLogOut)}}<div class="alert info"><p>Add your email to get:</p>
<ul>
<li>No-passphrase login</li>
<li>Account recovery if you forget your passphrase</li>
</ul></div>{{end}}
<input type="email" name="email" style="letter-spacing: 1px" placeholder="Email address" value="{{.Email}}" size="40" tabindex="{{if .IsLogOut}}2{{else}}3{{end}}" />
</div>
</div>
- <div class="option" style="text-align: center; margin-top: 4em;">
+ <div class="option" style="text-align: center;">
<input type="submit" value="Save changes" tabindex="4" />
</div>
</form>
{{ if .OauthSection }}
- <h1>OAuth Management</h1>
+ <hr />
+
{{ if .OauthAccounts }}
- <p>Existing OAuth accounts can be removed from your account.</p>
+ <div class="option">
+ <h2>Linked Accounts</h2>
+ <p>These are your linked external accounts.</p>
{{ range $oauth_account := .OauthAccounts }}
<form method="post" action="/api/me/oauth/remove" autocomplete="false">
<input type="hidden" name="provider" value="{{ $oauth_account.Provider }}" />
<input type="hidden" name="client_id" value="{{ $oauth_account.ClientID }}" />
<input type="hidden" name="remote_user_id" value="{{ $oauth_account.RemoteUserID }}" />
- <div class="option">
- <div class="section">
- <input type="submit" value="Remove {{ $oauth_account.Provider | title }}" style="margin-left: 1em;" />
- </div>
- </div>
+ <div class="section oauth-provider">
+ <img src="/img/mark/{{$oauth_account.Provider}}.png" alt="{{ $oauth_account.Provider | title }}" />
+ <input type="submit" value="Remove {{ $oauth_account.Provider | title }}" />
+ </div>
</form>
{{ end }}
- {{ end }}
- {{ if or .OauthSlack .OauthWriteAs }}
- <p>
+ </div>
+ {{ end }}
+ {{ if or .OauthSlack .OauthWriteAs .OauthGitLab }}
+ <div class="option">
+ <h2>Link External Accounts</h2>
+ <p>Connect additional accounts to enable logging in with those providers, instead of using your username and password.</p>
+ <div class="row">
+ {{ if .OauthWriteAs }}
+ <div class="section oauth-provider">
+ <img src="/img/mark/writeas.png" alt="Write.as" />
+ <a class="btn cta loginbtn" id="writeas-login" href="/oauth/write.as?attach=t">
+ Link <strong>Write.as</strong>
+ </a>
+ </div>
+ {{ end }}
{{ if .OauthSlack }}
- <a class="loginbtn" href="/oauth/slack?attach=t"><img alt="Sign in with Slack" height="40" width="172" src="/img/sign_in_with_slack.png" srcset="/img/sign_in_with_slack.png 1x, /img/sign_in_with_slack@2x.png 2x" /></a>
- {{ end }}
- {{ if .OauthWriteAs }}
- <a class="btn cta loginbtn" id="writeas-login" href="/oauth/write.as?attach=t">Link your <strong>Write.as</strong> account.</a>
+ <div class="section oauth-provider">
+ <img src="/img/mark/slack.png" alt="Slack" />
+ <a class="btn cta loginbtn" href="/oauth/slack?attach=t">
+ Link <strong>Slack</strong>
+ </a>
+ </div>
{{ end }}
{{ if .OauthGitLab }}
- <a class="btn cta loginbtn" id="gitlab-login" href="/oauth/gitlab?attach=t">Link your <strong>{{.GitLabDisplayName}}</strong> account</a>
+ <div class="section oauth-provider">
+ <img src="/img/mark/gitlab.png" alt="GitLab" />
+ <a class="btn cta loginbtn" id="gitlab-login" href="/oauth/gitlab?attach=t">
+ Link <strong>{{.GitLabDisplayName}}</strong>
+ </a>
+ </div>
{{ end }}
- </p>
- {{ end }}
+ </div>
+ </div>
+ {{ end }}
{{ end }}
</div>
<script>
var showChecks = document.querySelectorAll('input.show');
for (var i=0; i<showChecks.length; i++) {
showChecks[i].addEventListener('click', function() {
var prevEl = this.previousElementSibling;
if (prevEl.type == "password") {
prevEl.type = "text";
} else {
prevEl.type = "password";
}
});
}
</script>
{{template "footer" .}}
{{end}}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Mar 6, 9:58 AM (1 d, 13 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3168285

Event Timeline

musing studio · developers