summaryrefslogtreecommitdiff
path: root/core/app/views
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-12-23 00:03:11 +0100
committerAzul <azul@leap.se>2013-12-23 00:03:11 +0100
commit5f00ae48047f32f9068281af65fb349a7e79c22d (patch)
tree2f6647bad105eae5cd1c8dad44ac77c603d71e8b /core/app/views
parent4c5851dfac51453571427535419469fe1b73a81d (diff)
parenta5fa80ca1e20591f25f63d1702a9bc134c60b9ba (diff)
Merge remote-tracking branch 'jessib/feature/3389_download_links' into develop
Conflicts: core/app/views/common/_home_page_buttons.html.haml users/app/views/users/show.html.haml
Diffstat (limited to 'core/app/views')
-rw-r--r--core/app/views/common/_home_page_buttons.html.haml21
1 files changed, 11 insertions, 10 deletions
diff --git a/core/app/views/common/_home_page_buttons.html.haml b/core/app/views/common/_home_page_buttons.html.haml
index 4c3fc5b..c9ea7a2 100644
--- a/core/app/views/common/_home_page_buttons.html.haml
+++ b/core/app/views/common/_home_page_buttons.html.haml
@@ -10,13 +10,14 @@
.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')
- %span.info= t(:login_info)
- .signup.span4
- %span.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn')
- %span.info= t(:signup_info)
- .help.span4
- %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn')
- %span.info= t(:help_info)
+ - if !local_assigns[:on_user_page]
+ .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)
+ .signup.span4
+ %span.link= link_to(icon('user', icon_color) + t(:signup), signup_path, :class => 'btn')
+ %span.info= t(:signup_info)
+ .help.span4
+ %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), new_ticket_path, :class => 'btn')
+ %span.info= t(:help_info)