From 6ff814995b80eb4a473e2e2a03adde29d8e304c6 Mon Sep 17 00:00:00 2001
From: Gurmannat Sohal <iamgurmannatsohal@gmail.com>
Date: Wed, 25 Jan 2023 03:01:24 +0530
Subject: [PATCH 1/2] fix map css

---
 app/assets/stylesheets/map.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/assets/stylesheets/map.css b/app/assets/stylesheets/map.css
index edada63c74..8e0c0a4c5a 100644
--- a/app/assets/stylesheets/map.css
+++ b/app/assets/stylesheets/map.css
@@ -51,3 +51,15 @@
 .leaflet-container .add-content-button {
   margin-right: 10px;
 }
+.leaflet-pane{
+  position: initial !important;
+}
+.leaflet-bar, .leaflet-top{
+  position: initial !important;
+}
+.leaflet-control{
+  position: initial !important;
+}
+.leaflet-bottom{
+  z-index: auto !important;
+}
\ No newline at end of file

From ee39a55cbafc9871d01a3cc992b558952acf5a1b Mon Sep 17 00:00:00 2001
From: Gurmannat Sohal <iamgurmannatsohal@gmail.com>
Date: Thu, 2 Feb 2023 21:04:15 +0530
Subject: [PATCH 2/2] review fixes

improve-text-for-contributors (#11532)

* improve-text-for-contributors

* update

* Update en.yml

fix indentation

* fix indentation

* Update en.yml

* Update en.yml

* Update notes_controller_test.rb

* Update notes_controller_test.rb

* use line breaks inline

---------

Co-authored-by: Ogunbanjo oluwadamilare <damilareogunbanjo@gmail.com>
Co-authored-by: Cess <cessmbuguar@gmail.com>
Co-authored-by: Tilda Udufo <mathildaudufo@gmail.com>

review fixes
---
 app/assets/stylesheets/map.css           | 11 +++--------
 config/locales/en.yml                    | 11 +++++++----
 test/functional/notes_controller_test.rb |  3 +--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/map.css b/app/assets/stylesheets/map.css
index 8e0c0a4c5a..d4ffc72c57 100644
--- a/app/assets/stylesheets/map.css
+++ b/app/assets/stylesheets/map.css
@@ -16,6 +16,7 @@
 }
 .leaflet-top{
   z-index:800 !important;
+  position: initial !important;
 }
 .leaflet-popup .leaflet-popup-content {
   width: 300px;
@@ -51,15 +52,9 @@
 .leaflet-container .add-content-button {
   margin-right: 10px;
 }
-.leaflet-pane{
-  position: initial !important;
-}
-.leaflet-bar, .leaflet-top{
-  position: initial !important;
-}
-.leaflet-control{
+.leaflet-pane, .leaflet-bar, .leaflet-control{
   position: initial !important;
 }
 .leaflet-bottom{
   z-index: auto !important;
-}
\ No newline at end of file
+}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index aff68b9445..def698224d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1133,10 +1133,13 @@ en:
     logged_out: "Successfully logged out."
   notes_controller:
     research_notes: "Research notes"
-    thank_you_for_contribution: "Success! Thank you for contributing open research,
-      and thanks for your patience while your post is approved by <a href='/wiki/moderation'>community
-      moderators</a> and we'll email you when it is published. In the meantime, if
-      you have more to contribute, feel free to do so."
+    thank_you_for_contribution: |
+      <h2>Success! You did it! Hooray!</h2>
+      <hr>
+      <p>Thank you so much for contributing open research and being part of our community.</p>
+      <h2>Here's what's happening now:</h2>
+      <hr>
+      <p>Your <a href='/wiki/first-contribution'>first contribution</a> is awaiting approval by <a href='/wiki/moderation'>community moderators</a>. <b>If you have asked an urgent question about an environmental concern, we will prioritize reviewing it</b>. Thank you for your patience, in the next hours your contribution should be public. We will email you when it is published. In the meantime, if you have more to contribute, feel free to do so. Visit the <a href='/wiki/welcome'>Welcome Page</a> to discover more ways to connect.</p>
     thank_you_for_question: "Success! Thank you for contributing with a question, and
       thanks for your patience while your question is approved by <a href='/wiki/moderation'>community
       moderators</a> and we'll email you when it is published."
diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 0952b864d0..cadff06082 100644
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -309,8 +309,7 @@ def teardown
          tags: 'balloon-mapping,event'
          }
     # , :main_image => "/images/testimage.jpg"
-
-    assert_equal "Success! Thank you for contributing open research, and thanks for your patience while your post is approved by <a href='/wiki/moderation'>community moderators</a> and we'll email you when it is published. In the meantime, if you have more to contribute, feel free to do so.", flash[:notice]
+    assert_equal "<h2>Success! You did it! Hooray!</h2>\n<hr>\n<p>Thank you so much for contributing open research and being part of our community.</p>\n<h2>Here's what's happening now:</h2>\n<hr>\n<p>Your <a href='/wiki/first-contribution'>first contribution</a> is awaiting approval by <a href='/wiki/moderation'>community moderators</a>. <b>If you have asked an urgent question about an environmental concern, we will prioritize reviewing it</b>. Thank you for your patience, in the next hours your contribution should be public. We will email you when it is published. In the meantime, if you have more to contribute, feel free to do so. Visit the <a href='/wiki/welcome'>Welcome Page</a> to discover more ways to connect.</p>\n", flash[:notice]
     assert_nil flash[:warning] # no double notice
     assert_equal 4, Node.last.status
     assert_equal title, Node.last.title