diff options
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 3 | ||||
| -rw-r--r-- | static/css/webapp.css | 7 | ||||
| -rw-r--r-- | templates/bootstrap.hamlet | 40 | ||||
| -rw-r--r-- | templates/default-layout.hamlet | 3 | ||||
| -rw-r--r-- | templates/page.cassius | 5 | ||||
| -rw-r--r-- | templates/page.hamlet | 42 |
6 files changed, 49 insertions, 51 deletions
diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 5407ed195..92f7ff253 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 ba309effa..000000000 --- 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 360b3d686..389895df7 100644 --- a/templates/bootstrap.hamlet +++ b/templates/bootstrap.hamlet @@ -6,42 +6,4 @@ $doctype 5 <meta name="viewport" content="width=device-width,initial-scale=1.0"> ^{pageHead page} <body> - - <div .navbar .navbar-fixed-top> - <div .navbar-inner> - <div .container> - <a .brand href="#"> - git-annex - <ul .nav> - <li .active> - <a href="#">Dashboard</a> - <li> - <a href="@{ConfigR}">Config</a> - <ul .nav .pull-right> - <li .dropdown #menu1> - <a .dropdown-toggle data-toggle="dropdown" href="#menu1"> - Current Repository: #{baseTitle webapp} - <b .caret></b> - <ul .dropdown-menu> - <li><a href="#">#{baseTitle webapp}</a></li> - <li .divider></li> - <li><a href="#">Add new repository</a></li> - - <div .container-fluid> - <div .row-fluid> - <div .span3> - <div .sidebar-nav> - <div .alert .alert-info> - <a .close data-dismiss="alert" href="#">×</a> - <b>This is just a demo.</b> If this were not just a demo, - I'd not be filling this sidebar with silly alerts. - <div .alert .alert-success> - <a .close data-dismiss="alert" href="#">×</a> - <b>Well done!</b> - You successfully read this important alert message. - <div .alert .alert-error> - <a .close data-dismiss="alert" href="#">×</a> - <b>Whoops!</b> - Unable to connect to blah blah.. - <div .span9> - ^{pageBody page} + ^{pageBody page} diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet deleted file mode 100644 index 3701e3c42..000000000 --- a/templates/default-layout.hamlet +++ /dev/null @@ -1,3 +0,0 @@ -$maybe msg <- mmsg - <div #message>#{msg} -^{widget} diff --git a/templates/page.cassius b/templates/page.cassius new file mode 100644 index 000000000..39decd03a --- /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 000000000..ae80bb05d --- /dev/null +++ b/templates/page.hamlet @@ -0,0 +1,42 @@ +<div .navbar .navbar-fixed-top> + <div .navbar-inner> + <div .container> + <a .brand href="#"> + git-annex + <ul .nav> + <li .active> + <a href="#">Dashboard</a> + <li> + <a href="@{ConfigR}">Config</a> + <ul .nav .pull-right> + <li .dropdown #menu1> + <a .dropdown-toggle data-toggle="dropdown" href="#menu1"> + Current Repository: #{baseTitle webapp} + <b .caret></b> + <ul .dropdown-menu> + <li><a href="#">#{baseTitle webapp}</a></li> + <li .divider></li> + <li><a href="#">Add new repository</a></li> + +<div .container-fluid> + <div .row-fluid> + <div .span3> + <div .sidebar-nav> + <div .alert .alert-info> + <a .close data-dismiss="alert" href="#">×</a> + <b>This is just a demo.</b> If this were not just a demo, + I'd not be filling this sidebar with silly alerts. + <div .alert .alert-success> + <a .close data-dismiss="alert" href="#">×</a> + <b>Well done!</b> + You successfully read this important alert message. + <div .alert .alert-error> + <a .close data-dismiss="alert" href="#">×</a> + <b>Whoops!</b> + Unable to connect to blah blah.. + <div .span9> + $maybe msg <- mmsg + <div .alert .alert-info> + <a .close data-dismiss="alert" href="#">×</a> + #{msg} + ^{widget} |