diff options
author | Azul <azul@leap.se> | 2013-11-15 11:53:21 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-11-15 11:53:21 +0100 |
commit | 8b49ee15466b728213ec7f8bd4c8462876625acf (patch) | |
tree | c301a8033650a1067c9caf012669d1a47d6f2a0c /core/app/views | |
parent | 7e93258f552d6fd1114626561e6393aa483228fe (diff) | |
parent | 7a107e0d38271e7103d3494e06d52f3434022f22 (diff) |
Merge branch 'develop'
Diffstat (limited to 'core/app/views')
-rw-r--r-- | core/app/views/common/_download_for_os.html.haml | 4 | ||||
-rw-r--r-- | core/app/views/common/_home_page_buttons.html.haml | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml index b7c88ba..4c096ce 100644 --- a/core/app/views/common/_download_for_os.html.haml +++ b/core/app/views/common/_download_for_os.html.haml @@ -8,8 +8,8 @@ %br/ %small= I18n.t("os.#{os}") %span.info - = t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe - %br/ + %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe + %div - if os == "other" = t(:all_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe - else diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml index e10fd38..3be12e2 100644 --- a/core/app/views/common/_home_page_buttons.html.haml +++ b/core/app/views/common/_home_page_buttons.html.haml @@ -2,10 +2,14 @@ .home-buttons .row-fluid.first - .span3 - .download.span6 + .span2 + .download.span8 = render partial: 'common/download_for_os', collection: available_clients + ['other'] - .span3 + .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') |