cmd/tailscale: don't show toggle when not authenticated

Also, change the login screen tile to say "Tailscale", not the
redundant "Needs authentication".

Updates tailscale/tailscale#608

Signed-off-by: Elias Naur <mail@eliasnaur.com>
pull/3/head
Elias Naur 4 years ago
parent c1863a42ae
commit 679f97afb3

@ -687,6 +687,9 @@ func (ui *UI) layoutTop(gtx layout.Context, sysIns system.Insets, state *Backend
return layout.Flex{Alignment: layout.Middle}.Layout(gtx, return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx C) D { layout.Rigid(func(gtx C) D {
return in.Layout(gtx, func(gtx C) D { return in.Layout(gtx, func(gtx C) D {
if state.State <= ipn.NeedsLogin {
return D{}
}
sw := material.Switch(ui.theme, &ui.enabled) sw := material.Switch(ui.theme, &ui.enabled)
sw.Color.Enabled = rgb(white) sw.Color.Enabled = rgb(white)
if state.State < ipn.Stopped { if state.State < ipn.Stopped {
@ -731,7 +734,7 @@ func statusString(state ipn.State) string {
case ipn.NeedsMachineAuth: case ipn.NeedsMachineAuth:
return "Awaiting Approval" return "Awaiting Approval"
case ipn.NeedsLogin: case ipn.NeedsLogin:
return "Needs Authentication" return "Tailscale"
default: default:
return "Loading..." return "Loading..."
} }

Loading…
Cancel
Save