sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 15:31:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaner profiles modal, also fix bug where user.profile not being

Browse source 
sent (hence not seeing eachother's info)
This commit is contained in:
Tyler Renelle 2013-05-03 12:04:17 +01:00
parent b3620f1db0
commit 7308b8ffbc
3 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/app/profile.coffee
View file

@ -24,13 +24,12 @@ module.exports.app = (appExports, model) ->
model.set '_gamePane', !model.get('_gamePane'), ->
browser.setupTooltips()
appExports.profileChangeActive = (e, el) ->
appExports.clickAvatar = (e, el) ->
uid = $(el).attr('data-uid')
if uid is model.get('_userId') # clicked self
toggleGamePane()
else
model.ref '_profileActive', model.at("users.#{uid}")
$('#avatar-modal').modal('show')
$("#avatar-modal-#{uid}").modal('show')
appExports.toggleGamePane = -> toggleGamePane()

1
src/server/store.coffee
View file

@ -89,6 +89,7 @@ partySystem = (store) ->
.only('stats',
'items',
'party',
'profile',
'preferences',
'auth.local.username',
'auth.facebook.displayName')

47
views/app/avatar.html
View file

@ -1,10 +1,12 @@
<modals:>
<app:modals:modal modalId="avatar-modal">
<app:avatar:profile profile={_profileActive} />
<@footer>
<button data-dismiss="modal" class="btn btn-success">Ok</button>
</@footer>
</app:modals:modal>
{{#each _partyMembers as :profile}}
<app:modals:modal modalId="avatar-modal-{{:profile.id}}">
<app:avatar:profile profile={{:profile}} />
<@footer>
<button data-dismiss="modal" class="btn btn-success">Ok</button>
</@footer>
</app:modals:modal>
{{/}}
<avatar:>
<figure class="herobox"
@ -12,7 +14,7 @@
data-level="{@profile.stats.lvl}"
data-checkpet="{#if @profile.items.pet}hasPet{/}"
data-checkuser="{{#if @main}}isUser{{/}}"
data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
data-uid="{{@profile.id}}" x-bind="click:clickAvatar"
rel="popover" data-placement="bottom" data-trigger="hover" data-html="true" data-content="{{#unless @main}}
<div>
<div class='progress progress-danger' style='height:5px;'>
@ -140,27 +142,20 @@
<profile:>
<div class='row-fluid'>
<div class='span6'>
<h3>
{#if _profileActive.profile.name}
{_profileActive.profile.name}
{else}
{username(_profileActive.auth, _profileActive.profile.name)}
{/}
{#if _profileActiveMain}<a class='btn pull-right' x-bind="click:profileEdit">Edit</a>{/}
</h3>
{#if _profileActive.profile.imageUrl}
<img src="{_profileActive.profile.imageUrl}" />
{/}
{#if _profileActive.profile.blurb}
<p>{_profileActive.profile.blurb}</p>
{/}
{#if _profileActive.profile.websites}
<h3>{{username(@profile.auth, @profile.profile.name)}}</h3>
{{#if @profile.profile.imageUrl}}
<img src="{{@profile.profile.imageUrl}}" />
{{/}}
{{#if @profile.profile.blurb}}
<p>{{@profile.profile.blurb}}</p>
{{/}}
{{#if @profile.profile.websites}}
<ul>
{#each _profileActive.profile.websites as :website}
<li>{:website}</li>
{/}
{{#each @profile.profile.websites as :website}}
<li>{{:website}}</li>
{{/}}
</ul>
{/}
{{/}}
</div>
<div class='span6'>
<h3>Achievements</h3>