Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
admin-fe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pleroma
admin-fe
Commits
020c4e13
Commit
020c4e13
authored
5 years ago
by
Angelina Filippova
Browse files
Options
Downloads
Patches
Plain Diff
Add tooltip and success message after instance was rebooted
parent
7f2d61bc
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!94
Ability to reboot instance from admin-fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
src/lang/en.js
+3
-1
3 additions, 1 deletion
src/lang/en.js
src/views/settings/index.vue
+18
-8
18 additions, 8 deletions
src/views/settings/index.vue
src/views/settings/styles/main.scss
+1
-0
1 addition, 0 deletions
src/views/settings/styles/main.scss
with
23 additions
and
9 deletions
CHANGELOG.md
+
1
−
0
View file @
020c4e13
...
...
@@ -29,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-
Report notes
-
Ability to moderate users on the statuses page
-
Ability to moderate user on the user's page
-
Ability to restart an application when settings that require instance reboot were changed
-
Mobile UI for Settings tab
### Fixed
...
...
This diff is collapsed.
Click to expand it.
src/lang/en.js
+
3
−
1
View file @
020c4e13
...
...
@@ -364,7 +364,9 @@ export default {
emoji
:
'
Emoji
'
,
markup
:
'
Markup settings
'
,
corsPlug
:
'
CORS plug config
'
,
instanceReboot
:
'
Instance Reboot
'
instanceReboot
:
'
Instance Reboot
'
,
restartApp
:
'
You must restart the instance to apply settings
'
,
restartSuccess
:
'
Instance rebooted successfully!
'
},
invites
:
{
inviteTokens
:
'
Invite tokens
'
,
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/index.vue
+
18
−
8
View file @
020c4e13
...
...
@@ -4,12 +4,14 @@
<div
class=
"settings-header-container"
>
<h1
class=
"settings-header"
>
{{
$t
(
'
settings.settings
'
)
}}
</h1>
<div>
<el-button
v-if=
"needReboot"
class=
"settings-reboot-button"
@
click=
"restartApp"
>
<span>
<i
class=
"el-icon-refresh"
/>
{{
$t
(
'
settings.instanceReboot
'
)
}}
</span>
</el-button>
<el-tooltip
v-if=
"needReboot"
:content=
"$t('settings.restartApp')"
placement=
"bottom-end"
>
<el-button
type=
"warning"
class=
"settings-reboot-button"
@
click=
"restartApp"
>
<span>
<i
class=
"el-icon-refresh"
/>
{{
$t
(
'
settings.instanceReboot
'
)
}}
</span>
</el-button>
</el-tooltip>
<el-link
:underline=
"false"
href=
"https://docs-develop.pleroma.social/backend/administration/CLI_tasks/config/"
...
...
@@ -244,8 +246,16 @@ export default {
this
.
$store
.
dispatch
(
'
FetchSettings
'
)
},
methods
:
{
restartApp
()
{
this
.
$store
.
dispatch
(
'
RestartApplication
'
)
async
restartApp
()
{
try
{
await
this
.
$store
.
dispatch
(
'
RestartApplication
'
)
}
catch
(
e
)
{
return
}
this
.
$message
({
type
:
'
success
'
,
message
:
i18n
.
t
(
'
settings.restartSuccess
'
)
})
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/views/settings/styles/main.scss
+
1
−
0
View file @
020c4e13
...
...
@@ -275,6 +275,7 @@
width
:
145px
;
text-align
:
left
;
padding
:
10px
;
margin-right
:
5px
;
}
.single-input
{
margin-right
:
10px
...
...
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