diff --git a/Assistant/WebApp/Page.hs b/Assistant/WebApp/Page.hs index 6fac47c379..7843204b25 100644 --- a/Assistant/WebApp/Page.hs +++ b/Assistant/WebApp/Page.hs @@ -59,12 +59,12 @@ customPage' with_longpolling navbaritem content = do Nothing -> do navbar <- map navdetails <$> selectNavBar pageinfo <- widgetToPageContent $ do - addStylesheet $ StaticR css_bootstrap_css - addStylesheet $ StaticR css_bootstrap_responsive_css + addStylesheet $ StaticR bootstrap_css + addStylesheet $ StaticR bootstrap_responsive_css addScript $ StaticR jquery_full_js - addScript $ StaticR js_bootstrap_dropdown_js - addScript $ StaticR js_bootstrap_modal_js - addScript $ StaticR js_bootstrap_collapse_js + addScript $ StaticR bootstrap_dropdown_js + addScript $ StaticR bootstrap_modal_js + addScript $ StaticR bootstrap_collapse_js when with_longpolling $ addScript $ StaticR longpolling_js $(widgetFile "page") diff --git a/Assistant/WebApp/Types.hs b/Assistant/WebApp/Types.hs index 937324934a..7a23e4f58d 100644 --- a/Assistant/WebApp/Types.hs +++ b/Assistant/WebApp/Types.hs @@ -73,8 +73,8 @@ instance Yesod WebApp where defaultLayout content = do webapp <- getYesod pageinfo <- widgetToPageContent $ do - addStylesheet $ StaticR css_bootstrap_css - addStylesheet $ StaticR css_bootstrap_responsive_css + addStylesheet $ StaticR bootstrap_css + addStylesheet $ StaticR bootstrap_responsive_css $(widgetFile "error") giveUrlRenderer $(hamletFile $ hamletTemplate "bootstrap") diff --git a/debian/copyright b/debian/copyright index e91cddbb5c..a13cf175f8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -88,7 +88,7 @@ License: MIT or GPL-2 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION 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. License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/static/js/bootstrap-collapse.js b/static/bootstrap-collapse.js similarity index 100% rename from static/js/bootstrap-collapse.js rename to static/bootstrap-collapse.js diff --git a/static/js/bootstrap-dropdown.js b/static/bootstrap-dropdown.js similarity index 100% rename from static/js/bootstrap-dropdown.js rename to static/bootstrap-dropdown.js diff --git a/static/js/bootstrap-modal.js b/static/bootstrap-modal.js similarity index 100% rename from static/js/bootstrap-modal.js rename to static/bootstrap-modal.js diff --git a/static/css/bootstrap-responsive.css b/static/bootstrap-responsive.css similarity index 100% rename from static/css/bootstrap-responsive.css rename to static/bootstrap-responsive.css diff --git a/static/css/bootstrap.css b/static/bootstrap.css similarity index 99% rename from static/css/bootstrap.css rename to static/bootstrap.css index bb40c85f7d..5ada6dd540 100644 --- a/static/css/bootstrap.css +++ b/static/bootstrap.css @@ -1778,7 +1778,7 @@ table .span24 { *margin-right: .3em; line-height: 14px; vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); + background-image: url("glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; } @@ -1789,7 +1789,7 @@ table .span24 { } .icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); + background-image: url("glyphicons-halflings-white.png"); } .icon-glass { diff --git a/static/img/glyphicons-halflings-white.png b/static/glyphicons-halflings-white.png similarity index 100% rename from static/img/glyphicons-halflings-white.png rename to static/glyphicons-halflings-white.png diff --git a/static/img/glyphicons-halflings.png b/static/glyphicons-halflings.png similarity index 100% rename from static/img/glyphicons-halflings.png rename to static/glyphicons-halflings.png