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

Jump to bottom

Show loading spinner until share settings are fully loaded #38163

Merged
merged 1 commit into from
May 11, 2023
Merged

Show loading spinner until share settings are fully loaded #38163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 apps/settings/css/settings.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions apps/settings/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,10 @@ table.grid td.date {
}

#shareAPI {
&.loading > div {
display: none;
}

p {
padding-bottom: 0.8em;
}
Expand Down
2 changes: 2 additions & 0 deletions apps/settings/src/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,4 +286,6 @@ window.addEventListener('DOMContentLoaded', () => {
if (document.getElementById('security-warning') !== null) {
setupChecks()
}

$('#shareAPI').removeClass('loading')
})
2 changes: 1 addition & 1 deletion apps/settings/templates/settings/admin/sharing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

?>

<div class="section" id="shareAPI">
<div class="section loading" id="shareAPI">
<h2><?php p($l->t('Sharing'));?></h2>
<?php if ($_['sharingAppEnabled'] === false) { ?>
<p class="warning"><?php p($l->t('You need to enable the File sharing App.')); ?></p>
Expand Down
Loading