Fossil SCM

Put the "remember me" checkbox on a line by itself. Omit extra explanatory text. Move the non-SSL login warning to the top of the login dialog.

drh 2020-07-27 12:29 login-session-cookie

Commit 8efba52b975ddf343bc3e0f07e1a45627755679d921a60a4c42e2411814a8d5f

Parent 3989c385ef8a99a…

1 file changed +17 -18

~ src/login.c

M src/login.c

+17 -18

		--- src/login.c
		+++ src/login.c
		@@ -694,10 +694,21 @@
694	694	" AND cap!=''");
695	695	}else{
696	696	zAnonPw = 0;
697	697	}
698	698	@ <table class="login_out">
	699	+ if( P("HTTPS")==0 ){
	700	+ @ <tr><td class="form_label">Warning:</td>
	701	+ @ <td><span class='securityWarning'>
	702	+ @ Login information, including the password,
	703	+ @ will be sent in the clear over an unencrypted connection.
	704	+ if( !g.sslNotAvailable ){
	705	+ @ Consider logging in at
	706	+ @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
	707	+ }
	708	+ @ </span></td></tr>
	709	+ }
699	710	@ <tr>
700	711	@ <td class="form_label" id="userlabel1">User ID:</td>
701	712	@ <td><input type="text" id="u" aria-labelledby="userlabel1" name="u" \
702	713	@ size="30" value="%s(anonFlag?"anonymous":"")"></td>
703	714	@ </tr>
		@@ -708,31 +719,19 @@
708	719	if( zAnonPw && !noAnon ){
709	720	captcha_speakit_button(uSeed, "Speak password for \"anonymous\"");
710	721	}
711	722	@ </td>
712	723	@ </tr>
713		- if( P("HTTPS")==0 ){
714		- @ <tr><td class="form_label">Warning:</td>
715		- @ <td><span class='securityWarning'>
716		- @ Your password will be sent in the clear over an
717		- @ unencrypted connection.
718		- if( g.sslNotAvailable ){
719		- @ No encrypted connection is available on this server.
720		- }else{
721		- @ Consider logging in at
722		- @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
723		- }
724		- @ </span></td></tr>
725		- }
	724	+ @ <tr>
	725	+ @ <td></td>
	726	+ @ <td><input type="checkbox" name="remember" value="1" \
	727	+ @ id="remember-me" %s(rememberMe ? "checked=\"checked\"" : "")>
	728	+ @ <label for="remember-me">Remember me?</label></td>
	729	+ @ </tr>
726	730	@ <tr>
727	731	@ <td></td>
728	732	@ <td><input type="submit" name="in" value="Login">
729		- @ <input type="checkbox" name="remember" value="1" \
730		- @ id="remember-me" %s(rememberMe ? "checked=\"checked\"" : "")>
731		- @ <label for="remember-me">Remember me?</label>
732		- @ (If checked, login will use a persistent cookie, else it
733		- @ will use a session cookie.)</td>
734	733	@ </tr>
735	734	if( !noAnon && login_self_register_available(0) ){
736	735	@ <tr>
737	736	@ <td></td>
738	737	@ <td><input type="submit" name="self" value="Create A New Account">
739	738

	--- src/login.c
	+++ src/login.c
	@@ -694,10 +694,21 @@
694	" AND cap!=''");
695	}else{
696	zAnonPw = 0;
697	}
698	@ <table class="login_out">











699	@ <tr>
700	@ <td class="form_label" id="userlabel1">User ID:</td>
701	@ <td><input type="text" id="u" aria-labelledby="userlabel1" name="u" \
702	@ size="30" value="%s(anonFlag?"anonymous":"")"></td>
703	@ </tr>
	@@ -708,31 +719,19 @@
708	if( zAnonPw && !noAnon ){
709	captcha_speakit_button(uSeed, "Speak password for \"anonymous\"");
710	}
711	@ </td>
712	@ </tr>
713	if( P("HTTPS")==0 ){
714	@ <tr><td class="form_label">Warning:</td>
715	@ <td><span class='securityWarning'>
716	@ Your password will be sent in the clear over an
717	@ unencrypted connection.
718	if( g.sslNotAvailable ){
719	@ No encrypted connection is available on this server.
720	}else{
721	@ Consider logging in at
722	@ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
723	}
724	@ </span></td></tr>
725	}
726	@ <tr>
727	@ <td></td>
728	@ <td><input type="submit" name="in" value="Login">
729	@ <input type="checkbox" name="remember" value="1" \
730	@ id="remember-me" %s(rememberMe ? "checked=\"checked\"" : "")>
731	@ <label for="remember-me">Remember me?</label>
732	@ (If checked, login will use a persistent cookie, else it
733	@ will use a session cookie.)</td>
734	@ </tr>
735	if( !noAnon && login_self_register_available(0) ){
736	@ <tr>
737	@ <td></td>
738	@ <td><input type="submit" name="self" value="Create A New Account">
739

	--- src/login.c
	+++ src/login.c
	@@ -694,10 +694,21 @@
694	" AND cap!=''");
695	}else{
696	zAnonPw = 0;
697	}
698	@ <table class="login_out">
699	if( P("HTTPS")==0 ){
700	@ <tr><td class="form_label">Warning:</td>
701	@ <td><span class='securityWarning'>
702	@ Login information, including the password,
703	@ will be sent in the clear over an unencrypted connection.
704	if( !g.sslNotAvailable ){
705	@ Consider logging in at
706	@ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
707	}
708	@ </span></td></tr>
709	}
710	@ <tr>
711	@ <td class="form_label" id="userlabel1">User ID:</td>
712	@ <td><input type="text" id="u" aria-labelledby="userlabel1" name="u" \
713	@ size="30" value="%s(anonFlag?"anonymous":"")"></td>
714	@ </tr>
	@@ -708,31 +719,19 @@
719	if( zAnonPw && !noAnon ){
720	captcha_speakit_button(uSeed, "Speak password for \"anonymous\"");
721	}
722	@ </td>
723	@ </tr>
724	@ <tr>
725	@ <td></td>
726	@ <td><input type="checkbox" name="remember" value="1" \
727	@ id="remember-me" %s(rememberMe ? "checked=\"checked\"" : "")>
728	@ <label for="remember-me">Remember me?</label></td>
729	@ </tr>







730	@ <tr>
731	@ <td></td>
732	@ <td><input type="submit" name="in" value="Login">





733	@ </tr>
734	if( !noAnon && login_self_register_available(0) ){
735	@ <tr>
736	@ <td></td>
737	@ <td><input type="submit" name="self" value="Create A New Account">
738

Fossil SCM

Keyboard Shortcuts