default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / loginout / login.html

diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index 138c6ad..1785ea7 100644 (file)
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -1,5 +1,5 @@
 <& /elements/header-minimal.html, 'Login' &>
-<link href="<%$url_string%>elements/freeside.css" type="text/css" rel="stylesheet">
+<link href="<%$url_string%>elements/freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
 
 <CENTER>
 
@@ -27,6 +27,10 @@
         <TD ALIGN="right">Password: </TD>
         <TD><INPUT TYPE="password" NAME="credential_1" SIZE="13"></TD>
       </TR>
+      <TR>
+        <TD ALIGN="right">One-time code: </TD>
+        <TD><INPUT TYPE="text" NAME="credential_2" SIZE="13"></TD>
+      </TR>
     </TABLE>
     <BR>
  
@@ -34,45 +38,15 @@
 
   </FORM>
 
-  <div id="edgebug" style="display: none; border: solid 1px #888; border-radius: 4px; margin: 5em; max-width: 400px; text-align: left; padding: 0 1em;">
-    <div style="text-align: center; font-size: 3em; color: #933; text-shadow: 1px 1px 2px black;">
-      &#9888;
-    </div>
-    <h4 style="border-bottom: solid 1px #888; margin: 1em 0; text-align: center;">
-      Edge Browser Bug
-    </h4>
-    <p>
-      Please ensure your version of Windows is up to date.
-    </p>
-    <p>
-      You are using the Microsoft Edge browser.  In July, Microsoft fixed a
-      bug in Edge.  The bug causes Edge to rarely send different data to
-      the server than the user selected.
-    </p>
-    <p>
-      Only Windows 10 computers that have not received Microsoft's
-      <b>July RS4 Windows 10 Update</b>
-      <sup>
-        [<a  style="text-decoration: none;" href="https://support.microsoft.com/en-us/help/4338819/windows-10-update-kb4338819">*</a>]
-      </sup> are affected.
-    </p>
-  </div>
-
 </CENTER>
 
-<script type="text/javascript">
-  if ( /Edge\/17\.17134/.test( navigator.userAgent ) ) {
-    document.getElementById('edgebug').style.display = 'block';
-  }
-</script>
-
 </BODY></HTML>
 <%init>
 
 my %error = (
   'no_cookie'       => '', #First login, don't display an error
   'bad_cookie'      => 'Bad Cookie', #timed out?
-  'bad_credentials' => 'Incorrect username / password',
+  'bad_credentials' => 'Incorrect username / password / one-time code',
   #'logout'          => 'You have been logged out.',
 );