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

Merge branch 'develop'

Browse source
This commit is contained in:
Tyler Renelle 2013-04-21 17:47:06 -04:00
commit 5fb7bb5090
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
views/app/avatar.html
View file

@ -175,8 +175,8 @@
</form>
</div>
<ul>
{#each _user.profile.websites as :website}
<!-- would prefer if there were and index in #each, instead using data-website to search with indexOf -->
{#each _user.profile.websites as :website}
<li>{:website} <a data-website="{:website}" x-bind="click:profileRemoveWebsite"><i class='icon-remove'></i></a></li>
{/}
</ul>

8
views/app/header.html
View file

@ -29,14 +29,14 @@
NOTE TO SELF: Ask Tyler if some kind of inter-leaving is possible
where we can put ONE of the results of this loop BEFORE the progress bars, and the rest after-->
{{#each _partyMembers as :member}}
{{#unless equal(:member.id, _userId)}}
<div class="herobox-wrap">
<div class="herobox-wrap">
{{#unless equal(:member.id, _userId)}}
<app:avatar:avatar profile={{:member}} party="true" />
<!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
<!-- I've re-implemented the rollover using the actual `herobox`/avatar template and data-attributes.
This Derby template idea would have been really handy but this is pretty versatile, and keeps it all in the avatar section -->
</div>
{{/}}
{{/}}
</div>
{{/}}
</header>

2
views/app/pets.html
View file

@ -75,7 +75,7 @@
<form x-bind="submit:hatchEgg">
<select>
{#each _user.items.hatchingPotions as :hatchingPotion}
<option>{:hatchingPotion}</option>
<option>{:hatchingPotion}</option>
{/each}
</select>
<button type=submit>Pour</button>