From 44abb4f2f0199b5412b9e6a33c4b5a164e4244cf Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 11 Sep 2020 17:21:58 -0400
Subject: [PATCH] LP#1778972: (follow-up) restore locale picker to the navbar

Previous patches had moved it to account preferences, and a copy
of the picker will remain there now, but Evergreen should not
require that a user log in or set their browser locale in order
to be able to pick among supported locales.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 .../src/templates-bootstrap/opac/css/style.css.tt2 |  4 ++++
 .../src/templates-bootstrap/opac/myopac/prefs.tt2  |  2 +-
 .../opac/parts/locale_picker.tt2                   |  8 ++++----
 .../opac/parts/pref_locale_picker.tt2              | 14 +++++++-------
 .../opac/parts/topnav_links.tt2                    |  1 +
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
index 6e684b3b05..3027831cda 100755
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -3990,3 +3990,7 @@ label[for*=expert_]
 .alert-danger a:visited {
     color: #424fa6;
 }
+
+#locale_picker_form label {
+    color: #fff;
+}
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index 24fb3c0929..52375d6d7d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -154,7 +154,7 @@
             </tr>
             <tr>
                 <td colspan="3">
-                 [%- INCLUDE "opac/parts/locale_picker.tt2" %]
+                 [%- INCLUDE "opac/parts/pref_locale_picker.tt2" %]
                 </td>
             </tr>
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2
index 295aac74d6..581e78bd57 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/locale_picker.tt2
@@ -6,7 +6,8 @@
 
     set_locale = CGI.param('set_eg_locale') || CGI.cookie('eg_locale') || base_locale;
 %]
-<form id="locale_picker_form" class="row" action="[% mkurl() %]" method="post">
+<form id="locale_picker_form" class="form-inline ml-auto" action="[% mkurl() %]" method="post">
+  <div class="input-group">
     <label for="locale_picker" class="color_4 light_border col-3 text-left">[% l("Language:") %]</label>
     [%- FOREACH param IN CGI.params(); -%]
         [%- NEXT IF param.key == 'set_eg_locale'; -%]
@@ -24,8 +25,7 @@
         <option value="[% locale | html %]" [% selected %]>[% ctx.locales.$locale | html %]</option>
     [%- END %]
     </select>
-    <div class="col-3">
-     <button type="submit" class="btn btn-sm btn-confirm float-right"/><i class="fas fa-save" aria-hidden="true"></i>[% l(" Save Changes") %]</button>
-    </div>
+    <button type="submit" class="btn btn-sm btn-confirm float-right"/><i class="fas fa-save" aria-hidden="true"></i>[% l("Save Changes") %]</button>
+  </div>
 </form>
 [%- END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
index 61d2cc3f34..61b09e26cd 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
@@ -6,14 +6,14 @@
 
     set_locale = CGI.param('set_eg_locale') || CGI.cookie('eg_locale') || base_locale;
 %]
-<form class="row mx-2" action="[% mkurl() %]" method="post">
-    <td for="locale_picker" class="color_4 light_border">[% l("Language:") %]</td>
+<form id="pref_locale_picker_form" class="row" action="[% mkurl() %]" method="post">
+    <label for="pref_locale_picker" class="color_4 light_border col-3 text-left">[% l("Language:") %]</label>
     [%- FOREACH param IN CGI.params(); -%]
         [%- NEXT IF param.key == 'set_eg_locale'; -%]
         <input type="hidden" name="[% param.key | html %]" value="[% param.value | html %]" />
     [%- END; -%]
-   <td>
-    <select id="locale_picker" name="set_eg_locale" class="form-control form-control-sm">
+
+    <select id="pref_locale_picker" name="set_eg_locale" class="form-control form-control-sm col-6">
     [%- FOREACH locale IN ctx.locales.keys %]
         [%- IF set_locale == locale;
                 selected = 'selected="selected"';
@@ -24,8 +24,8 @@
         <option value="[% locale | html %]" [% selected %]>[% ctx.locales.$locale | html %]</option>
     [%- END %]
     </select>
-    <br>
-    <input type="submit" class="btn btn-sm btn-confirm" value="[% l("Submit") %]" />
-    </td>
+    <div class="col-3">
+     <button type="submit" class="btn btn-sm btn-confirm float-right"/><i class="fas fa-save" aria-hidden="true"></i>[% l(" Save Changes") %]</button>
+    </div>
 </form>
 [%- END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
index 7d8745cd70..dda8e6dcd5 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
@@ -26,6 +26,7 @@
         <a class="nav-link" href="[% ctx.link_four %]">Example Link 4</a>
       </li>
     </ul>
+    [%- INCLUDE "opac/parts/locale_picker.tt2" %]
     <!--Right Links-->
     <ul class="navbar-nav ml-auto nav-fr px-3">
       <!--If not signed in, show sign in button-->
-- 
2.43.2