diff options
| author | jessib <jessib@riseup.net> | 2013-11-18 09:57:02 -0800 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-11-18 09:57:02 -0800 |
| commit | ab2e014df85b7f931a717ed49d9b9678f6f1c5a0 (patch) | |
| tree | 568a7e8cb47349431553ec5667dddcaaf57d206b /core/app | |
| parent | 3104677b8d96cd4a118022267abc7bed818f8ddd (diff) | |
| parent | 7a107e0d38271e7103d3494e06d52f3434022f22 (diff) | |
Merge branch 'develop' into feature/rename_ticket_title_to_subject
Diffstat (limited to 'core/app')
| -rw-r--r-- | core/app/helpers/download_helper.rb | 2 | ||||
| -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 |
3 files changed, 10 insertions, 6 deletions
diff --git a/core/app/helpers/download_helper.rb b/core/app/helpers/download_helper.rb index f9c6c40..ee0fe73 100644 --- a/core/app/helpers/download_helper.rb +++ b/core/app/helpers/download_helper.rb @@ -2,7 +2,7 @@ module DownloadHelper def alternative_client_links(os = nil) alternative_clients(os).map do |client| - link_to(client.capitalize, client_download_url(client)) + link_to(I18n.t("os."+client), client_download_url(client)) end end 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') |