diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-13 15:36:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-13 15:36:34 -0400 |
| commit | c5a3698d1b994c5149d417852f690cf3864bce74 (patch) | |
| tree | b0af7f38af7e06149c0c075763bd27f28105b2a6 | |
| parent | a78e4b007efaedf7e04ce33aa855cfae47033aeb (diff) | |
Fix build of assistant without yesod.
| -rw-r--r-- | Assistant/Alert.hs | 12 | ||||
| -rw-r--r-- | Assistant/NetMessager.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/Assistant/Alert.hs b/Assistant/Alert.hs index 7e825d8b2..e953e1a5e 100644 --- a/Assistant/Alert.hs +++ b/Assistant/Alert.hs @@ -18,7 +18,6 @@ import qualified Data.Text as T import Data.Text (Text) import qualified Data.Map as M import Data.String -import Yesod {- Different classes of alerts are displayed differently. -} data AlertClass = Success | Message | Activity | Warning | Error @@ -57,17 +56,6 @@ data Alert = Alert data AlertIcon = ActivityIcon | SuccessIcon | ErrorIcon | InfoIcon | TheCloud -htmlIcon :: AlertIcon -> GWidget sub master () -htmlIcon ActivityIcon = bootStrapIcon "refresh" -htmlIcon InfoIcon = bootStrapIcon "info-sign" -htmlIcon SuccessIcon = bootStrapIcon "ok" -htmlIcon ErrorIcon = bootStrapIcon "exclamation-sign" --- utf-8 umbrella (utf-8 cloud looks too stormy) -htmlIcon TheCloud = [whamlet|☂|] - -bootStrapIcon :: Text -> GWidget sub master () -bootStrapIcon name = [whamlet|<i .icon-#{name}></i>|] - {- When clicked, a button always redirects to a URL - It may also run an IO action in the background, which is useful - to make the button close or otherwise change the alert. -} diff --git a/Assistant/NetMessager.hs b/Assistant/NetMessager.hs index d9450ad27..05dfd05a3 100644 --- a/Assistant/NetMessager.hs +++ b/Assistant/NetMessager.hs @@ -9,7 +9,6 @@ module Assistant.NetMessager where import Assistant.Common import Assistant.Types.NetMessager -import qualified Types.Remote as Remote import qualified Git import Control.Concurrent @@ -17,7 +16,6 @@ import Control.Concurrent.STM import Control.Concurrent.MSampleVar import Control.Exception as E import qualified Data.Set as S -import qualified Data.Text as T sendNetMessage :: NetMessage -> Assistant () sendNetMessage m = @@ -95,3 +93,4 @@ queueNetPushMessage _ = return False waitNetPushMessage :: PushSide -> Assistant (NetMessage) waitNetPushMessage side = (atomically . readTChan) <<~ (getSide side . netMessagesPush . netMessager) + diff --git a/debian/changelog b/debian/changelog index aefab49fa..1114a45e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ git-annex (3.20121113) UNRELEASED; urgency=low * Show error message to user when testing XMPP creds. + * Fix build of assistant without yesod. -- Joey Hess <joeyh@debian.org> Tue, 13 Nov 2012 13:17:07 -0400 |