# HG changeset patch # User Karn Kallio # Date 1303432606 16200 # Node ID df258dbf473916932bf06b41115ac66bb140a12a # Parent a5574ec3991fdd53651fa4c4649effbefe0c24d6# Parent 90b8ce9be9f5aaea3af68857005bd3674e4b549a Merge Adam's upstream changes and update tests. diff -r a5574ec3991f -r df258dbf4739 src/ur/openidUser.urs --- 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 diff -r a5574ec3991f -r df258dbf4739 tests/utest.ur --- 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]} {userStuff.Status}
- {userStuff.Other} + {userStuff.Other.Xml}