sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-01 03:30:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move rewards column into rewards rewards.html

Browse source
This commit is contained in:
Tyler Renelle 2013-03-18 16:47:03 -04:00
parent a4cfd9d19c
commit 70dcd0b886
2 changed files with 88 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
views/app/rewards.html
View file

@ -1,3 +1,87 @@
<rewardsColumn:>
<div class="module">
<div class="task-column rewards">
<!-- cash or tokens -->
<span class='option-box pull-right wallet'>
{#unless _view.activeTabPets}
<div class="money">
{gold(_user.stats.gp)}
<span class='shop_gold' rel='tooltip' title='Gold'></span>
</div>
<div class="money">
{silver(_user.stats.gp)}
<span class='shop_silver' rel='tooltip' title='Silver'></span>
</div>
<!-- <div class="money">
{copper(_user.stats.gp)}
<span class='shop_copper' rel='tooltip' title='Copper'></span>
</div> -->
{else}
<app:rewards:userTokens />
{/}
</span>
<h2 class="task-column_title">Rewards</h2>
<!-- if pets are enabled, make tabs -->
{#if equal(_user.flags.petsEnabled,true)}
<div class='tabbable tabs-below'>
<div class="tab-content">
<div class="tab-pane active" id="rewards-tab">
<app:rewards:rewardsTab />
</div>
<!-- pets pane -->
<div class="tab-pane pet-grid" id="pets-tab">
{#with _view.items.pets as :pets}
<table>
<tr>
{#with :pets[0]}<app:rewards:pet />{/}
{#with :pets[1]}<app:rewards:pet />{/}
{#with :pets[2]}<app:rewards:pet />{/}
{#with :pets[3]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[4]}<app:rewards:pet />{/}
{#with :pets[5]}<app:rewards:pet />{/}
{#with :pets[6]}<app:rewards:pet />{/}
{#with :pets[7]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[8]}<app:rewards:pet />{/}
{#with :pets[9]}<app:rewards:pet />{/}
{#with :pets[10]}<app:rewards:pet />{/}
{#with :pets[11]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[12]}<app:rewards:pet />{/}
{#with :pets[13]}<app:rewards:pet />{/}
{#with :pets[14]}<app:rewards:pet />{/}
{#with :pets[15]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[16]}<app:rewards:pet />{/}
</tr>
</table>
{/}
</div>
<!--<div class="tab-pane" id="mounts-tab">...</div>-->
</div>
<ul class="nav nav-tabs" id="rewardsTabs">
<li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
<li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
<!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
</ul>
</div>
<!-- if pets are disabled, just do rewards tab -->
{else}
<app:rewards:rewardsTab />
{/}
</div>
</div>
<rewardsTab:>
<!-- add new reward -->
<app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
@ -21,7 +105,7 @@
{/}
<pet:>
<td class="{{#if _user.items.pets[.name]}}active-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>
@ -35,8 +119,7 @@
<item:>
{#unless :item.hide}
<li class="task reward-item">
<li class="task reward-item {#if :item.hide}hide{/}">
<!-- right-hand side control buttons -->
<div class="task-meta-controls">
<span rel="popover" data-trigger="hover" data-placement="left" data-content="{:item.notes}" data-original-title="{:item.text}" class='task-notes'><i class="icon-comment"></i></span>
@ -56,5 +139,4 @@
<!-- main content -->
<span class="shop_{:item.classes} shop-sprite item-img"></span>
<p class="task-text">{:item.text}</p>
</li>
{/}
</li>

81
views/app/tasks.html
View file

@ -54,87 +54,8 @@
</div>
<!-- Rewards Column -->
<div class="module">
<div class="task-column rewards">
<!-- cash or tokens -->
<span class='option-box pull-right wallet'>
{#unless _view.activeTabPets}
<div class="money">
{gold(_user.stats.gp)}
<span class='shop_gold' rel='tooltip' title='Gold'></span>
</div>
<div class="money">
{silver(_user.stats.gp)}
<span class='shop_silver' rel='tooltip' title='Silver'></span>
</div>
<!-- <div class="money">
{copper(_user.stats.gp)}
<span class='shop_copper' rel='tooltip' title='Copper'></span>
</div> -->
{else}
<app:rewards:userTokens />
{/}
</span>
<h2 class="task-column_title">Rewards</h2>
<app:rewards:rewardsColumn />
<!-- if pets are enabled, make tabs -->
{#if equal(_user.flags.petsEnabled,true)}
<div class='tabbable tabs-below'>
<div class="tab-content">
<div class="tab-pane active" id="rewards-tab">
<app:rewards:rewardsTab />
</div>
<!-- pets pane -->
<div class="tab-pane pet-grid" id="pets-tab">
{#with _view.items.pets as :pets}
<table>
<tr>
{#with :pets[0]}<app:rewards:pet />{/}
{#with :pets[1]}<app:rewards:pet />{/}
{#with :pets[2]}<app:rewards:pet />{/}
{#with :pets[3]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[4]}<app:rewards:pet />{/}
{#with :pets[5]}<app:rewards:pet />{/}
{#with :pets[6]}<app:rewards:pet />{/}
{#with :pets[7]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[8]}<app:rewards:pet />{/}
{#with :pets[9]}<app:rewards:pet />{/}
{#with :pets[10]}<app:rewards:pet />{/}
{#with :pets[11]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[12]}<app:rewards:pet />{/}
{#with :pets[13]}<app:rewards:pet />{/}
{#with :pets[14]}<app:rewards:pet />{/}
{#with :pets[15]}<app:rewards:pet />{/}
</tr>
<tr>
{#with :pets[16]}<app:rewards:pet />{/}
</tr>
</table>
{/}
</div>
<!--<div class="tab-pane" id="mounts-tab">...</div>-->
</div>
<ul class="nav nav-tabs" id="rewardsTabs">
<li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
<li><a href="#pets-tab" id='pets-tab' data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
<!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
</ul>
</div>
<!-- if pets are disabled, just do rewards tab -->
{else}
<app:rewards:rewardsTab />
{/}
</div>
</div>
<!-- Templates -->
<newTask:>