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

more accurate bounds on yesod boostrap3 ifdefs

Browse source
This commit is contained in:
Joey Hess 2014-10-13 15:32:41 -04:00
parent 01fccea421
commit e6eff0e951
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Assistant/WebApp/Form.hs
View file

@ -18,14 +18,17 @@ import Assistant.Gpg
#if MIN_VERSION_yesod(1,2,0) #if MIN_VERSION_yesod(1,2,0)
import Yesod hiding (textField, passwordField) import Yesod hiding (textField, passwordField)
import Yesod.Form.Fields as F import Yesod.Form.Fields as F
import Yesod.Form.Bootstrap3 hiding (bfs)
#else #else
import Yesod hiding (textField, passwordField, selectField, selectFieldList) import Yesod hiding (textField, passwordField, selectField, selectFieldList)
import Yesod.Form.Fields as F hiding (selectField, selectFieldList) import Yesod.Form.Fields as F hiding (selectField, selectFieldList)
import Data.String (IsString (..)) import Data.String (IsString (..))
import Control.Monad (unless) import Control.Monad (unless)
import Data.Maybe (listToMaybe) import Data.Maybe (listToMaybe)
import Assistant.WebApp.Bootstrap3 hiding (bfs) #endif
#if MIN_VERSION_yesod_form(1,3,8)
import Yesod.Form.Bootstrap3 as Y hiding (bfs)
#else
import Assistant.WebApp.Bootstrap3 as Y hiding (bfs)
#endif #endif
import Data.Text (Text) import Data.Text (Text)

5
Utility/Yesod.hs
View file

@ -25,9 +25,12 @@ module Utility.Yesod
#if MIN_VERSION_yesod(1,2,0) #if MIN_VERSION_yesod(1,2,0)
import Yesod as Y import Yesod as Y
import Yesod.Form.Bootstrap3 as Y hiding (bfs)
#else #else
import Yesod as Y hiding (Html) import Yesod as Y hiding (Html)
#endif
#if MIN_VERSION_yesod_form(1,3,8)
import Yesod.Form.Bootstrap3 as Y hiding (bfs)
#else
import Assistant.WebApp.Bootstrap3 as Y hiding (bfs) import Assistant.WebApp.Bootstrap3 as Y hiding (bfs)
#endif #endif
#ifndef __NO_TH__ #ifndef __NO_TH__