Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move some pet html around

Browse Source
This commit is contained in:
Tyler Renelle
2013-03-22 19:21:35 -06:00
parent a862e21e8e
commit 5043c46b5a
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
views/app/pets.html
+11 -3
View File
@@ -1,9 +1,7 @@
<modals:>
<app:modals:modal modalId='drops-enabled-modal' header="Drops Enabled!">
<p>You've unlocked the drop system.</p>
<p>Here's your first egg! {_user.items.eggs.0.text}</p>
<p>Feed it some meat to get it to hatch.</p>
<p>You've unlocked the drop system! Now when you complete tasks, you have a random chance of finding an item drop. And guess what? You just found a {_user.items.eggs.0.text} egg! {_user.items.eggs.0.notes}</p>
<@footer>
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
</@footer>
@@ -17,3 +15,13 @@
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
</@footer>
</app:modals:modal>
<pet:>
<td class="{#if _user.items.pets[.name]}active-pet{/}">
<img rel=tooltip title="{.text} - {.value} Tokens" x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>
</td>
<food:>
<td class="active-food">
<div rel=tooltip class="{.name}" title="{.text} - {.value} Tokens" x-bind="click:buyFood" data-food='{.name}'>{.text}</div>
</td>
views/app/rewards.html
+10 -20
View File
@@ -36,20 +36,20 @@
{#with _view.items.food as :food}
<table>
<tr>
{#with :food[0]}<app:food />{/}
{#with :food[1]}<app:food />{/}
{#with :food[2]}<app:food />{/}
{#with :food[3]}<app:food />{/}
{#with :food[0]}<app:pets:food />{/}
{#with :food[1]}<app:pets:food />{/}
{#with :food[2]}<app:pets:food />{/}
{#with :food[3]}<app:pets:food />{/}
</tr>
<tr>
{#with :food[4]}<app:food />{/}
{#with :food[5]}<app:food />{/}
{#with :food[6]}<app:food />{/}
{#with :food[7]}<app:food />{/}
{#with :food[4]}<app:pets:food />{/}
{#with :food[5]}<app:pets:food />{/}
{#with :food[6]}<app:pets:food />{/}
{#with :food[7]}<app:pets:food />{/}
</tr>
<tr>
{#with :food[8]}<app:food />{/}
{#with :food[9]}<app:food />{/}
{#with :food[8]}<app:pets:food />{/}
{#with :food[9]}<app:pets:food />{/}
</tr>
</table>
{/}
@@ -94,16 +94,6 @@
</ul>
{/}
<pet:>
<td class="{#if _user.items.pets[.name]}active-pet{/}">
<img rel=tooltip title="{.text} - {.value} Tokens" x-bind="click:selectPet" data-pet='{.name}' src='img/sprites/{.icon}'/>
</td>
<food:>
<td class="active-food">
<div rel=tooltip class="{.name}" title="{.text} - {.value} Tokens" x-bind="click:buyFood" data-food='{.name}'>{.text}</div>
</td>
<userTokens:>
<a class="pull-right token-wallet">
<span class="task-action-btn tile flush bright add-token-btn">＋</span>