From c0ca6f44ac2cbe6d1cbb82bc73e2d2ead7695770 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 27 Jul 2012 20:47:48 -0400 Subject: [PATCH] template reorg --- Assistant/Threads/WebApp.hs | 3 +-- static/css/webapp.css | 7 ------ templates/bootstrap.hamlet | 40 +------------------------------ templates/default-layout.hamlet | 3 --- templates/page.cassius | 5 ++++ templates/page.hamlet | 42 +++++++++++++++++++++++++++++++++ 6 files changed, 49 insertions(+), 51 deletions(-) delete mode 100644 static/css/webapp.css delete mode 100644 templates/default-layout.hamlet create mode 100644 templates/page.cassius create mode 100644 templates/page.hamlet diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 5407ed1954..92f7ff2535 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -61,11 +61,10 @@ instance Yesod WebApp where page <- widgetToPageContent $ do addStylesheet $ StaticR css_bootstrap_css addStylesheet $ StaticR css_bootstrap_responsive_css - addStylesheet $ StaticR css_webapp_css addScript $ StaticR jquery_full_js addScript $ StaticR js_bootstrap_dropdown_js addScript $ StaticR js_bootstrap_alert_js - $(widgetFile "default-layout") + $(widgetFile "page") hamletToRepHtml $(hamletFile $ hamletTemplate "bootstrap") {- Require an auth token be set when accessing any (non-static route) -} diff --git a/static/css/webapp.css b/static/css/webapp.css deleted file mode 100644 index ba309effa6..0000000000 --- a/static/css/webapp.css +++ /dev/null @@ -1,7 +0,0 @@ -body { - padding-top: 60px; - padding-bottom: 40px; -} -.sidebar-nav { - padding: 9px 0; -} diff --git a/templates/bootstrap.hamlet b/templates/bootstrap.hamlet index 360b3d686d..389895df74 100644 --- a/templates/bootstrap.hamlet +++ b/templates/bootstrap.hamlet @@ -6,42 +6,4 @@ $doctype 5 ^{pageHead page} - -
-
-
- - git-annex -
    -
  • - Dashboard -
  • - Config -
      -
    • - - Current Repository: #{baseTitle webapp} - -
        -
      • #{baseTitle webapp}
        • -
      • -
      • Add new repository
        • - -
        -
        -
        -
        -
        - × - This is just a demo. If this were not just a demo, - I'd not be filling this sidebar with silly alerts. -
        - × - Well done! - You successfully read this important alert message. -
        - × - Whoops! - Unable to connect to blah blah.. -
        - ^{pageBody page} + ^{pageBody page} diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet deleted file mode 100644 index 3701e3c42f..0000000000 --- a/templates/default-layout.hamlet +++ /dev/null @@ -1,3 +0,0 @@ -$maybe msg <- mmsg -
        #{msg} -^{widget} diff --git a/templates/page.cassius b/templates/page.cassius new file mode 100644 index 0000000000..39decd03a4 --- /dev/null +++ b/templates/page.cassius @@ -0,0 +1,5 @@ +body + padding-top: 60px + padding-bottom: 40px +.sidebar-nav + padding: 9px 0 diff --git a/templates/page.hamlet b/templates/page.hamlet new file mode 100644 index 0000000000..ae80bb05d5 --- /dev/null +++ b/templates/page.hamlet @@ -0,0 +1,42 @@ +
        +
        +
        + + git-annex +