Thu Dec 11 13:48:46 PST 2003

Update of /usr/local/cvsroot/webiso/pubcookie/src/login_templates.generic
 In directory webiso-cvs.cac.washington.edu:/var/tmp/cvs-serv11182/src/login_templates.generic
 
 Modified Files:
 	login login_user_form_field login_user_static 
 	logout_still_weblogin status welcome_back 
 Added Files:
 	login_auth_prob_uwsecurid login_bad_auth_static_user 
 	login_bad_auth_uwsecurid login_bad_auth_uwsecurid_static_user 
 	login_expired login_next_prn login_pass_form_field 
 	login_pass_static login_unauth_grant login_user_hidden 
 	login_uwsecurid logout_still_known 
 Log Message:
 Merge from UWash3 branch


Index: webiso/pubcookie/src/login_templates.generic/login_auth_prob_uwsecurid
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_auth_prob_uwsecurid:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_auth_prob_uwsecurid	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,10 ----
+ <P>
+   <B>
+     <FONT COLOR="#FF0000" SIZE="+1">There has been a system problem.<BR>Please re-enter.<BR>If problems persist please contact help at cac.washington.edu</FONT>
+   </B>
+   <BR>
+ </P>
+ <P>
+ <p>
+   Please make sure your <b>Number Lock key is ON</b>.
+ </p>


Index: webiso/pubcookie/src/login_templates.generic/login_bad_auth_static_user
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_bad_auth_static_user:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_bad_auth_static_user	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,10 ----
+ <P>
+   <B>
+     <FONT COLOR="#FF0000" SIZE="+1">Login failed.  Please re-enter.</FONT>
+   </B>
+   <BR>
+ </P>
+ <P>
+ <p>
+   Please make sure your <b>Caps Lock key is OFF</b> and your <b>Number Lock key is ON</b>.
+ </p>


Index: webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,13 ----
+ <P>
+   <B>
+     <FONT COLOR="#FF0000" SIZE="+1">Login failed.  Please re-enter.</FONT>
+   </B>
+   <BR>
+ </P>
+ <P>
+ <p>
+   Please make sure your <b>Number Lock key is ON</b>.
+ </p>
+ <p>
+   Please enter your UW NetID in <b>all lowercase</b> characters.
+ </P>


Index: webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid_static_user
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid_static_user:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_bad_auth_uwsecurid_static_user	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,10 ----
+ <P>
+   <B>
+     <FONT COLOR="#FF0000" SIZE="+1">Login failed.  Please re-enter.</FONT>
+   </B>
+   <BR>
+ </P>
+ <P>
+ <p>
+   Please make sure your <b>Number Lock key is ON</b>.
+ </p>


Index: webiso/pubcookie/src/login_templates.generic/login_expired
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_expired:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_expired	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1 ----
+ <P>Your "weblogin" session has expired.  Please log in again or exit this browser to change UW NetIDs.<P>


Index: webiso/pubcookie/src/login_templates.generic/login_next_prn
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_next_prn:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_next_prn	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,7 ----
+ <P>
+   <B>
+     <font color="#ff0000" size="+1">
+       Please log in with the next number on your SecurID.
+     </font>
+   </B>
+ </P>


Index: webiso/pubcookie/src/login_templates.generic/login_pass_form_field
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_pass_form_field:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_pass_form_field	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1 ----
+ <INPUT TYPE="password" NAME="pass" SIZE="20">


Index: webiso/pubcookie/src/login_templates.generic/login_pass_static
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_pass_static:1.2
*** /dev/null	Thu Dec 11 13:48:46 2003
--- webiso/pubcookie/src/login_templates.generic/login_pass_static	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1 ----
+ You entered it less than 10 minutes ago.


Index: webiso/pubcookie/src/login_templates.generic/login_unauth_grant
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_unauth_grant:1.2
*** /dev/null	Thu Dec 11 13:48:47 2003
--- webiso/pubcookie/src/login_templates.generic/login_unauth_grant	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,3 ----
+ <p>The application that sent you here is not authorized to
+ request weblogin</p>
+ 


Index: webiso/pubcookie/src/login_templates.generic/login_user_hidden
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_user_hidden:1.2
*** /dev/null	Thu Dec 11 13:48:47 2003
--- webiso/pubcookie/src/login_templates.generic/login_user_hidden	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1 ----
+ <input type="hidden" name="user" value="%contents%">


Index: webiso/pubcookie/src/login_templates.generic/login_uwsecurid
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/login_uwsecurid:1.2
*** /dev/null	Thu Dec 11 13:48:47 2003
--- webiso/pubcookie/src/login_templates.generic/login_uwsecurid	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,90 ----
+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+ <html>
+   <head>
+     <title>UW NetID Weblogin</title>
+   </head>
+ 
+   <body bgcolor="white" onLoad="document.query.elements[0].focus()">
+   <center>
+     <table cellpadding="0" cellspacing="0" border="0" width="580">
+       <tr>
+         <td width="310" valign="middle">
+           <img src="/images/login/weblogin.gif" alt="" height="57" width="198">
+ 
+           <form name="query" method="POST" action="%loginuri%"
+     enctype="application/x-www-form-urlencoded" autocomplete="off">
+ 
+ <!-- The reason we were sent here. -->
+ %message%
+ <!-- The end of reasons. -->
+ 
+ <P>
+ <B>UW NetID:</B><BR>
+ %user_field%
+ <P>
+ <B>Password:</B><BR>
+ %pass_field%
+ <P>
+ <B>SecurID:</B><BR>
+ <INPUT TYPE="text" NAME="pass2" SIZE="20">
+ 
+           <P>
+ <!-- The hidden fields -->
+ %hiddenuser%
+ %hiddenfields%
+ <!-- End of inserted stuff. -->
+           </P>
+ 
+             <P>
+               <input type="SUBMIT" name="submit" value="Log in">
+             </P>
+ 
+           </form>
+         </td>
+         <td width="9">
+           &nbsp;
+         </td>
+         <td width="2" bgcolor="#000000">
+           <img src="/images/1pixffcc33iystpiwfy.gif" width="1" height="1" align="BOTTOM" alt="" oncontextmenu="return false">
+         </td>
+         <td width="9">
+           &nbsp;
+         </td>
+         <td width="250" valign="MIDDLE">
+           <p>
+             <a href="https://uwnetid.washington.edu/newid/">Need a UW NetID?</a>
+           </p>
+           <p>
+             <a href="http://www.washington.edu/computing/uwnetid/password/forget.html">Forget your password?</a>
+           </p>
+           <dl>
+               <dt>Have a question?</dt>
+             <dd>
+               <a href="http://www.washington.edu/computing/uwnetid/">Read About UW NetIDs</a><BR>
+ 	      <a href="http://www.washington.edu/computing/weblogin/">Read About "weblogin"</A><BR>
+               <a href="http://www.washington.edu/computing/help/">Contact C&amp;C</a>
+             </dd>
+           </dl>
+         </td>
+       </tr>
+ 
+       <tr>
+         <td colspan="5" align="center">
+           <p>
+             Login gives you 8-hour access without repeat login to UW NetID-protected Web resources.
+           </p>
+           <p>
+             <strong>WARNING</strong>: Protect your privacy! Prevent unauthorized use!<br>
+             <a href="http://www.washington.edu/computing/weblogin/logout.html">Completely exit your Web browser when you are finished.</a>
+           </p>
+         </td>
+       </tr>
+       <tr>
+         <td colspan="5" align="center">
+           <small>Copyright &#169; 2003 University of Washington</small>
+         </td>
+       </tr>
+     </table>
+   </center>
+ </body>
+ </html>


Index: webiso/pubcookie/src/login_templates.generic/logout_still_known
diff -c /dev/null webiso/pubcookie/src/login_templates.generic/logout_still_known:1.2
*** /dev/null	Thu Dec 11 13:48:47 2003
--- webiso/pubcookie/src/login_templates.generic/logout_still_known	Thu Dec 11 13:48:44 2003
***************
*** 0 ****
--- 1,5 ----
+ 
+ <p>
+ <img src="/images/icon-excl.gif" align="absmiddle" alt="" height="35" width="35">
+ <font size="+1">You are still identified as <b>%contents%</b></font></p>
+ 


Index: webiso/pubcookie/src/login_templates.generic/login
diff -c webiso/pubcookie/src/login_templates.generic/login:1.4 webiso/pubcookie/src/login_templates.generic/login:1.5
*** webiso/pubcookie/src/login_templates.generic/login:1.4	Fri May 30 14:46:34 2003
--- webiso/pubcookie/src/login_templates.generic/login	Thu Dec 11 13:48:44 2003
***************
*** 40,45 ****
--- 40,46 ----
      <p>
  
  <!-- The hidden fields -->
+ %hiddenuser%
  %hiddenfields%
  <!-- The GetCred target, if defined -->
  %getcredhidden%


Index: webiso/pubcookie/src/login_templates.generic/login_user_form_field
diff -c webiso/pubcookie/src/login_templates.generic/login_user_form_field:1.1 webiso/pubcookie/src/login_templates.generic/login_user_form_field:1.2
*** webiso/pubcookie/src/login_templates.generic/login_user_form_field:1.1	Fri May 16 11:38:02 2003
--- webiso/pubcookie/src/login_templates.generic/login_user_form_field	Thu Dec 11 13:48:44 2003
***************
*** 1 ****
! <INPUT TYPE="text" NAME="user" SIZE="20" VALUE="%user%">
--- 1 ----
! <INPUT TYPE="text" NAME="user" SIZE="20" VALUE="%contents%">


Index: webiso/pubcookie/src/login_templates.generic/login_user_static
diff -c webiso/pubcookie/src/login_templates.generic/login_user_static:1.1 webiso/pubcookie/src/login_templates.generic/login_user_static:1.2
*** webiso/pubcookie/src/login_templates.generic/login_user_static:1.1	Fri May 16 11:38:02 2003
--- webiso/pubcookie/src/login_templates.generic/login_user_static	Thu Dec 11 13:48:44 2003
***************
*** 1 ****
! <span style="background: #eeeeee; color:black"><tt>%user%</tt></span>
--- 1 ----
! <span style="background: #eeeeee; color:black"><tt>%contents%</tt></span>


Index: webiso/pubcookie/src/login_templates.generic/logout_still_weblogin
diff -c webiso/pubcookie/src/login_templates.generic/logout_still_weblogin:1.3 webiso/pubcookie/src/login_templates.generic/logout_still_weblogin:1.4
*** webiso/pubcookie/src/login_templates.generic/logout_still_weblogin:1.3	Sat Apr 19 10:45:38 2003
--- webiso/pubcookie/src/login_templates.generic/logout_still_weblogin	Thu Dec 11 13:48:44 2003
***************
*** 2,6 ****
  <p>
  <img src="/images/icon-excl.gif" align="absmiddle" alt="" height="35" width="35">
  <font size="+1">You are still logged in to <b>pubcookie</b> 
! as <b>%user%</b></font></p>
  
--- 2,6 ----
  <p>
  <img src="/images/icon-excl.gif" align="absmiddle" alt="" height="35" width="35">
  <font size="+1">You are still logged in to <b>pubcookie</b> 
! as <b>%contents%</b></font></p>
  

Index: webiso/pubcookie/src/login_templates.generic/status
diff -c webiso/pubcookie/src/login_templates.generic/status:1.3 webiso/pubcookie/src/login_templates.generic/status:1.4
*** webiso/pubcookie/src/login_templates.generic/status:1.3	Sat Apr 19 10:45:38 2003
--- webiso/pubcookie/src/login_templates.generic/status	Thu Dec 11 13:48:44 2003
***************
*** 18,24 ****
  <p>
  <img src="/images/icon-excl.gif" align="absmiddle" alt="" height="35" width="35">
  <font size="+1">You are still logged in to <b>pubcookie</b> 
! as <b>%user%</b></font></p>
  
  <p>
  <img src="/images/icon-time.gif" align="absmiddle" alt="" height="35" width="35">
--- 18,24 ----
  <p>
  <img src="/images/icon-excl.gif" align="absmiddle" alt="" height="35" width="35">
  <font size="+1">You are still logged in to <b>pubcookie</b> 
! as <b>%contents%</b></font></p>
  
  <p>
  <img src="/images/icon-time.gif" align="absmiddle" alt="" height="35" width="35">


Index: webiso/pubcookie/src/login_templates.generic/welcome_back
diff -c webiso/pubcookie/src/login_templates.generic/welcome_back:1.2 webiso/pubcookie/src/login_templates.generic/welcome_back:1.3
*** webiso/pubcookie/src/login_templates.generic/welcome_back:1.2	Mon Apr 14 06:30:52 2003
--- webiso/pubcookie/src/login_templates.generic/welcome_back	Thu Dec 11 13:48:44 2003
***************
*** 1,6 ****
  <!-- begin tmpl welcome_back -->
  <p>
  <img src="/images/check.gif" align="absmiddle" alt="" height="35" width="35">
! <font size="+1">Log in successful - welcome back <b>%user%</b></font></p>
  <!-- end tmpl welcome_back -->
  
--- 1,6 ----
  <!-- begin tmpl welcome_back -->
  <p>
  <img src="/images/check.gif" align="absmiddle" alt="" height="35" width="35">
! <font size="+1">Log in successful - welcome back <b>%contents%</b></font></p>
  <!-- end tmpl welcome_back -->
  

end of message