[0.5.0: happstack-ixset -> ixset, theming improvements Jeremy Shaw **20110812203359 Ignore-this: 65f77d2d5e35cb4402cce0eaaf8f8252 ] hunk ./Happstack/Auth/Core/Auth.hs 18 + , AuthMethod_v1(..) + , AuthMap(..) + , HashedPass(..) hunk ./Happstack/Auth/Core/Auth.hs 58 +import qualified Data.IxSet as IxSet +import Data.IxSet (IxSet, (@=), inferIxSet, noCalcs, getOne, updateIx) hunk ./Happstack/Auth/Core/Auth.hs 69 -import qualified Happstack.Data.IxSet as IxSet -import Happstack.Data.IxSet (IxSet, inferIxSet, noCalcs) -import Happstack.Data.IxSet ((@=), getOne, updateIx) hunk ./Happstack/Auth/Core/Auth.hs 73 -instance (SafeCopy a, Ord a, Typeable a, IxSet.Indexable a) => SafeCopy (IxSet a) where - putCopy ixSet = contain $ safePut (IxSet.toList ixSet) - getCopy = contain $ IxSet.fromList <$> safeGet - - hunk ./Happstack/Auth/Core/Profile.hs 13 +import Data.IxSet (IxSet, (@=), inferIxSet, noCalcs) +import qualified Data.IxSet as IxSet hunk ./Happstack/Auth/Core/Profile.hs 24 -import Happstack.Data.IxSet (IxSet, (@=), inferIxSet, noCalcs) -import qualified Happstack.Data.IxSet as IxSet hunk ./Happstack/Auth/HSP/Login.hs 42 -

You are now logged out. Click here to log in again.

+
+

You are now logged out. Click here to log in again.

+
hunk ./Happstack/Auth/HSP/Login.hs 49 -
    -
  1. Login with your Google Account
    2. -
  2. Login with your Yahoo Account
    3. -
  3. Login with your Live Journal Account
    4. -
  4. Login with your Myspace Account
    5. -
  5. Login with your OpenId Account
    6. -
  6. Login with a username and password
    7. - <% case mFacebook of - Nothing -> [] - (Just facebook) -> - [
  7. Login with your Facebook Account
    8. ] - %> -
- +
+
    +
  1. Login with your Google Account
    2. +
  2. Login with your Yahoo Account
    3. +
  3. Login with your Live Journal Account
    4. +
  4. Login with your Myspace Account
    5. +
  5. Login with your OpenId Account
    6. +
  6. Login with a username and password
    7. + <% case mFacebook of + Nothing -> [] + (Just facebook) -> + [
  7. Login with your Facebook Account
    8. ] + %> +
+
hunk ./Happstack/Auth/HSP/Login.hs 67 -
    -
  1. Add your Google
    2. -
  2. Add your Yahoo Account
    3. -
  3. Add your Live Journal Account
    4. -
  4. Add your Myspace Account
    5. -
  5. Add your OpenId Account
    6. - <% case mFacebook of - Nothing -> [] - (Just facebook) -> - [
  6. Add your Facebook Account
    7. ] - %> -
+
+
    +
  1. Add your Google
    2. +
  2. Add your Yahoo Account
    3. +
  3. Add your Live Journal Account
    4. +
  4. Add your Myspace Account
    5. +
  5. Add your OpenId Account
    6. + <% case mFacebook of + Nothing -> [] + (Just facebook) -> + [
  6. Add your Facebook Account
    7. ] + %> +
+
hunk ./Happstack/Auth/HSP/Login.hs 84 -
+
hunk ./Happstack/Auth/HSP/Login.hs 95 -
+
hunk ./Happstack/Auth/HSP/Login.hs 140 -
+
hunk ./Happstack/Auth/HSP/Login.hs 159 -
+
hunk ./Happstack/Auth/HSP/Login.hs 161 - <% errorList (map snd errs) %> +-- <% errorList (map snd errs) %> hunk ./Happstack/Auth/HSP/Login.hs 240 -
+
hunk ./Happstack/Auth/HSP/Login.hs 273 - li :: a -> a - li = id - - ol :: a -> a - ol = id - - fieldset :: a -> a - fieldset = id - - - hunk ./Happstack/Auth/HSP/Login.hs 277 -
+
hunk ./Happstack/Auth/HSP/Login.hs 295 - username = li $ ((label "username: " ++> inputText Nothing) - `validate` notEmpty) <++ errors - password1 = li $ label "password: " ++> inputPassword - password2 = li $ label "confirm password: " ++> inputPassword + username = li $ ((label "username: " ++> inputText Nothing <++ errors) `validate` notEmpty) + password1 = li $ label "password: " ++> inputPassword <++ errors + password2 = li $ label "confirm password: " ++> inputPassword <++ errors hunk ./Happstack/Auth/HSP/Login.hs 300 - errors ++> (minLengthString 6 $ - (((,) <$> password1 <*> password2) `transform` samePassword)) + (minLengthString 6 $ + (((,) <$> password1 <*> password2) `transform` samePassword)) hunk ./Happstack/Auth/HSP/Login.hs 322 -li :: a -> a -li = id - -ol :: a -> a -ol = id - -fieldset :: a -> a -fieldset = id +fieldset, li, ol :: (XMLGenerator m, Functor v, Monad v) => Form v [Input] String [XMLGenT m (HSX.XML m)] a -> Form v [Input] String [XMLGenT m (HSX.XML m)] a +fieldset = mapView (\x -> [
<% x %>
]) +li = mapView (\x -> [
  • <% x %>
    • ]) +ol = mapView (\x -> [
      <% x %>
    ]) hunk ./Happstack/Auth/HSP/Login.hs 348 -
    +
    hunk ./Happstack/Auth/HSP/Login.hs 353 -
    +
    hunk ./Happstack/Auth/HSP/Login.hs 359 -
    +
    hunk ./Happstack/Auth/HSP/Login.hs 369 -
    +
    hunk ./Happstack/Auth/HSP/Login.hs 374 -
    +
    hunk ./debian/changelog 1 +haskell-happstack-authenticate (0.5.0) unstable; urgency=low + + * HSP - make sure all content is wrapped in +
    ..
    + * happstack-ixset -> ixset + * Restore fieldset, ol, li markup + + -- Jeremy Shaw Fri, 12 Aug 2011 15:28:37 -0500 + hunk ./debian/control 19 - libghc-happstack-ixset-prof (>= 6.0), - libghc-happstack-ixset-prof (<< 6.1), + libghc-ixset-prof, hunk ./debian/control 41 - libghc-happstack-ixset-doc (>= 6.0), - libghc-happstack-ixset-doc (<< 6.1), + libghc-ixset-doc, hunk ./demo/ProfileData.hs 8 +import Data.IxSet (IxSet, (@=), getOne, inferIxSet, noCalcs) +import qualified Data.IxSet as IxSet hunk ./demo/ProfileData.hs 11 -import Happstack.Auth.Core.Profile -import Happstack.Data.IxSet (IxSet, (@=), getOne, inferIxSet, noCalcs) -import Happstack.Server -import qualified Happstack.Data.IxSet as IxSet hunk ./demo/ProfileData.hs 13 +import Happstack.Auth.Core.Profile +import Happstack.Server hunk ./demo/ProfileData.hs 31 +-- FIXME: this should be idempotent hunk ./happstack-authenticate.cabal 2 -Version: 0.4.2 +Version: 0.5.0 hunk ./happstack-authenticate.cabal 38 - happstack-ixset >= 6.0 && < 6.1, + ixset >= 1.0 && < 1.1,