diff --git a/Assistant/WebApp/Configurators/Edit.hs b/Assistant/WebApp/Configurators/Edit.hs index 6e7cbef5b3..a8ceeb5e03 100644 --- a/Assistant/WebApp/Configurators/Edit.hs +++ b/Assistant/WebApp/Configurators/Edit.hs @@ -199,7 +199,7 @@ editForm new (RepoUUID uuid) = page "Edit repository" (Just Configuration) $ do let repoInfo = getRepoInfo mremote config let repoEncryption = getRepoEncryption mremote config $(widgetFile "configurators/edit/repository") -editForm new r@(RepoName _) = page "Edit repository" (Just Configuration) $ do +editForm _new r@(RepoName _) = page "Edit repository" (Just Configuration) $ do mr <- liftAnnex (repoIdRemote r) let repoInfo = getRepoInfo mr Nothing g <- liftAnnex gitRepo diff --git a/Assistant/WebApp/DashBoard.hs b/Assistant/WebApp/DashBoard.hs index 26eb52d784..b33919b347 100644 --- a/Assistant/WebApp/DashBoard.hs +++ b/Assistant/WebApp/DashBoard.hs @@ -28,9 +28,8 @@ import qualified Data.Map as M import Control.Concurrent {- A display of currently running and queued transfers. -} -transfersDisplay :: Bool -> Widget -transfersDisplay warnNoScript = do - webapp <- liftH getYesod +transfersDisplay :: Widget +transfersDisplay = do current <- liftAssistant $ M.toList <$> getCurrentTransfers queued <- take 10 <$> liftAssistant getTransferQueue autoUpdate ident NotifierTransfersR (10 :: Int) (10 :: Int) @@ -66,7 +65,7 @@ getTransfersR :: NotificationId -> Handler Html getTransfersR nid = do waitNotifier getTransferBroadcaster nid - p <- widgetToPageContent $ transfersDisplay False + p <- widgetToPageContent transfersDisplay giveUrlRenderer $ [hamlet|^{pageBody p}|] {- The main dashboard. -} @@ -74,7 +73,7 @@ dashboard :: Bool -> Widget dashboard warnNoScript = do let repolist = repoListDisplay $ mainRepoSelector { nudgeAddMore = True } - let transferlist = transfersDisplay warnNoScript + let transferlist = transfersDisplay $(widgetFile "dashboard/main") getDashboardR :: Handler Html @@ -94,7 +93,6 @@ getNoScriptR = page "" (Just DashBoard) $ dashboard False {- Same as DashboardR, except with autorefreshing via meta refresh. -} getNoScriptAutoR :: Handler Html getNoScriptAutoR = page "" (Just DashBoard) $ do - let ident = NoScriptR let delayseconds = 3 :: Int let this = NoScriptAutoR toWidgetHead $(Hamlet.hamletFile $ hamletTemplate "dashboard/metarefresh")