From ab7fef23b1dfc3defb3f78e1b3fa6e2505146c02 Mon Sep 17 00:00:00 2001
From: Zainab Amir <zainabamir16@outlook.com>
Date: Tue, 16 Apr 2019 14:59:13 +0500
Subject: [PATCH] Add language selection button in footer

In the footer added a button to the right of lang selection dropdown
which reloads the page once it's clicked.
---
 lms/static/sass/shared/_footer.scss           | 13 ++++++
 .../widgets/footer-language-selector.html     | 40 +++++++++++--------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/lms/static/sass/shared/_footer.scss b/lms/static/sass/shared/_footer.scss
index 284a3ccf71..16bc50187f 100644
--- a/lms/static/sass/shared/_footer.scss
+++ b/lms/static/sass/shared/_footer.scss
@@ -202,6 +202,19 @@
         cursor: initial;
       }
     }
+
+    .select-lang-button {
+        padding: 5px;
+        color: $m-blue-d3 !important;
+        height: 30px;
+
+        &:hover,
+        &:active,
+        &:focus {
+            background: $m-blue-d3 !important;
+            color: white !important;
+        }
+    }
   }
 
   // edx theme overrides
diff --git a/lms/templates/widgets/footer-language-selector.html b/lms/templates/widgets/footer-language-selector.html
index d18450ddbd..ee67c64cdb 100644
--- a/lms/templates/widgets/footer-language-selector.html
+++ b/lms/templates/widgets/footer-language-selector.html
@@ -18,20 +18,26 @@
 <%namespace name='static' file='../static_content.html'/>
 
 <div class="footer-language-selector">
-    <label for="footer-language-select">
-        <span class="icon fa fa-globe" aria-hidden="true"></span>
-        <span class="sr">${_("Choose Language")}</span>
-    </label>
-    <select id="footer-language-select" name="language" onchange="footerLanguageSelector.handleSelection(this)">
-        % for language in sorted(released_languages(), key=lambda x: x.code):
-            <% language_name = Locale.parse(language.code.replace('_', '-'), sep='-').language_name %>
-            % if language.code == LANGUAGE_CODE:
-                <option value="${language.code}" selected="selected">${language_name}</option>
-            % else:
-                <option value="${language.code}">${language_name}</option>
-            % endif
-        % endfor
-    </select>
+    <div role="group" aria-label="Change page language">
+        <label for="footer-language-select">
+            <span class="icon fa fa-globe" aria-hidden="true"></span>
+            <span class="sr">${_("Choose Language")}</span>
+        </label>
+        <select id="footer-language-select" name="language" onchange="footerLanguageSelector.handleSelection(this)">
+            % for language in sorted(released_languages(), key=lambda x: x.code):
+                <% language_name = Locale.parse(language.code.replace('_', '-'), sep='-').language_name %>
+                % if language.code == LANGUAGE_CODE:
+                    <option value="${language.code}" selected="selected">${language_name}</option>
+                % else:
+                    <option value="${language.code}">${language_name}</option>
+                % endif
+            % endfor
+        </select>
+        <button id="footer-language-button" type="button" class="btn-edged-blue select-lang-button"
+                onclick="footerLanguageSelector.langSelection()">
+            ${_('Submit')}
+        </button>
+    </div>
 </div>
 
 <script type="text/javascript">
@@ -48,8 +54,10 @@
         ## preference to the user's profile. This effect may be delayed on pages that do not use the LMS language
         ## selection middleware.
         ##
-        handleSelection: function($select) {
-            this.setLanguageCookie($select.value, this.refreshPage);
+        langSelection: function() {
+            var footer = document.getElementById('footer-language-select');
+            var lang = footer.options[footer.selectedIndex].value;
+            this.setLanguageCookie(lang, this.refreshPage);
         },
 
         setLanguageCookie: function(value, callback) {