changeset 36:df258dbf4739

Merge Adam's upstream changes and update tests.
author Karn Kallio <kkallio@eka>
date Thu, 21 Apr 2011 20:06:46 -0430
parents a5574ec3991f 90b8ce9be9f5
children e31baf0f275e
files src/ur/openidUser.ur src/ur/openidUser.urs tests/utest.ur
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/ur/openidUser.urs	Wed Apr 20 15:45:27 2011 -0430
+++ b/src/ur/openidUser.urs	Thu Apr 21 20:06:46 2011 -0430
@@ -113,7 +113,8 @@
      * management, suitable for, e.g., inclusion in your standard page
      * header.  The output gives a "status" chunk, which will either be a login
      * form or a message about which user is logged in; and an "other" chunk,
-     * which will be a log out or sign up link. *)
+     * which will be a log out or sign up link. In the case "other", the link
+     * itself is also provided for cases when one format is not enough. *)
                              
 end
 
--- a/tests/utest.ur	Wed Apr 20 15:45:27 2011 -0430
+++ b/tests/utest.ur	Thu Apr 21 20:06:46 2011 -0430
@@ -29,6 +29,8 @@
                                   val formClass = inputs
 
                                   val fakeId = None
+
+                                  structure CtlDisplay = OpenidUser.DefaultDisplay
                               end)
 
 fun wrap title body =
@@ -37,7 +39,7 @@
       <title>{[title]}</title>
     </head><body>
       {userStuff.Status}<br/>
-      {userStuff.Other}
+      {userStuff.Other.Xml}
 
       <h1>{[title]}</h1>