Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-web
Commits
0e0a7e63
Commit
0e0a7e63
authored
6 months ago
by
Léopold Chappuis
Committed by
Léopold Chappuis
6 months ago
Browse files
Options
Downloads
Patches
Plain Diff
admin-login: add navigation back to main login page
Change-Id: Iee9799c9939d4a295b44934db051d9c159de2821
parent
6bd0161d
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
client/src/pages/AdminLogin.tsx
+15
-1
15 additions, 1 deletion
client/src/pages/AdminLogin.tsx
server/locale/en/translation.json
+2
-1
2 additions, 1 deletion
server/locale/en/translation.json
with
17 additions
and
2 deletions
client/src/pages/AdminLogin.tsx
+
15
−
1
View file @
0e0a7e63
...
...
@@ -21,7 +21,7 @@ import { Theme, useTheme } from '@mui/material/styles'
import
{
AdminSettingSelection
}
from
'
jami-web-common
'
import
{
FormEvent
,
useState
}
from
'
react
'
import
{
useTranslation
}
from
'
react-i18next
'
import
{
Navigate
}
from
'
react-router-dom
'
import
{
Link
,
Navigate
}
from
'
react-router-dom
'
import
UnconnectedUserLayout
from
'
../components/UnconnectedUserLayout
'
import
jamiLogoIcon
from
'
../icons/jamiLogoIcon.svg
'
...
...
@@ -92,6 +92,20 @@ export default function AdminLogin() {
<
GroupAddRounded
/>
</
Fab
>
</
Box
>
<
Box
sx
=
{
{
mt
:
theme
.
typography
.
pxToRem
(
100
),
display
:
'
flex
'
,
flexDirection
:
'
row
'
,
justifyContent
:
'
center
'
,
}
}
>
<
Typography
variant
=
"body1"
fontSize
=
{
13
}
>
<
Link
style
=
{
{
color
:
theme
.
ChatInterface
.
inputColor
}
}
to
=
{
'
/
'
}
>
{
t
(
'
admin_login_to_main
'
)
}
</
Link
>
</
Typography
>
</
Box
>
</
Box
>
</
UnconnectedUserLayout
>
)
...
...
This diff is collapsed.
Click to expand it.
server/locale/en/translation.json
+
2
−
1
View file @
0e0a7e63
...
...
@@ -13,6 +13,7 @@
"add_to_group_no_user_selected"
:
"No user selected"
,
"admin_account_configuration"
:
"Admin configuration"
,
"admin_config_auth_methods_title"
:
"Authentication methods"
,
"admin_login_to_main"
:
"User login"
,
"admin_page_accounts_overview_title"
:
"Accounts overview - {{count}} active accounts"
,
"admin_page_accounts_overview_title_auth"
:
"Authentication method"
,
"admin_page_accounts_overview_title_username"
:
"Username/Identifier"
,
...
...
@@ -212,7 +213,7 @@
"registration_form_submit_button"
:
"Register"
,
"registration_form_title"
:
"Registration"
,
"registration_form_to_login_link"
:
"Log in"
,
"registration_form_to_login_text"
:
"
Already have an account?
"
,
"registration_form_to_login_text"
:
"
Connect
"
,
"registration_form_username_tooltip"
:
"Username may be from 3 to 32 chraracters long and contain a-z, A-Z, -, _
\n\n
Click for more details"
,
"registration_success"
:
"Account registered successfully. Logging in…"
,
"resetting_display_name_success_alert"
:
"Display name reset successfully."
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment