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

3 files changed, 16 insertions, 12 deletions

diff --git a/core/app/helpers/core_helper.rb b/core/app/helpers/core_helper.rb
index 4126906..a6c7479 100644
--- a/core/app/helpers/core_helper.rb
+++ b/core/app/helpers/core_helper.rb
@@ -6,8 +6,8 @@ module CoreHelper
   #
   # insert common buttons (download, login, etc)
   #
-  def home_page_buttons
-    render 'common/home_page_buttons'
+  def home_page_buttons(on_user_page = false)
+    render 'common/home_page_buttons', {:on_user_page => on_user_page}
   end
 
 end
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)
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
index 4c710a0..c587017 100644
--- a/users/app/views/users/show.html.haml
+++ b/users/app/views/users/show.html.haml
@@ -20,3 +20,6 @@
     - # %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
+      = home_page_buttons(true)
\ No newline at end of file