diff options
| author | Camil Staps | 2015-05-20 17:05:58 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-05-20 17:05:58 +0200 |
| commit | b52e4935cf8e2ef69d2f9bffaaac45fdde60e6bf (patch) | |
| tree | 1497272b7bc9887e1485bb82252f10ead0addc46 /src/include | |
| parent | Fix bower bootswatch dependency (diff) | |
| parent | Fixed gulpfile bug where // in a URL was turned into http:// automatically by... (diff) | |
Merge branch 'web-only' of ../../Botleagues_old
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/foot.jade | 4 | ||||
| -rw-r--r-- | src/include/layout-main.jade | 45 |
2 files changed, 44 insertions, 5 deletions
diff --git a/src/include/foot.jade b/src/include/foot.jade index 1e383f2..4c8a7a1 100644 --- a/src/include/foot.jade +++ b/src/include/foot.jade @@ -2,4 +2,6 @@ script(src='/assets/js/script.js', type='text/javascript') script(src='/assets/js/Botleagues.js', type='text/javascript') script(src='/assets/js/BotleaguesCallback.js', type='text/javascript') script(src='/assets/js/BotleaguesFrontend.js', type='text/javascript') -script(src='/assets/js/forms.js', type='text/javascript')
\ No newline at end of file + +script(src='/assets/js/forms.js', type='text/javascript') +script(src='/assets/js/main.js', type='text/javascript')
\ No newline at end of file diff --git a/src/include/layout-main.jade b/src/include/layout-main.jade index 72331ee..12c283e 100644 --- a/src/include/layout-main.jade +++ b/src/include/layout-main.jade @@ -9,22 +9,59 @@ html(lang="en") block menu -var selected = '/'; //default - -var menu = { 'Home': '/', 'About': '/about', 'Contact': '/contact' }; + -var menu = { 'Home': '/', 'About': '/about' }; .header.clearfix - nav: ul.nav.nav-pills.pull-right + nav: ul.nav.nav-pills.pull-right#nav each val, key in menu if selected === val li.active(role='presentation'): a(href=val,title=key)= key else li(role='presentation'): a(href=val,title=key)= key - h3 Botleagues + li.login-link(role='presentation'): a.btn-botleagues-login(href='#',title='Login') Login + h3: a.no-style(href='/') Botleagues #messages + #login-block + form.form-inline#login-form(action='#',method='post') + .form-group + input.form-control#login-email(type='email',placeholder='Email') + | + .form-group + input.form-control#login-password(type='password',placeholder='Password') + | + .form-group + button.btn.btn-default.pull-right#login-submit(role='submit') Login + br(style='clear:both;') + + -var header_jumbotron = false + block header + + -if (header_jumbotron) + .jumbotron + h1= header_title + -if (header_subtitle) + p.lead= header_subtitle + p.row + block header_content + -else + .row + .col-lg-12 + .bs-component + h1= header_title + -if (header_subtitle) + p.lead= header_subtitle + p.row + block header_content + block content footer.footer: :markdown © [ViviSoft](http://vivisoft.nl/) 2015 - include ./foot.jade
\ No newline at end of file + script(type='text/javascript')!= 'var selected_page = "' + selected + '";' + + include ./foot.jade + + block js
\ No newline at end of file |