move all static site files out of subdirectories

Works around yesod-static path bug on windows.
https://github.com/yesodweb/yesod/issues/626
This commit is contained in:
Joey Hess 2013-12-09 14:38:22 -04:00
parent 9f68bb546c
commit 8fb1973c76
10 changed files with 10 additions and 10 deletions

View file

@ -59,12 +59,12 @@ customPage' with_longpolling navbaritem content = do
Nothing -> do Nothing -> do
navbar <- map navdetails <$> selectNavBar navbar <- map navdetails <$> selectNavBar
pageinfo <- widgetToPageContent $ do pageinfo <- widgetToPageContent $ do
addStylesheet $ StaticR css_bootstrap_css addStylesheet $ StaticR bootstrap_css
addStylesheet $ StaticR css_bootstrap_responsive_css addStylesheet $ StaticR bootstrap_responsive_css
addScript $ StaticR jquery_full_js addScript $ StaticR jquery_full_js
addScript $ StaticR js_bootstrap_dropdown_js addScript $ StaticR bootstrap_dropdown_js
addScript $ StaticR js_bootstrap_modal_js addScript $ StaticR bootstrap_modal_js
addScript $ StaticR js_bootstrap_collapse_js addScript $ StaticR bootstrap_collapse_js
when with_longpolling $ when with_longpolling $
addScript $ StaticR longpolling_js addScript $ StaticR longpolling_js
$(widgetFile "page") $(widgetFile "page")

View file

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

2
debian/copyright vendored
View file

@ -88,7 +88,7 @@ License: MIT or GPL-2
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Files: static/*/bootstrap* static/img/glyphicons-halflings* Files: static/bootstrap* static/glyphicons-halflings*
Copyright: 2012 Twitter, Inc. Copyright: 2012 Twitter, Inc.
License: Apache-2.0 License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");

View file

@ -1778,7 +1778,7 @@ table .span24 {
*margin-right: .3em; *margin-right: .3em;
line-height: 14px; line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url("../img/glyphicons-halflings.png"); background-image: url("glyphicons-halflings.png");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
@ -1789,7 +1789,7 @@ table .span24 {
} }
.icon-white { .icon-white {
background-image: url("../img/glyphicons-halflings-white.png"); background-image: url("glyphicons-halflings-white.png");
} }
.icon-glass { .icon-glass {

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB