Skip to content

Enh/8896/more breakout rooms polishing #8922

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
Mar 2, 2023
Merged

Enh/8896/more breakout rooms polishing #8922

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
b9fe2f8
Make assign button primary
marcoambrosini Mar 2, 2023
e39a376
Fix create rooms button type
marcoambrosini Mar 2, 2023
43536bc
Add fieldset to radio buttons
marcoambrosini Mar 2, 2023
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
38 changes: 20 additions & 18 deletions src/components/BreakoutRoomsEditor/BreakoutRoomsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,26 @@
max="20">

<label class="breakout-rooms-editor__caption">{{ t('spreed', 'Assignment method') }}</label>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="1"
name="mode_radio"
type="radio">
{{ t('spreed', 'Automatically assign participants') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="2"
name="mode_radio"
type="radio">
{{ t('spreed', 'Manually assign participants') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="3"
name="mode_radio"
type="radio">
{{ t('spreed', 'Allow participants to choose') }}
</NcCheckboxRadioSwitch>
<fieldset>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="1"
name="mode_radio"
type="radio">
{{ t('spreed', 'Automatically assign participants') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="2"
name="mode_radio"
type="radio">
{{ t('spreed', 'Manually assign participants') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="mode"
value="3"
name="mode_radio"
type="radio">
{{ t('spreed', 'Allow participants to choose') }}
</NcCheckboxRadioSwitch>
</fieldset>
</div>
<div class="breakout-rooms-editor__buttons">
<NcButton v-if="mode === '2'" type="primary" @click="isEditingParticipants = true">
Expand Down
7 changes: 6 additions & 1 deletion src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
{{ resetButtonLabel }}
</NcButton>
<NcActions v-if="hasSelected"
type="primary"
:menu-title="t('spreed', 'Assign')">
<NcActionButton v-for="(item, index) in assignments"
:key="index"
Expand All @@ -95,7 +96,7 @@
</NcActionButton>
</NcActions>
<NcButton :disabled="!hasAssigned"
type="primary"
:type="confirmButtonType"
@click="handleSubmit">
{{ confirmButtonLabel }}
</NcButton>
Expand Down Expand Up @@ -204,6 +205,10 @@ export default {
return this.isReorganizingAttendees ? t('spreed', 'Confirm') : t('spreed', 'Create breakout rooms')
},

confirmButtonType() {
return this.hasUnassigned ? 'secondary' : 'primary'
},

resetButtonLabel() {
return t('spreed', 'Reset')
},
Expand Down