krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 14:17:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sept 22 2 (#9067)

Browse Source 
* Added show member modal when hero is clicked

* Added drag for checklist and fixed display system messages

* Fixed party modal showing from group page

* Delete new message key

* Adjusted column sizes for chat

* Fixed key
This commit is contained in:
Keith Holliday
2017-09-22 19:30:37 -05:00
committed by GitHub
parent 6edd1a1fa5
commit cbdb0bc3e3
5 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/client/components/hall/heroes.vue
View File

@@ -14,7 +14,7 @@
.row
.form.col-6(v-if='hero && hero.profile', submit='saveHero(hero)')
a(@click='clickMember(hero._id, true)')
a(@click='clickMember(hero, true)')
h3 {{hero.profile.name}}
.form-group
input.form-control(type='text', v-model='hero.contributor.text', :placeholder="$t('contribTitle')")
@@ -82,11 +82,11 @@
tr(v-for='(hero, index) in heroes')
td
span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
a.label.label-default(:class='userLevelStyle(hero)', @click='clickMember(hero._id, true)')
a.label.label-default(:class='userLevelStyle(hero)', @click='clickMember(hero, true)')
| {{hero.profile.name}} 
//- span(v-class='userAdminGlyphiconStyle(hero)')
span(v-if='!hero.contributor || !hero.contributor.admin')
a.label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)', @click='clickMember(hero._id, true)') {{hero.profile.name}}
a.label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)', @click='clickMember(hero, true)') {{hero.profile.name}}
td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
td {{hero.contributor.level}}
td {{hero.contributor.text}}
@@ -185,8 +185,10 @@ export default {
window.scrollTo(0, 200);
this.loadHero(id, index);
},
clickMember () {
// @TODO: implement
clickMember (hero) {
this.$store.state.profileUser = hero;
this.$store.state.profileOptions.startingPage = 'profile';
this.$root.$emit('show::modal', 'profile');
},
userLevelStyle () {
// @TODO: implement