diff options
| author | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-12-17 12:02:07 -0800 |
| commit | 98a247acb4d1be484c2982d48ec038eed3de3d55 (patch) | |
| tree | f176092fa43145b9d8ce00a180fab70cf62da456 /core/app/views/common/_home_page_buttons.html.haml | |
| parent | 634db9875cc8f6f6b9a4a83dfc6b8d53728eb2b5 (diff) | |
| parent | 83cd3d95b78b6df9ac33a8ee169e570f4d3e2eeb (diff) | |
Merge branch 'develop' into feature/billing-no-authenticated-payments
Conflicts:
billing/config/locales/en.yml
Diffstat (limited to 'core/app/views/common/_home_page_buttons.html.haml')
| -rw-r--r-- | core/app/views/common/_home_page_buttons.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml index 7eb4c40..3be12e2 100644 --- a/core/app/views/common/_home_page_buttons.html.haml +++ b/core/app/views/common/_home_page_buttons.html.haml @@ -2,11 +2,14 @@ .home-buttons .row-fluid.first - .span3 - .download.span6 - %span.link= link_to(big_icon('arrow-down', icon_color) + t(:download_client), "https://downloads.leap.se/client", :class => 'btn btn-large') - %span.info= t(:download_client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe - .span3 + .span2 + .download.span8 + = render partial: 'common/download_for_os', collection: available_clients + ['other'] + .span2 + - if local_assigns[:divider] + .row-fluid + .span12 + = render local_assigns[:divider] .row-fluid.second .login.span4 %span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn') |