Merge pull request #779 from sparc-request/kg-new_dashboard_header

KG - New Dashboard Header
sparc-request · Dec 5, 2016 · fb026f9 · fb026f9
2 parents b3ba7db + 283aba5
commit fb026f9
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 33 deletions.
diff --git a/app/assets/images/dashboard/logos/dashboard_logo.jpg b/app/assets/images/dashboard/logos/dashboard_logo.jpg
diff --git a/app/views/dashboard/shared/_authorization_error.html.haml b/app/views/dashboard/shared/_authorization_error.html.haml
@@ -38,7 +38,7 @@
   %body#body
     #container
       #header
-        = render 'layouts/dashboard/header_logos', in_dashboard: true
+        = render 'layouts/header_logos', location: "dashboard"
         %input#current_user_id{type: 'hidden', value: @user.try(:id)}
       = render 'layouts/dashboard/dashboard_header', user: @user
       .flash

diff --git a/app/views/layouts/_header_logos.html.haml b/app/views/layouts/_header_logos.html.haml
@@ -22,7 +22,10 @@
     = image_tag 'sctr_header.jpg', alt: 'org_logo', class: 'org-logo', height: 110
 .col-md-6
   %a{ href: HEADER_LINK_2 }
-    = image_tag 'sparc_request_header.jpg', alt: 'sparc_logo', class: 'sparc-request-header', height: 110
+    - if location == "proper"
+      = image_tag 'sparc_request_header.jpg', alt: 'sparc_logo', class: 'sparc-request-header', height: 110
+    - elsif location == "dashboard"
+      = image_tag 'dashboard/logos/dashboard_logo.jpg', alt: 'dashboard_logo', class: 'sparc-request-header', height: 110
 .col-md-3
   %a{ href: HEADER_LINK_3, target: '_blank' }
     = image_tag 'musc_header.jpg', alt: 'institution_logo', class: 'institution-logo', height: 110
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -38,7 +38,7 @@
   %body#body
     #container
       #header
-        = render 'layouts/header_logos', in_dashboard: false
+        = render 'layouts/header_logos', location: "proper"
         %input#current_user_id{ type: 'hidden', value: @user.try(:id) }
       = render 'layouts/header', user: @user
       .flash

diff --git a/app/views/layouts/dashboard/_header_logos.html.haml b/app/views/layouts/dashboard/_header_logos.html.haml
diff --git a/app/views/layouts/dashboard/application.html.haml b/app/views/layouts/dashboard/application.html.haml
@@ -38,7 +38,7 @@
   %body#body
     #container
       #header
-        = render 'layouts/header_logos'
+        = render 'layouts/header_logos', location: "dashboard"
         %input#current_user_id{type: 'hidden', value: @user.try(:id)}
       = render 'layouts/dashboard/dashboard_header', user: @user
       .flash