mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 15:17:25 +01:00
various fixes: group leader's name at top of edit drop-down; Members List; etc (#9117)
* fix text describing location of subscription/gem gift box * disable Copy As To-Do in Tavern, guilds, party because it's not working * change members label on group pages to Member List * remove outdated info about seeing number of Gems available to buy * allow Danger Zone to be seen by players without local authentication Also add an hr because the Danger Zone heading was crammed up against the button above it. * put current group leader's name at top of Leader change drop-down
This commit is contained in:
@@ -36,6 +36,7 @@
|
|||||||
.svg-icon(v-html="icons.like")
|
.svg-icon(v-html="icons.like")
|
||||||
span(v-if='!msg.likes[user._id]') {{ $t('like') }}
|
span(v-if='!msg.likes[user._id]') {{ $t('like') }}
|
||||||
span(v-if='msg.likes[user._id]') {{ $t('liked') }}
|
span(v-if='msg.likes[user._id]') {{ $t('liked') }}
|
||||||
|
// @TODO make copyAsTodo work in Tavern, guilds, party (inbox can be done later)
|
||||||
span.action(v-if='!inbox', @click='copyAsTodo(msg)')
|
span.action(v-if='!inbox', @click='copyAsTodo(msg)')
|
||||||
.svg-icon(v-html="icons.copy")
|
.svg-icon(v-html="icons.copy")
|
||||||
| {{$t('copyAsTodo')}}
|
| {{$t('copyAsTodo')}}
|
||||||
@@ -72,6 +73,7 @@
|
|||||||
.svg-icon(v-html="icons.like")
|
.svg-icon(v-html="icons.like")
|
||||||
span(v-if='!msg.likes[user._id]') {{ $t('like') }}
|
span(v-if='!msg.likes[user._id]') {{ $t('like') }}
|
||||||
span(v-if='msg.likes[user._id]') {{ $t('liked') }}
|
span(v-if='msg.likes[user._id]') {{ $t('liked') }}
|
||||||
|
// @TODO make copyAsTodo work in Tavern, guilds, party (inbox can be done later)
|
||||||
span.action(v-if='!inbox', @click='copyAsTodo(msg)')
|
span.action(v-if='!inbox', @click='copyAsTodo(msg)')
|
||||||
.svg-icon(v-html="icons.copy")
|
.svg-icon(v-html="icons.copy")
|
||||||
| {{$t('copyAsTodo')}}
|
| {{$t('copyAsTodo')}}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
.svg-icon.shield(v-html="icons.silverGuildBadgeIcon", v-if='group.memberCount > 100 && group.memberCount < 999')
|
.svg-icon.shield(v-html="icons.silverGuildBadgeIcon", v-if='group.memberCount > 100 && group.memberCount < 999')
|
||||||
.svg-icon.shield(v-html="icons.bronzeGuildBadgeIcon", v-if='group.memberCount < 100')
|
.svg-icon.shield(v-html="icons.bronzeGuildBadgeIcon", v-if='group.memberCount < 100')
|
||||||
span.number {{ group.memberCount | abbrNum }}
|
span.number {{ group.memberCount | abbrNum }}
|
||||||
div(v-once) {{ $t('members') }}
|
div(v-once) {{ $t('memberList') }}
|
||||||
.col-4(v-if='!isParty')
|
.col-4(v-if='!isParty')
|
||||||
.item-with-icon
|
.item-with-icon
|
||||||
.svg-icon.gem(v-html="icons.gem")
|
.svg-icon.gem(v-html="icons.gem")
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
label
|
label
|
||||||
strong(v-once) {{$t('guildOrPartyLeader')}} *
|
strong(v-once) {{$t('guildOrPartyLeader')}} *
|
||||||
select.form-control(v-model="workingGroup.newLeader")
|
select.form-control(v-model="workingGroup.newLeader")
|
||||||
option(v-for='member in members', :value="member._id") {{ member.profile.name }}
|
option(v-for='potentialLeader in potentialLeaders', :value="potentialLeader._id") {{ potentialLeader.name }}
|
||||||
|
|
||||||
.form-group(v-if='!this.workingGroup.id')
|
.form-group(v-if='!this.workingGroup.id')
|
||||||
label
|
label
|
||||||
@@ -316,6 +316,17 @@ export default {
|
|||||||
isParty () {
|
isParty () {
|
||||||
return this.workingGroup.type === 'party';
|
return this.workingGroup.type === 'party';
|
||||||
},
|
},
|
||||||
|
potentialLeaders () {
|
||||||
|
let leaders = [{ _id: this.user._id, name: this.user.profile.name }];
|
||||||
|
// @TODO consider pushing all recent posters to the top of the list if they are guild members - more likely to be the ones the leader wants to see (and then ignore them in the while below)
|
||||||
|
let i = 0;
|
||||||
|
while (this.members[i]) {
|
||||||
|
let memb = this.members[i];
|
||||||
|
i++;
|
||||||
|
if (memb._id !== this.user._id) leaders.push({_id: memb._id, name: memb.profile.name});
|
||||||
|
}
|
||||||
|
return leaders;
|
||||||
|
},
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
editingGroup () {
|
editingGroup () {
|
||||||
|
|||||||
@@ -169,6 +169,7 @@
|
|||||||
.form-group
|
.form-group
|
||||||
input.form-control(type='password', :placeholder="$t('confirmPass')", v-model='passwordUpdates.confirmPassword')
|
input.form-control(type='password', :placeholder="$t('confirmPass')", v-model='passwordUpdates.confirmPassword')
|
||||||
button.btn.btn-primary(type='submit', @click='changeUser("password", passwordUpdates)') {{ $t('submit') }}
|
button.btn.btn-primary(type='submit', @click='changeUser("password", passwordUpdates)') {{ $t('submit') }}
|
||||||
|
hr
|
||||||
|
|
||||||
div
|
div
|
||||||
h5 {{ $t('dangerZone') }}
|
h5 {{ $t('dangerZone') }}
|
||||||
|
|||||||
@@ -80,6 +80,7 @@
|
|||||||
"logoUrl": "Logo URL",
|
"logoUrl": "Logo URL",
|
||||||
"assignLeader": "Assign Group Leader",
|
"assignLeader": "Assign Group Leader",
|
||||||
"members": "Members",
|
"members": "Members",
|
||||||
|
"memberList": "Member List",
|
||||||
"partyList": "Order for party members in header",
|
"partyList": "Order for party members in header",
|
||||||
"banTip": "Boot Member",
|
"banTip": "Boot Member",
|
||||||
"moreMembers": "more members",
|
"moreMembers": "more members",
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
"exclusiveJackalopePetText": "Get the Royal Purple Jackalope pet, available only to subscribers!",
|
"exclusiveJackalopePetText": "Get the Royal Purple Jackalope pet, available only to subscribers!",
|
||||||
"giftSubscription": "Want to gift a subscription to someone?",
|
"giftSubscription": "Want to gift a subscription to someone?",
|
||||||
"giftSubscriptionText1": "Open their profile! You can do this by clicking on their avatar in your party header or by clicking on their name in chat.",
|
"giftSubscriptionText1": "Open their profile! You can do this by clicking on their avatar in your party header or by clicking on their name in chat.",
|
||||||
"giftSubscriptionText2": "Click on the gift icon in the bottom left of their profile.",
|
"giftSubscriptionText2": "Click on the gift icon in the top right of their profile.",
|
||||||
"giftSubscriptionText3": "Select \"subscription\" and enter your payment information.",
|
"giftSubscriptionText3": "Select \"subscription\" and enter your payment information.",
|
||||||
"giftSubscriptionText4": "Thanks for supporting Habitica!",
|
"giftSubscriptionText4": "Thanks for supporting Habitica!",
|
||||||
"monthUSD": "USD / Month",
|
"monthUSD": "USD / Month",
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
"subCanceled": "Subscription will become inactive on",
|
"subCanceled": "Subscription will become inactive on",
|
||||||
"buyGemsGoldTitle": "To Buy Gems with Gold",
|
"buyGemsGoldTitle": "To Buy Gems with Gold",
|
||||||
"becomeSubscriber": "Become a Subscriber",
|
"becomeSubscriber": "Become a Subscriber",
|
||||||
"subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold. You can see how many Gems are available to buy at the corner of the Gem icon.",
|
"subGemPop": "Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.",
|
||||||
"subGemName": "Subscriber Gems",
|
"subGemName": "Subscriber Gems",
|
||||||
"freeGemsTitle": "Obtain Gems for Free",
|
"freeGemsTitle": "Obtain Gems for Free",
|
||||||
"maxBuyGems": "You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!",
|
"maxBuyGems": "You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!",
|
||||||
|
|||||||
Reference in New Issue
Block a user