Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2022-08-10 11:58:36 +0300
committerJoas Schilling <coding@schilljs.com>2022-08-10 12:07:27 +0300
commit06c53dbdf6907393210d90a3c28224187bf12fb7 (patch)
treee6128ecd249e1643df5be7e4fa896da303559775
parent5f3e5722dbf17983855e6f50dd048f0693a12952 (diff)
Move WebServer setup check to Vue button
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--src/components/AdminSettings/WebServerSetupChecks.vue63
1 files changed, 33 insertions, 30 deletions
diff --git a/src/components/AdminSettings/WebServerSetupChecks.vue b/src/components/AdminSettings/WebServerSetupChecks.vue
index 9cb033c9d..f84509d21 100644
--- a/src/components/AdminSettings/WebServerSetupChecks.vue
+++ b/src/components/AdminSettings/WebServerSetupChecks.vue
@@ -32,35 +32,34 @@
<ul class="web-server-setup-checks">
<li class="background-blur">
{{ t('spreed', 'Files required for background blur can be loaded') }}
- <button v-if="backgroundBlurAvailable === false"
- v-tooltip="backgroundBlurAvailableToolTip"
+ <ButtonVue v-tooltip="backgroundBlurAvailableToolTip"
+ type="tertiary"
+ class="vue-button-inline"
+ :class="{'success-button': backgroundBlurAvailable === true, 'error-button': backgroundBlurAvailable === false}"
:aria-label="backgroundBlurAvailableAriaLabel"
- class="icon"
- :class="backgroundBlurAvailableClasses"
- @click="checkBackgroundBlur" />
- <button v-else-if="backgroundBlurAvailable === true"
- v-tooltip="backgroundBlurAvailableToolTip"
- :aria-label="backgroundBlurAvailableAriaLabel"
- class="icon"
- :class="backgroundBlurAvailableClasses"
- @click="checkBackgroundBlur" />
- <span v-else
- v-tooltip="backgroundBlurAvailableToolTip"
- :aria-label="backgroundBlurAvailableAriaLabel"
- class="icon"
- :class="backgroundBlurAvailableClasses" />
+ @click="checkBackgroundBlur">
+ <template #icon>
+ <AlertCircle v-if="backgroundBlurAvailable === false" size="20" />
+ <Check v-else-if="backgroundBlurAvailable === true" size="20" />
+ <span v-else class="icon icon-loading-small" />
+ </template>
+ </ButtonVue>
</li>
</ul>
</div>
</template>
<script>
-import { generateFilePath } from '@nextcloud/router'
+import AlertCircle from 'vue-material-design-icons/AlertCircle'
+import ButtonVue from '@nextcloud/vue/dist/Components/Button'
+import Check from 'vue-material-design-icons/Check'
import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip'
-import { VIRTUAL_BACKGROUND_TYPE } from '../../utils/media/effects/virtual-background/constants.js'
import JitsiStreamBackgroundEffect from '../../utils/media/effects/virtual-background/JitsiStreamBackgroundEffect.js'
import VirtualBackground from '../../utils/media/pipeline/VirtualBackground.js'
+
+import { generateFilePath } from '@nextcloud/router'
import { loadState } from '@nextcloud/initial-state'
+import { VIRTUAL_BACKGROUND_TYPE } from '../../utils/media/effects/virtual-background/constants.js'
export default {
name: 'WebServerSetupChecks',
@@ -69,6 +68,12 @@ export default {
tooltip: Tooltip,
},
+ components: {
+ AlertCircle,
+ ButtonVue,
+ Check,
+ },
+
data() {
return {
backgroundBlurLoaded: undefined,
@@ -81,14 +86,6 @@ export default {
return this.backgroundBlurLoaded
},
- backgroundBlurAvailableClasses() {
- return {
- 'icon-checkmark': this.backgroundBlurAvailable === true,
- 'icon-error': this.backgroundBlurAvailable === false,
- 'icon-loading-small': this.backgroundBlurAvailable === undefined,
- }
- },
-
backgroundBlurAvailableAriaLabel() {
if (this.backgroundBlurAvailable === false) {
return t('spreed', 'Failed')
@@ -182,9 +179,15 @@ export default {
</script>
<style lang="scss" scoped>
-button.icon {
- background-color: transparent;
- border: none;
- width: 44px;
+.vue-button-inline {
+ display: inline-block !important;
+
+ &.success-button {
+ color: var(--color-success);
+ }
+
+ &.error-button {
+ color: var(--color-error);
+ }
}
</style>