Skip to content

Move matterbridge settings into the conversation settings dialog #4907

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

Merged
nickvergessen merged 3 commits into from
Jan 12, 2021
Merged

Move matterbridge settings into the conversation settings dialog #4907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a1d457
Move matterbridge settings into the conversation settings dialog
marcoambrosini Jan 7, 2021
f3dcec5
Fix action button height
marcoambrosini Jan 12, 2021
6b25e61
Adjust field margin
marcoambrosini Jan 12, 2021
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
10 changes: 10 additions & 0 deletions src/components/ConversationSettings/ConversationSettingsDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
<LobbySettings :token="token" />
<SipSettings v-if="canUserEnableSIP" />
</AppSettingsSection>
<AppSettingsSection
v-if="canFullModerate && matterbridgeEnabled"
:title="t('spreed', 'Matterbridge')"
class="app-settings-section">
<MatterbridgeSettings />
</AppSettingsSection>
</AppSettingsDialog>
</template>

Expand All @@ -57,6 +63,8 @@ import ListableSettings from './ListableSettings'
import LockingSettings from './LockingSettings'
import LobbySettings from './LobbySettings'
import SipSettings from './SipSettings'
import MatterbridgeSettings from './Matterbridge/MatterbridgeSettings'
import { loadState } from '@nextcloud/initial-state'

export default {
name: 'ConversationSettingsDialog',
Expand All @@ -69,11 +77,13 @@ export default {
ListableSettings,
LockingSettings,
SipSettings,
MatterbridgeSettings,
},

data() {
return {
showSettings: false,
matterbridgeEnabled: loadState('talk', 'enable_matterbridge'),
}
},

Expand Down
21 changes: 19 additions & 2 deletions .../RightSidebar/Matterbridge/BridgePart.vue → ...ationSettings/Matterbridge/BridgePart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
-->

<template>
<div :class="{ part: true, readonly: !editing }">
<div
class="part"
:class="{ readonly: !editing }">
<h3>
<img class="icon-service"
:src="type.iconUrl">
Expand All @@ -36,6 +38,7 @@
</ActionButton>
</Actions>
<Actions
class="actions"
:force-menu="true"
placement="bottom">
<ActionLink
Expand All @@ -52,7 +55,10 @@
</ActionButton>
</Actions>
</h3>
<div v-for="(field, key) in displayedFields" :key="key">
<div
v-for="(field, key) in displayedFields"
:key="key"
class="field">
<div v-if="field.type === 'checkbox'" class="checkbox-container">
<input
:id="key + '-' + num"
Expand Down Expand Up @@ -175,6 +181,8 @@ export default {
</script>

<style lang="scss" scoped>
@import '../../../assets/variables.scss';

.part {
padding-top: 10px;
}
Expand Down Expand Up @@ -238,4 +246,13 @@ input {
border-radius: var(--border-radius-large);
}
}

// Force action buttons to be 44px tall;
::v-deep .action-item__menutoggle {
height: $clickable-area !important;
}

.field {
margin: 4px 0;
}
</style>
5 changes: 0 additions & 5 deletions ...bar/Matterbridge/MatterbridgeSettings.vue → ...ngs/Matterbridge/MatterbridgeSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
<div class="matterbridge-settings">
<div v-if="loading" class="loading" />
<div v-show="!loading">
<h3>
<span class="icon icon-category-integration" />
<p>{{ t('spreed', 'Bridge with other services') }}</p>
</h3>
<div id="matterbridge-header">
<p>
{{ t('spreed', 'You can bridge channels from various instant messaging systems with Matterbridge.') }}
Expand Down Expand Up @@ -662,7 +658,6 @@ body.theme--dark .icon-multiselect-service {
padding: 0 0 10px 0;

p {
padding-left: 40px;
color: var(--color-text-maxcontrast);

a:hover,
Expand Down
7 changes: 0 additions & 7 deletions src/components/RightSidebar/RightSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,23 +85,19 @@
</button>
</div>
</div>
<MatterbridgeSettings
v-if="canModerate && matterbridgeEnabled" />
</AppSidebarTab>
</AppSidebar>
</template>

<script>
import { emit } from '@nextcloud/event-bus'
import { loadState } from '@nextcloud/initial-state'
import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
import AppSidebarTab from '@nextcloud/vue/dist/Components/AppSidebarTab'
import ChatView from '../ChatView'
import { CollectionList } from 'nextcloud-vue-collections'
import BrowserStorage from '../../services/BrowserStorage'
import { CONVERSATION, WEBINAR, PARTICIPANT } from '../../constants'
import ParticipantsTab from './Participants/ParticipantsTab'
import MatterbridgeSettings from './Matterbridge/MatterbridgeSettings'
import isInLobby from '../../mixins/isInLobby'
import SetGuestUsername from '../SetGuestUsername'
import SipSettings from './SipSettings'
Expand All @@ -119,7 +115,6 @@ export default {
ParticipantsTab,
SetGuestUsername,
SipSettings,
MatterbridgeSettings,
Description,
},

Expand All @@ -144,8 +139,6 @@ export default {
isDescriptionLoading: false,
// Sidebar status before starting editing operation
sidebarOpenBeforeEditingName: '',
matterbridgeEnabled: loadState('talk', 'enable_matterbridge'),

}
},

Expand Down