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

rename public and hidden polls to open and private #2289

Merged
merged 1 commit into from
Feb 25, 2022
Merged

rename public and hidden polls to open and private #2289

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/js/assets/scss/icons-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
--icon-polls-loading: url('../icons/loading-small.gif');
--icon-polls-open: url('../icons/open-fff.svg');
--icon-polls-closed: url('../icons/closed-fff.svg');
--icon-polls-public-poll: url('../icons/visible-fff.svg');
--icon-polls-hidden-poll: url('../icons/invisible-fff.svg');
--icon-polls-open-poll: url('../icons/visible-fff.svg');
--icon-polls-private-poll: url('../icons/invisible-fff.svg');
}
}
26 changes: 13 additions & 13 deletions src/js/assets/scss/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
--icon-polls-confirmed--fff: url('../icons/confirmed-fff.svg');
--icon-polls-handle: url('../icons/handle.svg');
--icon-polls-handle--fff: url('../icons/handle-fff.svg');
--icon-polls-hidden-poll: url('../icons/invisible.svg');
--icon-polls-hidden-poll--fff: url('../icons/invisible-fff.svg');
--icon-polls-hidden: url('../icons/invisible.svg');
--icon-polls-hidden--fff: url('../icons/invisible-fff.svg');
--icon-polls-private-poll: url('../icons/invisible.svg');
--icon-polls-private-poll--fff: url('../icons/invisible-fff.svg');
--icon-polls-private: url('../icons/invisible.svg');
--icon-polls-private--fff: url('../icons/invisible-fff.svg');
--icon-polls-list-view: url('../icons/list-view.svg');
--icon-polls-list-view-fff: url('../icons/list-view-fff.svg');
--icon-polls-loading: url('../icons/loading-small.gif');
Expand All @@ -35,8 +35,8 @@
--icon-polls-no: url('../icons/no-vote.svg');
--icon-polls-open: url('../icons/open.svg');
--icon-polls-open--fff: url('../icons/open-fff.svg');
--icon-polls-public-poll: url('../icons/visible.svg');
--icon-polls-public-poll--fff: url('../icons/visible-fff.svg');
--icon-polls-open-poll: url('../icons/visible.svg');
--icon-polls-open-poll--fff: url('../icons/visible-fff.svg');
--icon-polls-sidebar-toggle: url('../icons/sidebar-toggle.svg');
--icon-polls-sidebar-toggle--fff: url('../icons/sidebar-toggle-fff.svg');
--icon-polls-table-view: url('../icons/table-view.svg');
Expand Down Expand Up @@ -66,19 +66,19 @@
.icon-polls-closed { background-image: var(--icon-polls-closed); }
.icon-polls-closed-fff { background-image: var(--icon-polls-closed--fff); }
.icon-polls-confirmed { background-image: var(--icon-polls-confirmed); }
.icon-polls-hidden-poll { background-image: var(--icon-polls-hidden-poll); }
.icon-polls-hidden { background-image: var(--icon-polls-hidden-poll); }
.icon-polls-private-poll { background-image: var(--icon-polls-private-poll); }
.icon-polls-private { background-image: var(--icon-polls-private-poll); }
.icon-polls-mail { background-image: var(--icon-polls-mail); }
.icon-polls-maybe { background-image: var(--icon-polls-maybe); }
.icon-polls-minus { background-image: var(--icon-polls-minus); }
.icon-polls-move { background-image: var(--icon-polls-move); }
.icon-polls-no { background-image: var(--icon-polls-no); }
.icon-polls-open { background-image: var(--icon-polls-open); }
.icon-polls-public-poll { background-image: var(--icon-polls-public-poll); }
.icon-polls-open-poll { background-image: var(--icon-polls-open-poll); }
.icon-polls-sidebar-toggle { background-image: var(--icon-polls-sidebar-toggle); }
.icon-polls-unconfirmed { background-image: var(--icon-polls-unconfirmed); }
.icon-table-view { background-image: var(--icon-polls-table-view); }
.icon-polls-visible { background-image: var(--icon-polls-public-poll); }
.icon-polls-visible { background-image: var(--icon-polls-open-poll); }
.icon-polls-yes { background-image: var(--icon-polls-yes); }

.theme--dark {
Expand All @@ -92,12 +92,12 @@
.icon-polls-clone { background-image: var(--icon-polls-clone--fff); }
.icon-polls-closed { background-image: var(--icon-polls-closed--fff); }
.icon-polls-confirmed { background-image: var(--icon-polls-confirmed--fff); }
.icon-polls-hidden { background-image: var(--icon-polls-hidden-poll--fff); }
.icon-polls-hidden-poll { background-image: var(--icon-polls-hidden-poll--fff); }
.icon-polls-private { background-image: var(--icon-polls-private-poll--fff); }
.icon-polls-private-poll { background-image: var(--icon-polls-private-poll--fff); }
.icon-polls-mail { background-image: var(--icon-polls-mail--fff); }
.icon-polls-move { background-image: var(--icon-polls-move--fff); }
.icon-polls-open { background-image: var(--icon-polls-open--fff); }
.icon-polls-public-poll { background-image: var(--icon-polls-public-poll--fff); }
.icon-polls-open-poll { background-image: var(--icon-polls-open-poll--fff); }
.icon-polls-sidebar-toggle { background-image: var(--icon-polls-sidebar-toggle--fff); }
.icon-polls-unconfirmed { background-image: var(--icon-polls-unconfirmed--fff); }
.icon-table-view { background-image: var(--icon-polls-table-view-fff); }
Expand Down
10 changes: 5 additions & 5 deletions src/js/components/Poll/PollInformation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,22 @@ export default {
if (this.important) {
return t('polls', 'Relevant and accessible for all users')
}
return t('polls', 'Access for all users')
return t('polls', 'Open poll')
},

accessClass() {
if (this.access === 'hidden') {
return 'icon-polls-hidden-poll'
return 'icon-polls-private-poll'
}
if (this.important) {
return 'icon-polls-public-poll'
return 'icon-polls-open-poll'
}
return 'icon-polls-public-poll'
return 'icon-polls-open-poll'
},

resultsClass() {
if (this.showResults === 'never' || (this.showResults === 'closed' && !this.closed)) {
return 'icon-polls-hidden'
return 'icon-polls-private'
}
return 'icon-polls-visible'

Expand Down
8 changes: 4 additions & 4 deletions src/js/components/PollList/PollItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ export default {
}

if (this.poll.access === 'public') {
return 'icon-polls-public-poll'
return 'icon-polls-open-poll'
}

return 'icon-polls-hidden-poll'
return 'icon-polls-private-poll'
},

pollType() {
Expand Down Expand Up @@ -310,11 +310,11 @@ export default {
}

.item__access--public {
background-image: var(--icon-polls-public-poll);
background-image: var(--icon-polls-open-poll);
}

.item__access--hidden {
background-image: var(--icon-polls-hidden-poll);
background-image: var(--icon-polls-private-poll);
}

.item__access--deleted {
Expand Down
4 changes: 2 additions & 2 deletions src/js/components/PollList/PollItemAdmin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,11 @@ export default {
}

.item__access--public {
background-image: var(--icon-polls-public-poll);
background-image: var(--icon-polls-open-poll);
}

.item__access--hidden {
background-image: var(--icon-polls-hidden-poll);
background-image: var(--icon-polls-private-poll);
}

.poll-item__item {
Expand Down
4 changes: 2 additions & 2 deletions src/js/components/Settings/AdminSettings/AdminShareSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
</div>

<CheckboxRadioSwitch :checked.sync="allAccessLimited" type="switch">
{{ t('polls', 'Disallow publishing poll to all users') }}
{{ t('polls', 'Disallow open polls') }}
</CheckboxRadioSwitch>
<div v-if="allAccessLimited" class="settings_details">
<div>{{ t('polls','Allow poll sharing to all users for the following groups') }}</div>
<div>{{ t('polls','Allow creating open polls for the following groups') }}</div>
<Multiselect v-model="allAccessGroups"
class="stretch"
label="displayName"
Expand Down
4 changes: 2 additions & 2 deletions src/js/components/Shares/ShareItemAllUsers.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<template>
<UserItem type="all"
:user-id="t('polls', 'All users')"
:display-name="t('polls', 'All users')"
:user-id="t('polls', 'Open poll')"
:display-name="t('polls', 'Open poll')"
:disabled="access==='hidden'"
show-email
is-no-user>
Expand Down
2 changes: 1 addition & 1 deletion src/js/components/User/UserItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export default {
}

if (this.type === 'all') {
return t('polls', 'All users')
return t('polls', 'Open poll')
}

if (this.displayName) {
Expand Down
14 changes: 7 additions & 7 deletions src/js/store/modules/polls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ const state = {
},
{
id: 'hidden',
title: t('polls', 'Hidden polls'),
titleExt: t('polls', 'Hidden polls'),
description: t('polls', 'All hidden polls, to which you have access.'),
icon: 'icon-polls-hidden-poll',
title: t('polls', 'Private polls'),
titleExt: t('polls', 'Private polls'),
description: t('polls', 'All private polls, to which you have access.'),
icon: 'icon-polls-private-poll',
pinned: false,
createDependent: true,
filterCondition(poll) {
Expand All @@ -94,9 +94,9 @@ const state = {
},
{
id: 'public',
title: t('polls', 'Public polls'),
titleExt: t('polls', 'Public polls'),
description: t('polls', 'A complete list with all public polls on this site, regardless who is the owner.'),
title: t('polls', 'Open polls'),
titleExt: t('polls', 'Open polls'),
description: t('polls', 'A complete list with all open polls on this site, regardless who is the owner.'),
icon: 'icon-link',
pinned: false,
createDependent: true,
Expand Down