Merge pull request #721 from sparc-request/jjh-back-to-top

Jjh back to top
sparc-request · Nov 16, 2016 · f7b799b · f7b799b
2 parents 254cd8a + a6d7aa0
commit f7b799b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 1 deletion.
diff --git a/app/assets/javascripts/catalog.js.coffee b/app/assets/javascripts/catalog.js.coffee
@@ -106,3 +106,10 @@ $(document).ready ->
       $('#modal_place').modal('show')
       $('.modal #submit-error-modal').removeClass('hidden')
       return false
+
+  $(window).scroll ->
+    if $(this).scrollTop() > 50
+      console.log('here')
+      $('.back-to-top').removeClass('hidden')
+    else
+      $('.back-to-top').addClass('hidden')
diff --git a/app/assets/stylesheets/proper/service_catalog.sass b/app/assets/stylesheets/proper/service_catalog.sass
@@ -215,3 +215,8 @@
 textarea
   resize: none
   border: 1px solid #DDD
+
+.back-to-top
+  position: fixed
+  right: 20px
+  bottom: 20px
diff --git a/app/views/catalogs/_back_to_top.html.haml b/app/views/catalogs/_back_to_top.html.haml
@@ -0,0 +1,3 @@
+%a.back-to-top.btn.btn-primary.btn-lg.hidden{href: '#', role: 'button', data: { toggle: 'tooltip', placement: 'left' }}
+  = t(:proper)[:catalog][:back_to_top]
+  %span.glyphicon.glyphicon-chevron-up
diff --git a/app/views/service_requests/catalog.html.haml b/app/views/service_requests/catalog.html.haml
@@ -26,6 +26,7 @@
 = render 'catalogs/service_accordion', institutions: @institutions, ssr_org: @sub_service_request.try(:organization), locked_org_ids: @locked_org_ids
 = render 'catalogs/catalog_center', service_request: @service_request, from_portal: @from_portal, organization: nil
 = render 'catalogs/catalog_right', service_request: @service_request, sub_service_request: @sub_service_request, sub_service_requests: @sub_service_requests, line_items_count: @line_items_count
+= render 'catalogs/back_to_top'
 
 = render 'service_requests/modals/submit_error_modal'
 = render 'service_requests/modals/new_request_modal'

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -204,7 +204,7 @@ en:
     merged_totals:
       header: "Study Cost Totals"
       grand_total: "Grand Total"
-
+ 
   #############
   # CONSTANTS #
   #############

diff --git a/config/locales/proper.en.yml b/config/locales/proper.en.yml
@@ -54,6 +54,7 @@ en:
       no_description: "No description available."
       accordion:
         header: "Browse Service Catalog"
+      back_to_top: "Back to Top"
       center:
         search_placeholder: "Search by Service Name or CPT Code..."
         welcome: "Welcome to SPARCRequest: Storefront of Research Services"