[#2185] Better scrolling in MyRSR and project page

akvo · Jun 14, 2016 · 7b40d33 · 7b40d33
1 parent cbfc617
commit 7b40d33
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/akvo/rsr/static/scripts-src/my-results.js b/akvo/rsr/static/scripts-src/my-results.js
@@ -2379,7 +2379,13 @@ function initReact() {
 
                 // Wait 1s, then smoothly scroll to top
                 window.setTimeout(function() {
-                    smoothScroll.animateScroll('body');
+                    if (document.getElementById('projectMenu')) {
+                        // Project page
+                        smoothScroll.animateScroll('#projectMenu');
+                    } else if (document.getElementById('resultProjectTitle')) {
+                        // MyRSR
+                        smoothScroll.animateScroll('#resultProjectTitle');
+                    }
                 }, 1000);
             } else {
                 window.location.hash = '';

diff --git a/akvo/rsr/static/scripts-src/my-results.jsx b/akvo/rsr/static/scripts-src/my-results.jsx
@@ -2379,7 +2379,13 @@ function initReact() {
 
                 // Wait 1s, then smoothly scroll to top
                 window.setTimeout(function() {
-                    smoothScroll.animateScroll('body');
+                    if (document.getElementById('projectMenu')) {
+                        // Project page
+                        smoothScroll.animateScroll('#projectMenu');
+                    } else if (document.getElementById('resultProjectTitle')) {
+                        // MyRSR
+                        smoothScroll.animateScroll('#resultProjectTitle');
+                    }
                 }, 1000);
             } else {
                 window.location.hash = '';

diff --git a/akvo/templates/myrsr/my_results.html b/akvo/templates/myrsr/my_results.html
@@ -5,7 +5,7 @@
 {% block title %}{% trans 'MyRSR - My Results' %}{% endblock title %}
 
 {% block myrsr_main %}
-    <h4 class="resultProjectTitle">
+    <h4 class="resultProjectTitle" id="resultProjectTitle">
         <a href="{% url 'project-main' project.pk %}">{{ project.title }}</a>
         <a href="{% url 'project_editor' project.pk %}"><button class="btn btn-default btn-sm"><i class="fa fa-pencil-square-o"></i> {% trans 'Edit project' %}</button></a>
     </h4>

diff --git a/akvo/templates/project_main.html b/akvo/templates/project_main.html
@@ -6,7 +6,7 @@
     <div class="header-container">
         {% include "partials/project_header.html" %}
     </div>
-    <div class="projectMenu">
+    <div class="projectMenu" id="projectMenu">
         <div class="container">
             <div class="row">
                 <div class="col-md-12 ">