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

update bootstrap files to bootstrap3

Browse source
This commit is contained in:
Sören Brunk 2014-04-07 19:37:03 +02:00
parent 4d4797b8c8
commit c8dccf9582
23 changed files with 8323 additions and 6251 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assistant/WebApp/Page.hs
View file

@ -59,14 +59,12 @@ customPage' with_longpolling navbaritem content = do
Nothing -> do
navbar <- map navdetails <$> selectNavBar
pageinfo <- widgetToPageContent $ do
addStylesheet $ StaticR bootstrap_css
addStylesheet $ StaticR bootstrap_responsive_css
addScript $ StaticR jquery_full_js
addScript $ StaticR bootstrap_dropdown_js
addScript $ StaticR bootstrap_modal_js
addScript $ StaticR bootstrap_collapse_js
addStylesheet $ StaticR css_bootstrap_css
addStylesheet $ StaticR css_bootstrap_theme_css
addScript $ StaticR js_jquery_full_js
addScript $ StaticR js_bootstrap_js
when with_longpolling $
addScript $ StaticR longpolling_js
addScript $ StaticR js_longpolling_js
$(widgetFile "page")
giveUrlRenderer $(Hamlet.hamletFile $ hamletTemplate "bootstrap")
Just msg -> error msg

8
Assistant/WebApp/RepoList.hs
View file

@ -113,10 +113,10 @@ cloudRepoList = repoListDisplay RepoSelector
repoListDisplay :: RepoSelector -> Widget
repoListDisplay reposelector = do
autoUpdate ident (NotifierRepoListR reposelector) (10 :: Int) (10 :: Int)
addScript $ StaticR jquery_ui_core_js
addScript $ StaticR jquery_ui_widget_js
addScript $ StaticR jquery_ui_mouse_js
addScript $ StaticR jquery_ui_sortable_js
addScript $ StaticR js_jquery_ui_core_js
addScript $ StaticR js_jquery_ui_widget_js
addScript $ StaticR js_jquery_ui_mouse_js
addScript $ StaticR js_jquery_ui_sortable_js
repolist <- liftH $ repoList reposelector
let addmore = nudgeAddMore reposelector

4
Assistant/WebApp/Types.hs
View file

@ -73,8 +73,8 @@ instance Yesod WebApp where
defaultLayout content = do
webapp <- getYesod
pageinfo <- widgetToPageContent $ do
addStylesheet $ StaticR bootstrap_css
addStylesheet $ StaticR bootstrap_responsive_css
addStylesheet $ StaticR css_bootstrap_css
addStylesheet $ StaticR css_bootstrap_theme_css
$(widgetFile "error")
giveUrlRenderer $(hamletFile $ hamletTemplate "bootstrap")