mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

deal with yesod's second gratuitous rename of the same function in a year

Browse source
This commit is contained in:
Joey Hess 2014-10-23 20:26:46 -04:00
parent 31a1f061c6
commit ce9076370e
7 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/XMPP.hs
View file

@ -125,7 +125,7 @@ getBuddyListR nid = do
waitNotifier getBuddyListBroadcaster nid
p <- widgetToPageContent buddyListDisplay
giveUrlRenderer $ [hamlet|^{pageBody p}|]
withUrlRenderer $ [hamlet|^{pageBody p}|]
buddyListDisplay :: Widget
buddyListDisplay = do

2
Assistant/WebApp/DashBoard.hs
View file

@ -66,7 +66,7 @@ getTransfersR nid = do
waitNotifier getTransferBroadcaster nid
p <- widgetToPageContent transfersDisplay
giveUrlRenderer $ [hamlet|^{pageBody p}|]
withUrlRenderer $ [hamlet|^{pageBody p}|]
{- The main dashboard. -}
dashboard :: Bool -> Widget

2
Assistant/WebApp/Page.hs
View file

@ -66,7 +66,7 @@ customPage' with_longpolling navbaritem content = do
when with_longpolling $
addScript $ StaticR js_longpolling_js
$(widgetFile "page")
giveUrlRenderer $(Hamlet.hamletFile $ hamletTemplate "bootstrap")
withUrlRenderer $(Hamlet.hamletFile $ hamletTemplate "bootstrap")
Just msg -> error msg
where
navdetails i = (navBarName i, navBarRoute i, Just i == navbaritem)

2
Assistant/WebApp/RepoList.hs
View file

@ -91,7 +91,7 @@ getRepoListR :: NotificationId -> RepoSelector -> Handler Html
getRepoListR nid reposelector = do
waitNotifier getRepoListBroadcaster nid
p <- widgetToPageContent $ repoListDisplay reposelector
giveUrlRenderer $ [hamlet|^{pageBody p}|]
withUrlRenderer $ [hamlet|^{pageBody p}|]
mainRepoSelector :: RepoSelector
mainRepoSelector = RepoSelector

2
Assistant/WebApp/SideBar.hs
View file

@ -73,7 +73,7 @@ getSideBarR nid = do
liftIO $ threadDelay 100000
page <- widgetToPageContent sideBarDisplay
giveUrlRenderer $ [hamlet|^{pageBody page}|]
withUrlRenderer $ [hamlet|^{pageBody page}|]
{- Called by the client to close an alert. -}
getCloseAlert :: AlertId -> Handler ()

2
Assistant/WebApp/Types.hs
View file

@ -78,7 +78,7 @@ instance Yesod WebApp where
addScript $ StaticR js_jquery_full_js
addScript $ StaticR js_bootstrap_js
$(widgetFile "error")
giveUrlRenderer $(hamletFile $ hamletTemplate "bootstrap")
withUrlRenderer $(hamletFile $ hamletTemplate "bootstrap")
instance RenderMessage WebApp FormMessage where
renderMessage _ _ = defaultFormMessage