Merge pull request #786 from sparc-request/jl-header-logo-refactor

Refactor of how the respective header logos of proper and dashboard f…
sparc-request · Dec 5, 2016 · 4963a83 · 4963a83
2 parents 086058b + 8d2e57e
commit 4963a83
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/views/layouts/_header_logos.html.haml b/app/views/layouts/_header_logos.html.haml
@@ -21,10 +21,11 @@
   %a{ href: HEADER_LINK_1 }
     = image_tag 'sctr_header.jpg', alt: 'org_logo', class: 'org-logo', height: 110
 .col-md-6
-  %a{ href: HEADER_LINK_2 }
-    - if location == "proper"
+  - if location == "proper"
+    %a{ href: HEADER_LINK_2_PROPER }
       = image_tag 'sparc_request_header.jpg', alt: 'sparc_logo', class: 'sparc-request-header', height: 110
-    - elsif location == "dashboard"
+  - elsif location == "dashboard"
+    %a{ href: HEADER_LINK_2_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' }

diff --git a/config/application.yml.example b/config/application.yml.example
@@ -31,7 +31,8 @@ development:
   dashboard_link: 'http://musc-pro.homelinux.net:3001/dashboard'
   create_an_account: false
   header_link_1: http://sctr.musc.edu
-  header_link_2: http://localhost:3000/
+  header_link_2_proper: http://localhost:3000/
+  header_link_2_dashboard: http://localhost:3000/dashboard
   header_link_3: http://www.musc.edu
   use_indirect_cost: false
   use_shiboleth: true
@@ -98,7 +99,8 @@ test:
   root_url: /
   dashboard_link: /dashboard
   header_link_1: http://sctr.musc.edu
-  header_link_2: http://localhost:3000/
+  header_link_2_proper: http://localhost:3000/
+  header_link_2_dashboard: http://localhost:3000/dashboard
   header_link_3: http://www.musc.edu
   editable_statuses: { 14: ['first_draft', 'draft', 'submitted', nil, 'get_a_cost_estimate', 'awaiting_pi_approval'],
                      48: ['draft', 'submitted'] }

diff --git a/config/initializers/01_obis_setup.rb b/config/initializers/01_obis_setup.rb
@@ -39,10 +39,11 @@
   ROOT_URL                                  = application_config['root_url']
   DASHBOARD_LINK                            = application_config['dashboard_link']
   HEADER_LINK_1                             = application_config['header_link_1']
-  HEADER_LINK_2                             = application_config['header_link_2']
+  HEADER_LINK_2_PROPER                      = application_config['header_link_2_proper']
+  HEADER_LINK_2_DASHBOARD                   = application_config['header_link_2_dashboard']
   HEADER_LINK_3                             = application_config['header_link_3']
   USE_INDIRECT_COST                         = application_config['use_indirect_cost']
-  USE_SHIBBOLETH                             = application_config['use_shiboleth']
+  USE_SHIBBOLETH                            = application_config['use_shiboleth']
   USE_SHIBBOLETH_ONLY                       = application_config['use_shibboleth_only']
   USE_LDAP                                  = application_config['use_ldap']
   SUPPRESS_LDAP_FOR_USER_SEARCH             = application_config['suppress_ldap_for_user_search'] || nil