2 files changed, 15 insertions, 9 deletions

diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index b6e7d3a79..c382a9645 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -210,21 +210,29 @@ $(function(){
      */
     //desktop
     if($('#report-a-poblem-sidebar:visible').length > 0){
-        $('.content[role=main]').addClass('report-a-poblem-page');
-        heightFix('#report-a-poblem-sidebar:visible', '.content.report-a-poblem-page', 26);
+        heightFix('#report-a-poblem-sidebar:visible', '.content', 26);
     }
 
     //show/hide on mobile
     $('.mobile #report-a-poblem-sidebar').after('<a href="#" class="rap-notes-trigger button-right">How to send successful reports</a>').hide();
     $('.mobile').on('click', '.rap-notes-trigger', function(e){
         e.preventDefault();
-        $('.mobile .report-a-poblem-page').after('<div class="content rap-notes"></div>').hide();
-        $('#report-a-poblem-sidebar').appendTo('.rap-notes').show().after('<a href="#" class="rap-notes-close btn">close</a>');
+        //check if we've already moved the notes
+        if($('.rap-notes').length > 0){
+            //if we have, show and hide .content
+            $('.mobile .content').hide();
+            $('.rap-notes').show();
+        }else{
+            //if not, move them and show, hiding .content
+            $('.mobile .content').after('<div class="content rap-notes"></div>').hide();
+            $('#report-a-poblem-sidebar').appendTo('.rap-notes').show().after('<a href="#" class="rap-notes-close button-left">BACK</a>');
+        }
     });
 
     $('.mobile').on('click', '.rap-notes-close', function(e){
+        //hide notes, show .content
         e.preventDefault();
-        $('.mobile .report-a-poblem-page').show();
+        $('.mobile .content').show();
         $('.rap-notes').hide();
     });
 });
\ No newline at end of file
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 02392360b..b121c6bfc 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -216,8 +216,7 @@ $(function(){
         $('#side-form').hide();
         $('#side').show();
         $('#sub_map_links').show();
-        $('.content[role=main]').addClass('report-a-poblem-page');
-        heightFix('#report-a-poblem-sidebar:visible', '.content.report-a-poblem-page', 26);
+        heightFix('#report-a-poblem-sidebar:visible', '.content', 26);
         fixmystreet.page = 'around';
     });
 
@@ -373,8 +372,7 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
         }
         $('#side').hide();
         $('#sub_map_links').hide();
-        $('.content[role=main]').addClass('report-a-poblem-page');
-        heightFix('#report-a-poblem-sidebar:visible', '.content.report-a-poblem-page', 26);
+        heightFix('#report-a-poblem-sidebar:visible', '.content', 26);
         fixmystreet.page = 'new';
         location.hash = 'report';
     }