diff options
author | azul <azul@riseup.net> | 2014-05-06 09:35:35 +0200 |
---|---|---|
committer | azul <azul@riseup.net> | 2014-05-06 09:35:35 +0200 |
commit | a4131d472329dc6416623691dcc956dc32793638 (patch) | |
tree | ba74769a2f0781ccbdd920f6e47f0de7cc7c7661 /app/views | |
parent | 55fcdd3975baf6f6e167ab5164203ab9a2245186 (diff) | |
parent | f1c45566aaa06a1a4b2d2bb1f9b5abb4ab645dab (diff) |
Merge pull request #155 from azul/feature/simplify-download-btn
Feature/simplify download btn
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/common/_download_button.html.haml | 4 | ||||
-rw-r--r-- | app/views/common/_download_for_os.html.haml | 17 | ||||
-rw-r--r-- | app/views/users/show.html.haml | 7 |
3 files changed, 9 insertions, 19 deletions
diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml index 157c40a..e57c56b 100644 --- a/app/views/common/_download_button.html.haml +++ b/app/views/common/_download_button.html.haml @@ -2,5 +2,7 @@ .row-fluid.first .span2 .download.span8 - = render partial: 'common/download_for_os', collection: available_clients + ['other'] + = link_to client_download_url, class: "btn btn-large btn-primary" do + = big_icon('download') + = t(:download_client) .span2 diff --git a/app/views/common/_download_for_os.html.haml b/app/views/common/_download_for_os.html.haml deleted file mode 100644 index 3a11d10..0000000 --- a/app/views/common/_download_for_os.html.haml +++ /dev/null @@ -1,17 +0,0 @@ -- os = download_for_os -%div{:class => "os-#{os}"} - %span.link - - btn_class = (os == "other") ? "disabled" : "btn-primary" - = link_to client_download_url(os), :class => "btn btn-large #{btn_class}" do - = big_icon('download') - .pull-right - = t(:download_client) - %br/ - %small= I18n.t("os.#{os}") - %span.info - %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 - = t(:other_downloads_info, :clients => alternative_client_links(os).to_sentence).html_safe diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 3c73147..ddc33ab 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -20,6 +20,11 @@ - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly} %li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user)) %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:billing] + + .container-fluid .row-fluid - = render 'common/download_button' + %h4 To use bitmask services: + = link_to client_download_url, class: "btn btn-primary" do + %i.icon-arrow-down.icon-white + = t(:download_client) |