diff options
| author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
| commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
| tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /app/views/home/index.html.haml | |
| parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'app/views/home/index.html.haml')
| -rw-r--r-- | app/views/home/index.html.haml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index c02dcad..8c90436 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -1,11 +1,12 @@ -Try to fetch a -= link_to "cert", cert_path +%h1= t(:welcome, :provider => APP_CONFIG[:domain]) -%p -Create a -= link_to "ticket", new_ticket_path +%p + We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later). -- if logged_in? - %p - See all - = link_to "tickets", tickets_path += home_page_buttons + +- if Rails.env == 'development' + .row-fluid + %hr + %p + = link_to "fetch a cert", cert_path |