mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 03:52:14 +00:00
reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again
This commit is contained in:
Tyler Renelle
parent
1cd3299388
commit
16b9ea3b58
4 changed files with 114 additions and 114 deletions
|
|
@ -1,11 +1,11 @@
|
||||||
<import: src="modals">
|
<import: src="modals">
|
||||||
<import: src="alerts">
|
<import: src="tasks" ns="">
|
||||||
<import: src="settings">
|
|
||||||
<import: src="rewards">
|
|
||||||
<import: src="tasks">
|
|
||||||
<import: src="header">
|
<import: src="header">
|
||||||
|
<import: src="alerts">
|
||||||
<import: src="avatar">
|
<import: src="avatar">
|
||||||
|
<import: src="rewards" ns="">
|
||||||
<import: src="footer">
|
<import: src="footer">
|
||||||
|
<import: src="settings">
|
||||||
<import: src="party">
|
<import: src="party">
|
||||||
|
|
||||||
<Title:>
|
<Title:>
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
<div id=wrap class="container-fluid">
|
<div id=wrap class="container-fluid">
|
||||||
<app:alerts:alerts />
|
<app:alerts:alerts />
|
||||||
<div id=main class="row-fluid">
|
<div id=main class="row-fluid">
|
||||||
<app:tasks:taskLists />
|
<app:taskLists />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
<!-- Re-Roll modal -->
|
<!-- Re-Roll modal -->
|
||||||
<app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
|
<app:modals:modal modalId='reroll-modal' header="Reset Your Tasks">
|
||||||
<app:rewards:userTokens/>
|
<app:userTokens/>
|
||||||
<p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
|
<p>Highly discouraged because red tasks provide good incentive to improve (<a target="_blank" href="https://github.com/lefnire/habitrpg#all-my-tasks-are-red-im-dying-too-fast">read more</a>). However, this becomes necessary after long bouts of bad habits.</p>
|
||||||
<@footer>
|
<@footer>
|
||||||
{#if lt(_user.balance,1)}
|
{#if lt(_user.balance,1)}
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
<!-- Buy more tokens modal -->
|
<!-- Buy more tokens modal -->
|
||||||
<app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
|
<app:modals:modal modalId='more-tokens-modal' header="Out Of Tokens">
|
||||||
<app:rewards:userTokens/>
|
<app:userTokens/>
|
||||||
<p>You're out of tokens, which are used to buy pets and mounts.</p>
|
<p>You're out of tokens, which are used to buy pets and mounts.</p>
|
||||||
<@footer>
|
<@footer>
|
||||||
<a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
|
<a data-dismiss="modal" x-bind="click:showStripe" class="btn btn-success btn-large">Buy More Tokens</a><span class='token-cost'>Not enough tokens</span>
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,17 @@
|
||||||
<rewardsTab:>
|
<rewardsTab:>
|
||||||
<ul class='rewards'>
|
<ul class='rewards'>
|
||||||
{#each _rewardList as :task}<app:tasks:task />{/}
|
{#each _rewardList as :task}<app:task />{/}
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
{#if _user.flags.itemsEnabled}
|
{#if _user.flags.itemsEnabled}
|
||||||
<ul class='items'>
|
<ul class='items'>
|
||||||
{#with _view.items.weapon as :item}<app:rewards:item />{/}
|
{#with _view.items.weapon as :item}<app:item />{/}
|
||||||
{#with _view.items.armor as :item}<app:rewards:item />{/}
|
{#with _view.items.armor as :item}<app:item />{/}
|
||||||
{#with _view.items.head as :item}<app:rewards:item />{/}
|
{#with _view.items.head as :item}<app:item />{/}
|
||||||
{#with _view.items.shield as :item}<app:rewards:item />{/}
|
{#with _view.items.shield as :item}<app:item />{/}
|
||||||
{#with _view.items.potion as :item}<app:rewards:item />{/}
|
{#with _view.items.potion as :item}<app:item />{/}
|
||||||
{#with _view.items.reroll as :item}<app:rewards:item reroll=true />{/}
|
{#with _view.items.reroll as :item}<app:item reroll=true />{/}
|
||||||
</ul>
|
</ul>
|
||||||
{/}
|
{/}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,23 +2,23 @@
|
||||||
<!--helpTitle & helpContent moved to tour -->
|
<!--helpTitle & helpContent moved to tour -->
|
||||||
<div class="task-column span3 habits">
|
<div class="task-column span3 habits">
|
||||||
<h2>Habits</h2>
|
<h2>Habits</h2>
|
||||||
<app:tasks:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
|
<app:newTask type="habit" inputValue="{_newHabit}" placeHolder="New Habit" />
|
||||||
<ul class="habits">{#each _habitList as :task}<app:tasks:task />{/}</ul>
|
<ul class="habits">{#each _habitList as :task}<app:task />{/}</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="task-column span3 dailys">
|
<div class="task-column span3 dailys">
|
||||||
<h2>Daily</h2>
|
<h2>Daily</h2>
|
||||||
<app:tasks:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
|
<app:newTask type="daily" inputValue="{_newDaily}" placeHolder="New Daily" />
|
||||||
<ul class='dailys'>{#each _dailyList as :task}<app:tasks:task />{/}</ul>
|
<ul class='dailys'>{#each _dailyList as :task}<app:task />{/}</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
|
<div class="task-column span3 todos context-enabled context-uncompleted tabbable tabs-below" id="todo-well">
|
||||||
<h2>Todos</h2>
|
<h2>Todos</h2>
|
||||||
<div class="display-context-dependant show-for-uncompleted">
|
<div class="display-context-dependant show-for-uncompleted">
|
||||||
<app:tasks:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
|
<app:newTask type="todo" inputValue="{_newTodo}" placeHolder="New Todo" />
|
||||||
</div>
|
</div>
|
||||||
<ul class='todos task-list'>
|
<ul class='todos task-list'>
|
||||||
{#each _todoList as :task}<app:tasks:task />{/}
|
{#each _todoList as :task}<app:task />{/}
|
||||||
</ul>
|
</ul>
|
||||||
<div class="display-context-dependant show-for-completed">
|
<div class="display-context-dependant show-for-completed">
|
||||||
<a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
|
<a class='btn' x-bind=click:clearCompleted>Clear Completed</a>
|
||||||
|
|
@ -55,120 +55,120 @@
|
||||||
<td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
|
<td><div class='shop_copper' rel='tooltip' title='shop_copper'></div></td>-->
|
||||||
</tr></table>
|
</tr></table>
|
||||||
{else}
|
{else}
|
||||||
<app:rewards:userTokens />
|
<app:userTokens />
|
||||||
{/}
|
{/}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<app:tasks:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
|
<app:newTask type="reward" inputValue="{_newReward}" placeHolder="New Reward" />
|
||||||
|
|
||||||
{#if equal(_user.flags.petsEnabled,true)}
|
{#if _user.flags.petsEnabled}
|
||||||
<div class='tabbable tabs-below'>
|
<div class='tabbable tabs-below'>
|
||||||
|
|
||||||
<div class="tab-content">
|
<div class="tab-content">
|
||||||
<div class="tab-pane active" id="rewards-tab">
|
<div class="tab-pane active" id="rewards-tab">
|
||||||
<app:rewards:rewardsTab />
|
<app:rewardsTab />
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="tab-pane" id="pets-tab">
|
|
||||||
{#with _view.items.pets as :pets}
|
|
||||||
|
|
||||||
<div class="row-fluid">
|
|
||||||
{#with :pets[0]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[1]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[2]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[3]}<app:rewards:pet />{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row-fluid">
|
|
||||||
{#with :pets[4]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[5]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[6]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[7]}<app:rewards:pet />{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row-fluid">
|
|
||||||
{#with :pets[8]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[9]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[10]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[11]}<app:rewards:pet />{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row-fluid">
|
|
||||||
{#with :pets[12]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[13]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[14]}<app:rewards:pet />{/}
|
|
||||||
{#with :pets[15]}<app:rewards:pet />{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row-fluid">
|
|
||||||
{#with :pets[16]}<app:rewards:pet />{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
{/}
|
|
||||||
</div>
|
|
||||||
<!--<div class="tab-pane" id="mounts-tab">...</div>-->
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="tab-pane" id="pets-tab">
|
||||||
|
{#with _view.items.pets as :pets}
|
||||||
|
|
||||||
<ul class="nav nav-tabs" id="rewardsTabs">
|
<div class="row-fluid">
|
||||||
<li class="active"><a href="#rewards-tab" data-toggle="tab" x-bind="click:activateRewardsTab">Rewards</a></li>
|
{#with :pets[0]}<app:pet />{/}
|
||||||
<li><a href="#pets-tab" data-toggle="tab" x-bind='click:activatePetsTab'>Pets</a></li>
|
{#with :pets[1]}<app:pet />{/}
|
||||||
<!--<li><a href="#mounts-tab" data-toggle="tab">Mounts</a></li>-->
|
{#with :pets[2]}<app:pet />{/}
|
||||||
</ul>
|
{#with :pets[3]}<app:pet />{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row-fluid">
|
||||||
|
{#with :pets[4]}<app:pet />{/}
|
||||||
|
{#with :pets[5]}<app:pet />{/}
|
||||||
|
{#with :pets[6]}<app:pet />{/}
|
||||||
|
{#with :pets[7]}<app:pet />{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row-fluid">
|
||||||
|
{#with :pets[8]}<app:pet />{/}
|
||||||
|
{#with :pets[9]}<app:pet />{/}
|
||||||
|
{#with :pets[10]}<app:pet />{/}
|
||||||
|
{#with :pets[11]}<app:pet />{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row-fluid">
|
||||||
|
{#with :pets[12]}<app:pet />{/}
|
||||||
|
{#with :pets[13]}<app:pet />{/}
|
||||||
|
{#with :pets[14]}<app:pet />{/}
|
||||||
|
{#with :pets[15]}<app:pet />{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row-fluid">
|
||||||
|
{#with :pets[16]}<app:pet />{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
{/}
|
||||||
|
</div>
|
||||||
|
<!--<div class="tab-pane" id="mounts-tab">...</div>-->
|
||||||
</div>
|
</div>
|
||||||
{else}
|
|
||||||
<app:rewards:rewardsTab />
|
|
||||||
{/}
|
<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>
|
||||||
|
{else}
|
||||||
|
<app:rewardsTab />
|
||||||
|
{/}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<newTask:>
|
<newTask:>
|
||||||
<form class="addtask-form form-inline new-task-form" id="new-{{@type}}" data-task-type="{{@type}}" x-bind="submit:addTask">
|
<form class="addtask-form form-inline new-task-form" id="new-{@type}" data-task-type="{@type}" x-bind="submit:addTask">
|
||||||
<input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{{@placeHolder}}"/>
|
<input class="addtask-field" value="{@inputValue}" type="text" name="new-task" placeholder="{@placeHolder}"/>
|
||||||
<input class="btn addtask-btn" type="submit" value="Add">
|
<input class="btn addtask-btn" type="submit" value="Add">
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
<!-- all the parts of a single task -->
|
<!-- all the parts of a single task -->
|
||||||
<task:>
|
<task:>
|
||||||
<li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
|
<li data-id={{:task.id}} class="task {taskClasses(:task.type, :task.completed, :task.value, :task.repeat)}">
|
||||||
<!-- right-hand side control buttons -->
|
<!-- right-hand side control buttons -->
|
||||||
<div class="task-meta-controls">
|
<div class="task-meta-controls">
|
||||||
<div class="hover-show">
|
<div class="hover-show">
|
||||||
<a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
|
<a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
|
||||||
<a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
|
<a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
|
||||||
{#if :task.history}
|
{#if :task.history}
|
||||||
<a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
|
<a x-bind=click:toggleChart data-toggle-id="{{:task.id}}-chart" data-hide-id="{{:task.id}}-edit" data-history-path="_user.tasks.{{:task.id}}.history" rel="tooltip" title="Progress">
|
||||||
<i class="icon-signal"></i>
|
<i class="icon-signal"></i>
|
||||||
</a>
|
</a>
|
||||||
|
{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if :task.notes}
|
||||||
|
<span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
|
||||||
{/}
|
{/}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if :task.notes}
|
<!-- left-hand side checkbox -->
|
||||||
<span rel="popover" data-trigger="hover" data-placement="left" data-content="{:task.notes}" data-original-title="{:task.text}" class='task-notes'><i class="icon-comment"></i></span>
|
<div class="task-controls">
|
||||||
{/}
|
<!-- Habits -->
|
||||||
</div>
|
{#if equal(:task.type, 'habit')}
|
||||||
|
{#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
|
||||||
|
{#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
|
||||||
|
<!-- Rewards -->
|
||||||
|
{else if equal(:task.type, 'reward')}
|
||||||
|
<a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
|
||||||
|
<!-- Daily & Todos -->
|
||||||
|
{else}
|
||||||
|
<input type=checkbox checked="{:task.completed}">
|
||||||
|
{/}
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- left-hand side checkbox -->
|
<!-- main content -->
|
||||||
<div class="task-controls">
|
<div class="task-text">{:task.text}</div>
|
||||||
<!-- Habits -->
|
|
||||||
{#if equal(:task.type, 'habit')}
|
|
||||||
{#if :task.up}<a data-direction=up x-bind=click:score><img src="/img/add.png" /></a>{/}
|
|
||||||
{#if :task.down}<a data-direction=down x-bind=click:score><img src="/img/remove.png" /></a>{/}
|
|
||||||
<!-- Rewards -->
|
|
||||||
{else if equal(:task.type, 'reward')}
|
|
||||||
<a x-bind=click:score class="buy-link" data-direction=down>{:task.value}<img src="/img/coin_single_gold.png"/></a>
|
|
||||||
<!-- Daily & Todos -->
|
|
||||||
{else}
|
|
||||||
<input type=checkbox checked="{:task.completed}">
|
|
||||||
{/}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- main content -->
|
<!-- edit/options dialog -->
|
||||||
<div class="task-text">{:task.text}</div>
|
<app:taskMeta />
|
||||||
|
</li>
|
||||||
<!-- edit/options dialog -->
|
|
||||||
<app:tasks:taskMeta />
|
|
||||||
</li>
|
|
||||||
|
|
||||||
<taskMeta:>
|
<taskMeta:>
|
||||||
<div style="display:none;" id={{:task.id}}-edit>
|
<div style="display:none;" id={{:task.id}}-edit>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue