diff options
| author | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2014-01-27 10:30:11 -0800 |
| commit | 7e0573f3347dca6323eae05127849431ecbceb77 (patch) | |
| tree | 8a6ff58fdcc93493b5a8f332350b0a9292119906 /app/views/home/index.html.haml | |
| parent | 3bfbf0ad20bb5b8e4689fda287cd47738571d10d (diff) | |
| parent | d578c07e196cd9758fbf1752a9bb8477c260bb30 (diff) | |
Merge branch 'develop' into feature/messages_api
Conflicts:
users/config/locales/en.yml
Diffstat (limited to 'app/views/home/index.html.haml')
| -rw-r--r-- | app/views/home/index.html.haml | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index 67b2c06..147cacd 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,21 +1,9 @@ -#main - .container-fluid - .row-fluid - %h1= t(:welcome, :provider => APP_CONFIG[:domain]) - - %p - We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later). - - .row-fluid - .span6.offset3 - = render 'layouts/messages' - .row-fluid - = home_page_buttons - - - if Rails.env == 'development' - .row-fluid - %hr - %p - = link_to "fetch a cert", cert_path - %p - = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present? +#wrap + = render 'home/masthead' + #main + .container-fluid + = render 'home/content' + #push + -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 +#footer + = render 'layouts/footer'
\ No newline at end of file |