Fossil SCM

Login and subscription forms work better on mobile.

drh 2018-08-31 22:03 trunk
Commit 27769be9d07145b7e5b744127b25c9f8741f350af949d483e371f27ae98e4678
Parent 75c89def6b42a11…
2 files changed +6 -3 +27 -30
~ src/alerts.c ~ src/login.c
M src/alerts.c
+6 -3
--- src/alerts.c
+++ src/alerts.c
@@ -1378,12 +1378,13 @@
13781378
 form_begin(0, "%R/subscribe");
13791379
 @ <table class="subscribe">
13801380
 @ <tr>
13811381
 @ <td class="form_label">Email&nbsp;Address:</td>
13821382
 @ <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td>
1383
+ @ <tr>
13831384
 if( eErr==1 ){
1384
- @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1385
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
13851386
 }
13861387
 @ </tr>
13871388
 if( needCaptcha ){
13881389
 uSeed = captcha_seed();
13891390
 zDecoded = captcha_decode(uSeed);
@@ -1390,22 +1391,24 @@
13901391
 zCaptcha = captcha_render(zDecoded);
13911392
 @ <tr>
13921393
 @ <td class="form_label">Security Code:</td>
13931394
 @ <td><input type="text" name="captcha" value="" size="30">
13941395
 @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
1396
+ @ </tr>
13951397
 if( eErr==2 ){
1396
- @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1398
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
13971399
 }
13981400
 @ </tr>
13991401
 }
14001402
 if( g.perm.Admin ){
14011403
 @ <tr>
14021404
 @ <td class="form_label">User:</td>
14031405
 @ <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \
14041406
 @ size="30"></td>
1407
+ @ </tr>
14051408
 if( eErr==3 ){
1406
- @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1409
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
14071410
 }
14081411
 @ </tr>
14091412
 }
14101413
 @ <tr>
14111414
 @ <td class="form_label">Topics:</td>
14121415
--- src/alerts.c
+++ src/alerts.c
@@ -1378,12 +1378,13 @@
1378 form_begin(0, "%R/subscribe");
1379 @ <table class="subscribe">
1380 @ <tr>
1381 @ <td class="form_label">Email&nbsp;Address:</td>
1382 @ <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td>
 
1383 if( eErr==1 ){
1384 @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1385 }
1386 @ </tr>
1387 if( needCaptcha ){
1388 uSeed = captcha_seed();
1389 zDecoded = captcha_decode(uSeed);
@@ -1390,22 +1391,24 @@
1390 zCaptcha = captcha_render(zDecoded);
1391 @ <tr>
1392 @ <td class="form_label">Security Code:</td>
1393 @ <td><input type="text" name="captcha" value="" size="30">
1394 @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
 
1395 if( eErr==2 ){
1396 @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1397 }
1398 @ </tr>
1399 }
1400 if( g.perm.Admin ){
1401 @ <tr>
1402 @ <td class="form_label">User:</td>
1403 @ <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \
1404 @ size="30"></td>
 
1405 if( eErr==3 ){
1406 @ <td><span class="loginError">&larr; %h(zErr)</span></td>
1407 }
1408 @ </tr>
1409 }
1410 @ <tr>
1411 @ <td class="form_label">Topics:</td>
1412
--- src/alerts.c
+++ src/alerts.c
@@ -1378,12 +1378,13 @@
1378 form_begin(0, "%R/subscribe");
1379 @ <table class="subscribe">
1380 @ <tr>
1381 @ <td class="form_label">Email&nbsp;Address:</td>
1382 @ <td><input type="text" name="e" value="%h(PD("e",""))" size="30"></td>
1383 @ <tr>
1384 if( eErr==1 ){
1385 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1386 }
1387 @ </tr>
1388 if( needCaptcha ){
1389 uSeed = captcha_seed();
1390 zDecoded = captcha_decode(uSeed);
@@ -1390,22 +1391,24 @@
1391 zCaptcha = captcha_render(zDecoded);
1392 @ <tr>
1393 @ <td class="form_label">Security Code:</td>
1394 @ <td><input type="text" name="captcha" value="" size="30">
1395 @ <input type="hidden" name="captchaseed" value="%u(uSeed)"></td>
1396 @ </tr>
1397 if( eErr==2 ){
1398 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1399 }
1400 @ </tr>
1401 }
1402 if( g.perm.Admin ){
1403 @ <tr>
1404 @ <td class="form_label">User:</td>
1405 @ <td><input type="text" name="suname" value="%h(PD("suname",g.zLogin))" \
1406 @ size="30"></td>
1407 @ </tr>
1408 if( eErr==3 ){
1409 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1410 }
1411 @ </tr>
1412 }
1413 @ <tr>
1414 @ <td class="form_label">Topics:</td>
1415
M src/login.c
+27 -30
--- src/login.c
+++ src/login.c
@@ -729,45 +729,41 @@
729729
 if( anonFlag ){
730730
 @ <td><input type="text" id="u" name="u" value="anonymous" size="30"></td>
731731
 }else{
732732
 @ <td><input type="text" id="u" name="u" value="" size="30" /></td>
733733
 }
734
+ @ </tr>
735
+ @ <tr>
736
+ @ <td class="form_label">Password:</td>
737
+ @ <td><input type="password" id="p" name="p" value="" size="30" /></td>
738
+ @ </tr>
734739
 if( P("HTTPS")==0 ){
735
- @ <td width="15"><td rowspan="2">
736
- @ <p class='securityWarning'>
737
- @ Warning: Your password will be sent in the clear over an
740
+ @ <tr><td class="form_label">Warning:</td>
741
+ @ <td><span class='securityWarning'>
742
+ @ Your password will be sent in the clear over an
738743
 @ unencrypted connection.
739744
 if( g.sslNotAvailable ){
740745
 @ No encrypted connection is available on this server.
741746
 }else{
742747
 @ Consider logging in at
743748
 @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
744749
 }
745
- @ </p>
750
+ @ </span></td></tr>
746751
 }
747
- @ </tr>
748
- @ <tr>
749
- @ <td class="form_label">Password:</td>
750
- @ <td><input type="password" id="p" name="p" value="" size="30" /></td>
751
- @ </tr>
752752
 if( g.zLogin==0 && (anonFlag || zGoto==0) ){
753753
 zAnonPw = db_text(0, "SELECT pw FROM user"
754754
 " WHERE login='anonymous'"
755755
 " AND cap!=''");
756756
 }
757757
 @ <tr>
758758
 @ <td></td>
759759
 @ <td><input type="submit" name="in" value="Login"></td>
760
- @ <td colspan="2">&larr; Pressing this button grants\
761
- @ permission to store a cookie
762760
 @ </tr>
763761
 if( !noAnon && login_self_register_available(0) ){
764762
 @ <tr>
765763
 @ <td></td>
766764
 @ <td><input type="submit" name="self" value="Create A New Account">
767
- @ <td colspan="2"> \
768
- @ &larr; Don't have a login? Click this button to create one.
769765
 @ </tr>
770766
 }
771767
 @ </table>
772768
 if( zAnonPw && !noAnon ){
773769
 unsigned int uSeed = captcha_seed();
@@ -1704,66 +1700,67 @@
17041700
 @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" />
17051701
 @ <table class="login_out">
17061702
 @ <tr>
17071703
 @ <td class="form_label" align="right">User ID:</td>
17081704
 @ <td><input type="text" name="u" value="%h(zUserID)" size="30"></td>
1705
+ @
17091706
 if( iErrLine==1 ){
1710
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1707
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17111708
 }
1712
- @ </tr>
17131709
 @ <tr>
17141710
 @ <td class="form_label" align="right">Display Name:</td>
17151711
 @ <td><input type="text" name="dn" value="%h(zDName)" size="30"></td>
1712
+ @ </tr>
17161713
 if( iErrLine==2 ){
1717
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1714
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17181715
 }
17191716
 @ </tr>
17201717
 @ <tr>
17211718
 @ <td class="form_label" align="right">Email Address:</td>
17221719
 @ <td><input type="text" name="ea" value="%h(zEAddr)" size="30"></td>
1720
+ @ </tr>
17231721
 if( iErrLine==3 ){
1724
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1722
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17251723
 }
1726
- @ </tr>
17271724
 if( canDoAlerts ){
17281725
 int a = atoi(PD("alerts","1"));
17291726
 @ <tr>
1730
- @ <td class="form_label" align="right">Receive Email Alerts?</td>
1727
+ @ <td class="form_label" align="right">Email&nbsp;Alerts?</td>
17311728
 @ <td><select size='1' name='alerts'>
17321729
 @ <option value="1" %s(a?"selected":"")>Yes</option>
17331730
 @ <option value="0" %s(!a?"selected":"")>No</option>
17341731
 @ </select></td></tr>
17351732
 }
17361733
 @ <tr>
17371734
 @ <td class="form_label" align="right">Password:</td>
17381735
 @ <td><input type="password" name="p" value="%h(zPasswd)" size="30"></td>
1736
+ @ <tr>
17391737
 if( iErrLine==4 ){
1740
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1741
- }else{
1742
- @ <td>&larr; Must be at least 6 characters</td>
1738
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17431739
 }
1744
- @ </tr>
17451740
 @ <tr>
1746
- @ <td class="form_label" align="right">Confirm password:</td>
1741
+ @ <td class="form_label" align="right">Confirm:</td>
17471742
 @ <td><input type="password" name="cp" value="%h(zConfirm)" size="30"></td>
1743
+ @ </tr>
17481744
 if( iErrLine==5 ){
1749
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1745
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17501746
 }
1751
- @ </tr>
17521747
 @ <tr>
1753
- @ <td class="form_label" align="right">Captcha text (below):</td>
1748
+ @ <td class="form_label" align="right">Captcha:</td>
17541749
 @ <td><input type="text" name="captcha" value="" size="30"></td>
1750
+ @ </tr>
17551751
 if( iErrLine==6 ){
1756
- @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1752
+ @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
17571753
 }
1758
- @ </tr>
17591754
 @ <tr><td></td>
17601755
 @ <td><input type="submit" name="new" value="Register" /></td></tr>
17611756
 @ </table>
17621757
 @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
17631758
 @ %h(zCaptcha)
1764
- @ </pre></td></tr></table></div>
1759
+ @ </pre>
1760
+ @ Enter this 8-letter code in the "Captcha" box above.
1761
+ @ </td></tr></table></div>
17651762
 @ </form>
17661763
 style_footer();
17671764
17681765
 free(zCaptcha);
17691766
 }
17701767
--- src/login.c
+++ src/login.c
@@ -729,45 +729,41 @@
729 if( anonFlag ){
730 @ <td><input type="text" id="u" name="u" value="anonymous" size="30"></td>
731 }else{
732 @ <td><input type="text" id="u" name="u" value="" size="30" /></td>
733 }
 
 
 
 
 
734 if( P("HTTPS")==0 ){
735 @ <td width="15"><td rowspan="2">
736 @ <p class='securityWarning'>
737 @ Warning: Your password will be sent in the clear over an
738 @ unencrypted connection.
739 if( g.sslNotAvailable ){
740 @ No encrypted connection is available on this server.
741 }else{
742 @ Consider logging in at
743 @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
744 }
745 @ </p>
746 }
747 @ </tr>
748 @ <tr>
749 @ <td class="form_label">Password:</td>
750 @ <td><input type="password" id="p" name="p" value="" size="30" /></td>
751 @ </tr>
752 if( g.zLogin==0 && (anonFlag || zGoto==0) ){
753 zAnonPw = db_text(0, "SELECT pw FROM user"
754 " WHERE login='anonymous'"
755 " AND cap!=''");
756 }
757 @ <tr>
758 @ <td></td>
759 @ <td><input type="submit" name="in" value="Login"></td>
760 @ <td colspan="2">&larr; Pressing this button grants\
761 @ permission to store a cookie
762 @ </tr>
763 if( !noAnon && login_self_register_available(0) ){
764 @ <tr>
765 @ <td></td>
766 @ <td><input type="submit" name="self" value="Create A New Account">
767 @ <td colspan="2"> \
768 @ &larr; Don't have a login? Click this button to create one.
769 @ </tr>
770 }
771 @ </table>
772 if( zAnonPw && !noAnon ){
773 unsigned int uSeed = captcha_seed();
@@ -1704,66 +1700,67 @@
1704 @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" />
1705 @ <table class="login_out">
1706 @ <tr>
1707 @ <td class="form_label" align="right">User ID:</td>
1708 @ <td><input type="text" name="u" value="%h(zUserID)" size="30"></td>
 
1709 if( iErrLine==1 ){
1710 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1711 }
1712 @ </tr>
1713 @ <tr>
1714 @ <td class="form_label" align="right">Display Name:</td>
1715 @ <td><input type="text" name="dn" value="%h(zDName)" size="30"></td>
 
1716 if( iErrLine==2 ){
1717 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1718 }
1719 @ </tr>
1720 @ <tr>
1721 @ <td class="form_label" align="right">Email Address:</td>
1722 @ <td><input type="text" name="ea" value="%h(zEAddr)" size="30"></td>
 
1723 if( iErrLine==3 ){
1724 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1725 }
1726 @ </tr>
1727 if( canDoAlerts ){
1728 int a = atoi(PD("alerts","1"));
1729 @ <tr>
1730 @ <td class="form_label" align="right">Receive Email Alerts?</td>
1731 @ <td><select size='1' name='alerts'>
1732 @ <option value="1" %s(a?"selected":"")>Yes</option>
1733 @ <option value="0" %s(!a?"selected":"")>No</option>
1734 @ </select></td></tr>
1735 }
1736 @ <tr>
1737 @ <td class="form_label" align="right">Password:</td>
1738 @ <td><input type="password" name="p" value="%h(zPasswd)" size="30"></td>
 
1739 if( iErrLine==4 ){
1740 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1741 }else{
1742 @ <td>&larr; Must be at least 6 characters</td>
1743 }
1744 @ </tr>
1745 @ <tr>
1746 @ <td class="form_label" align="right">Confirm password:</td>
1747 @ <td><input type="password" name="cp" value="%h(zConfirm)" size="30"></td>
 
1748 if( iErrLine==5 ){
1749 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1750 }
1751 @ </tr>
1752 @ <tr>
1753 @ <td class="form_label" align="right">Captcha text (below):</td>
1754 @ <td><input type="text" name="captcha" value="" size="30"></td>
 
1755 if( iErrLine==6 ){
1756 @ <td><span class='loginError'>&larr; %h(zErr)</span></td>
1757 }
1758 @ </tr>
1759 @ <tr><td></td>
1760 @ <td><input type="submit" name="new" value="Register" /></td></tr>
1761 @ </table>
1762 @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
1763 @ %h(zCaptcha)
1764 @ </pre></td></tr></table></div>
 
 
1765 @ </form>
1766 style_footer();
1767
1768 free(zCaptcha);
1769 }
1770
--- src/login.c
+++ src/login.c
@@ -729,45 +729,41 @@
729 if( anonFlag ){
730 @ <td><input type="text" id="u" name="u" value="anonymous" size="30"></td>
731 }else{
732 @ <td><input type="text" id="u" name="u" value="" size="30" /></td>
733 }
734 @ </tr>
735 @ <tr>
736 @ <td class="form_label">Password:</td>
737 @ <td><input type="password" id="p" name="p" value="" size="30" /></td>
738 @ </tr>
739 if( P("HTTPS")==0 ){
740 @ <tr><td class="form_label">Warning:</td>
741 @ <td><span class='securityWarning'>
742 @ Your password will be sent in the clear over an
743 @ unencrypted connection.
744 if( g.sslNotAvailable ){
745 @ No encrypted connection is available on this server.
746 }else{
747 @ Consider logging in at
748 @ <a href='%s(g.zHttpsURL)'>%h(g.zHttpsURL)</a> instead.
749 }
750 @ </span></td></tr>
751 }
 
 
 
 
 
752 if( g.zLogin==0 && (anonFlag || zGoto==0) ){
753 zAnonPw = db_text(0, "SELECT pw FROM user"
754 " WHERE login='anonymous'"
755 " AND cap!=''");
756 }
757 @ <tr>
758 @ <td></td>
759 @ <td><input type="submit" name="in" value="Login"></td>
 
 
760 @ </tr>
761 if( !noAnon && login_self_register_available(0) ){
762 @ <tr>
763 @ <td></td>
764 @ <td><input type="submit" name="self" value="Create A New Account">
 
 
765 @ </tr>
766 }
767 @ </table>
768 if( zAnonPw && !noAnon ){
769 unsigned int uSeed = captcha_seed();
@@ -1704,66 +1700,67 @@
1700 @ <p><input type="hidden" name="captchaseed" value="%u(uSeed)" />
1701 @ <table class="login_out">
1702 @ <tr>
1703 @ <td class="form_label" align="right">User ID:</td>
1704 @ <td><input type="text" name="u" value="%h(zUserID)" size="30"></td>
1705 @
1706 if( iErrLine==1 ){
1707 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1708 }
 
1709 @ <tr>
1710 @ <td class="form_label" align="right">Display Name:</td>
1711 @ <td><input type="text" name="dn" value="%h(zDName)" size="30"></td>
1712 @ </tr>
1713 if( iErrLine==2 ){
1714 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1715 }
1716 @ </tr>
1717 @ <tr>
1718 @ <td class="form_label" align="right">Email Address:</td>
1719 @ <td><input type="text" name="ea" value="%h(zEAddr)" size="30"></td>
1720 @ </tr>
1721 if( iErrLine==3 ){
1722 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1723 }
 
1724 if( canDoAlerts ){
1725 int a = atoi(PD("alerts","1"));
1726 @ <tr>
1727 @ <td class="form_label" align="right">Email&nbsp;Alerts?</td>
1728 @ <td><select size='1' name='alerts'>
1729 @ <option value="1" %s(a?"selected":"")>Yes</option>
1730 @ <option value="0" %s(!a?"selected":"")>No</option>
1731 @ </select></td></tr>
1732 }
1733 @ <tr>
1734 @ <td class="form_label" align="right">Password:</td>
1735 @ <td><input type="password" name="p" value="%h(zPasswd)" size="30"></td>
1736 @ <tr>
1737 if( iErrLine==4 ){
1738 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
 
 
1739 }
 
1740 @ <tr>
1741 @ <td class="form_label" align="right">Confirm:</td>
1742 @ <td><input type="password" name="cp" value="%h(zConfirm)" size="30"></td>
1743 @ </tr>
1744 if( iErrLine==5 ){
1745 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1746 }
 
1747 @ <tr>
1748 @ <td class="form_label" align="right">Captcha:</td>
1749 @ <td><input type="text" name="captcha" value="" size="30"></td>
1750 @ </tr>
1751 if( iErrLine==6 ){
1752 @ <tr><td><td><span class='loginError'>&uarr; %h(zErr)</span></td></tr>
1753 }
 
1754 @ <tr><td></td>
1755 @ <td><input type="submit" name="new" value="Register" /></td></tr>
1756 @ </table>
1757 @ <div class="captcha"><table class="captcha"><tr><td><pre class="captcha">
1758 @ %h(zCaptcha)
1759 @ </pre>
1760 @ Enter this 8-letter code in the "Captcha" box above.
1761 @ </td></tr></table></div>
1762 @ </form>
1763 style_footer();
1764
1765 free(zCaptcha);
1766 }
1767

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button