diff options
| author | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-06-09 11:00:28 +0200 |
| commit | 728d6d3985126c2890638bb2ee24020fa0e36a80 (patch) | |
| tree | 1fcbb560b0103123d49fb953e86fdb960ee5dd13 /app/views/common | |
| parent | b9174fdc9d9bd403d9a16650bafc4715e3dbf2d4 (diff) | |
| parent | 9fa52ed80d71ec56ed5acf18dfd63bd03b201cc5 (diff) | |
Merge tag '0.5.2'
Diffstat (limited to 'app/views/common')
| -rw-r--r-- | app/views/common/_action_buttons.html.haml | 12 | ||||
| -rw-r--r-- | app/views/common/_download_button.html.haml | 4 | ||||
| -rw-r--r-- | app/views/common/_home_page_buttons.html.haml | 4 |
3 files changed, 9 insertions, 11 deletions
diff --git a/app/views/common/_action_buttons.html.haml b/app/views/common/_action_buttons.html.haml index c74fcd1..266abe1 100644 --- a/app/views/common/_action_buttons.html.haml +++ b/app/views/common/_action_buttons.html.haml @@ -1,11 +1,11 @@ .home-buttons .row-fluid.second .login.span4 - %span.link= link_to(icon('ok-sign', icon_color) + t(:login), login_path, :class => 'btn') - %span.info= t(:login_info) + %span.link= btn icon('ok-sign') + t(:login), login_path + %span.info= t(:login_info, default: "") .signup.span4 - %span.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn') - %span.info= t(:signup_info) + %span.link= btn icon('user') + t(:signup), signup_path + %span.info= t(:signup_info, default: "") .help.span4 - %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn') - %span.info= t(:help_info) + %span.link= btn icon('question-sign') + t(:get_help), new_ticket_path + %span.info= t(:support_info, default: "") diff --git a/app/views/common/_download_button.html.haml b/app/views/common/_download_button.html.haml index e57c56b..9c26860 100644 --- a/app/views/common/_download_button.html.haml +++ b/app/views/common/_download_button.html.haml @@ -2,7 +2,7 @@ .row-fluid.first .span2 .download.span8 - = link_to client_download_url, class: "btn btn-large btn-primary" do + = btn client_download_url, type: [:large, :primary] do = big_icon('download') - = t(:download_client) + = t(:download_bitmask) .span2 diff --git a/app/views/common/_home_page_buttons.html.haml b/app/views/common/_home_page_buttons.html.haml index 8c47983..fc6348e 100644 --- a/app/views/common/_home_page_buttons.html.haml +++ b/app/views/common/_home_page_buttons.html.haml @@ -1,8 +1,6 @@ -- icon_color = :black - = render 'common/download_button' - if local_assigns[:divider] .row-fluid .span12 = render local_assigns[:divider] -= render 'common/action_buttons', icon_color: icon_color += render 'common/action_buttons' |