diff options
| author | Mark Lentczner <markl@glyphic.com> | 2010-07-16 22:41:53 +0000 |
|---|---|---|
| committer | Mark Lentczner <markl@glyphic.com> | 2010-07-16 22:41:53 +0000 |
| commit | efcaa44c353503aa7384de55091be70ac5fbb4ed (patch) | |
| tree | 73ae1532dc0d5110401bf99a40e0d0bf23796e21 /src/Haddock/Backends/Xhtml | |
| parent | dd861488e115b4419f2b9f6f6422adaa4041287f (diff) | |
convert index to new markup
Diffstat (limited to 'src/Haddock/Backends/Xhtml')
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Layout.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Util.hs | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/src/Haddock/Backends/Xhtml/Layout.hs index b6818b61..616b3b95 100644 --- a/src/Haddock/Backends/Xhtml/Layout.hs +++ b/src/Haddock/Backends/Xhtml/Layout.hs @@ -135,7 +135,7 @@ subInstances :: String -> [SubDecl] -> Html subInstances id_ = divSubDecls "instances" instCaption . instTable where instCaption = collapsebutton id_ +++ " Instances" - instTable = (collapsed thediv id_ `fmap`) . subTable + instTable = fmap (thediv ! [identifier id_] <<) . subTable subMethods :: [Html] -> Html subMethods = divSubDecls "methods" "Methods" . subBlock diff --git a/src/Haddock/Backends/Xhtml/Util.hs b/src/Haddock/Backends/Xhtml/Util.hs index 13215bb7..d4ead8d8 100644 --- a/src/Haddock/Backends/Xhtml/Util.hs +++ b/src/Haddock/Backends/Xhtml/Util.hs @@ -25,7 +25,7 @@ module Haddock.Backends.Xhtml.Util ( tda, emptyTable, s8, abovesSep, hsep, - collapsebutton, collapseId, collapsed, + collapsebutton, collapseId, documentCharacterEncoding, cssFiles, styleSheet, stylePickers, styleMenu @@ -206,10 +206,6 @@ collapsebutton :: String -> Html collapsebutton id_ = image ! [ src minusFile, theclass "coll", onclick ("toggle(this,'" ++ id_ ++ "')"), alt "show/hide" ] -collapsed :: (HTML a) => (Html -> Html) -> String -> a -> Html -collapsed fn id_ html = - fn ! [identifier id_, thestyle "display:block;"] << html - -- A quote is a valid part of a Haskell identifier, but it would interfere with -- the ECMA script string delimiter used in collapsebutton above. collapseId :: Name -> String |