Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reorganize user menu for consistency #15994

Merged
merged 6 commits into from
Apr 28, 2023
Merged

reorganize user menu for consistency #15994

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a1f837d
reorganize user menu for consistency
martenson Apr 25, 2023
6b577ae
unify logged in/signed in
martenson Apr 25, 2023
7225250
update locale strings
martenson Apr 25, 2023
a9f6c47
adjust navigation for new menu text
martenson Apr 25, 2023
2546060
drop the custom builds from top menu
martenson Apr 25, 2023
de52de0
update custom builds test navigation
martenson Apr 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/components/User/UserPreferences.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ message }}
</b-alert>
<p>
<span v-localize>You are logged in as</span>
<span v-localize>You are signed in as</span>
<strong id="user-preferences-current-email">{{ email }}</strong>
<span v-localize>and you are using</span>
<strong>{{ diskUsage }}</strong>
Expand Down
23 changes: 11 additions & 12 deletions client/src/entry/analysis/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,12 @@ export function fetchMenu(options = {}) {
tooltip: _l("Account and saved data"),
davelopez marked this conversation as resolved.
Show resolved Hide resolved
menu: [
{
title: `${_l("Logged in as")} ${
title: `${_l("Signed in as")} ${
Galaxy.user.get("username") ? Galaxy.user.get("username") : Galaxy.user.get("email")
}`,
disabled: true,
},
{ divider: true },
{
title: _l("Preferences"),
url: "/user",
Expand All @@ -206,12 +207,13 @@ export function fetchMenu(options = {}) {
title: _l("Custom Builds"),
url: "/custom_builds",
},
{ divider: true },
{
title: _l("Logout"),
onclick: userLogout,
hidden: Galaxy.config.single_user,
title: _l("Show/Hide Activity Bar"),
onclick: () => {
userStore.toggleActivityBar();
},
},
{ divider: true },
{
title: _l("Datasets"),
url: "/datasets/list",
Expand Down Expand Up @@ -242,19 +244,16 @@ export function fetchMenu(options = {}) {
});
}
if (Galaxy.config.interactivetools_enable) {
userTab.menu.push({ divider: true });
userTab.menu.push({
title: _l("Active InteractiveTools"),
url: "/interactivetool_entry_points/list",
});
}

// beta switch for activity bar
userTab.menu.push({ divider: true });
userTab.menu.push({
title: _l("Show/Hide Activity Bar"),
onclick: () => {
userStore.toggleActivityBar();
},
title: _l("Sign Out"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think language has left me behind here; I initially grated at the change but after checking gmail, github, and other accounts I think this is more modern phrasing, +1

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed it in our preference page where we use "Sign Out" and when choosing between the two I also checked whatever I had opened and did not see "logged in" or "log out" once

onclick: userLogout,
hidden: Galaxy.config.single_user,
});
}
menu.push(userTab);
Expand Down
2 changes: 1 addition & 1 deletion client/src/nls/de/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ define({
Login: "Anmeldung",
Register: "Neu registrieren",
"Login or Register": "Einloggen oder Registrieren",
"Logged in as": "Angemeldet als",
"Signed in as": "Angemeldet als",
Preferences: "Präferenzen",
"Custom Builds": "Custom Builds",
Logout: "Ausloggen",
Expand Down
4 changes: 2 additions & 2 deletions client/src/nls/es/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ define({
"Forgot password?": "¿Olvidó su contraseña?",
"Register here.": "Regístrese aquí.",
"Click here to reset your password.": "Haga clic aquí para restablecer su contraseña.",
"Logged in as": "Se ha conectado como",
"Signed in as": "Se ha conectado como",

Preferences: "Preferencias",

Expand Down Expand Up @@ -585,7 +585,7 @@ define({
"Edit your email, addresses and custom parameters or change your public name.":
"Edita tus direcciones de correo y personaliza los parámetros o cambia tu nombre público.",
"User preferences": "Preferencias de usuario",
"You are logged in as": "Iniciaste sesión como",
"You are signed in as": "Iniciaste sesión como",
"Sign out": "Cerrar sesión",
"Manage custom builds": "Administrar construcciones personalizadas",
"Manage OpenIDs": "Administrar OpenIDs",
Expand Down
2 changes: 1 addition & 1 deletion client/src/nls/fr/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define({
Login: "Authentification",
Register: "Enregistrement",
"Login or Register": "Authentification et Enregistrement",
"Logged in as": "Authentifié en tant que",
"Signed in as": "Authentifié en tant que",
Preferences: "Préférences",
"Custom Builds": "Mes génomes Builds de référence",
Logout: "Déconnexion",
Expand Down
2 changes: 0 additions & 2 deletions client/src/nls/ja/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ define({
Login: "ログイン",
Register: "登録",
"Login or Register": "ログイン/登録",
//"Logged in as":
// "",
Preferences: "設定",
"Custom Builds": "カスタムビルド",
Logout: "ログアウト",
Expand Down
2 changes: 1 addition & 1 deletion client/src/nls/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ define({
Login: false,
Register: false,
"Login or Register": false,
"Logged in as": false,
"Signed in as": false,
Preferences: false,
"Custom Builds": false,
Logout: false,
Expand Down
2 changes: 1 addition & 1 deletion client/src/nls/zh/locale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ define({
Login: "登陆",
Register: "注册",
"Login or Register": "注册登陆",
"Logged in as": "您已登陆为",
"Signed in as": "您已登陆为",
Preferences: "用户偏好性",
"Custom Builds": "自定义构建集",
Logout: "退出",
Expand Down
2 changes: 1 addition & 1 deletion client/src/utils/navigation/navigation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ masthead:

username:
type: xpath
selector: '//a[contains(text(), "Logged in as")]'
selector: '//a[contains(text(), "Signed in as")]'

logged_in_only: '.loggedin-only'
logged_out_only: '.loggedout-only'
Expand Down