Skip to content

Commit 5a47175

Browse files
committed
tool menu should display in legacy also
1 parent 1b9adc1 commit 5a47175

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

ui/app/components/NavBar.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,13 @@ const NavBar = ({ isLoggedIn, login, logout }) => (
127127
redirectAfterLogin={window.location.origin + "/v3/"}
128128
mappingCheckUrl={window.location.origin + "/api/v1/auth/status/"}
129129
appId="osm-export-tool"
130+
button-variant="filled"
130131
/>
131132
</NavItem>
132133
) : null}
133-
{authConfig.isHankoAuth && (
134-
<NavItem>
135-
<ToolMenu />
136-
</NavItem>
137-
)}
134+
<NavItem>
135+
<ToolMenu />
136+
</NavItem>
138137
{!authConfig.isHankoAuth && (
139138
<NavItem>
140139
{!isLoggedIn && (

ui/templates/ui/v3.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<title>HOT Export Tool</title>
1010
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700' rel='stylesheet' type='text/css'>
1111
<link rel="icon" href="{% static 'ui/images/favicon.ico' %}">
12-
{% if AUTH_PROVIDER == "hanko" %}
1312
<script type="importmap">
1413
{
1514
"imports": {
@@ -18,8 +17,9 @@
1817
}
1918
}
2019
</script>
21-
<script type="module" src="https://cdn.jsdelivr.net/npm/@hotosm/hanko-auth@0.4.8/dist/hanko-auth.esm.js"></script>
2220
<script type="module" src="https://cdn.jsdelivr.net/npm/@hotosm/tool-menu@0.2.6/dist/tool-menu.esm.js"></script>
21+
{% if AUTH_PROVIDER == "hanko" %}
22+
<script type="module" src="https://cdn.jsdelivr.net/npm/@hotosm/hanko-auth@0.4.8/dist/hanko-auth.esm.js"></script>
2323
<style>
2424
/* Hide legacy login/logout button */
2525
#root .btn-danger {

0 commit comments

Comments
 (0)