move Rest checkbox out of avatar into settings for now, we'll put back

once we've added the tavern art
This commit is contained in:
Tyler Renelle 2013-04-14 14:33:50 -04:00
parent 299eaa8a14
commit 6e0b82e081
2 changed files with 10 additions and 6 deletions

View file

@ -9,7 +9,6 @@
<ul class="nav nav-tabs">
<li class="active"><a data-toggle='tab' href="#profileCustomize">Avatar</a></li>
<li><a data-toggle='tab' href="#profileEdit">Profile</a></li>
<li><a data-toggle='tab' data-target="#rest">Rest</a></li>
{#if _user.flags.dropsEnabled}
<li><a data-toggle='tab' data-target="#profileInventory">Inventory</a></li>
<li><a data-toggle='tab' data-target="#profileMarket">Market</a></li>
@ -26,10 +25,6 @@
<app:avatar:profile user="{_user}" main="true" />
</div>
<div class="tab-pane" id="rest">
<app:avatar:rest />
</div>
<div class="tab-pane" id="profileInventory">
<app:avatar:inventory />
</div>
@ -220,7 +215,14 @@
</div>
<rest:>
<input type="checkbox" name="rest" checked={_user.flags.rest} >Rest</input>
<form>
<fieldset>
<label class="checkbox">
<input type="checkbox" name="rest" checked={_user.flags.rest} >Temporarily freeze account
</label>
<small>Useful if you're going on vacation for or get sick.</small>
</fieldset>
</form>
<achievements:>
<!--TODO replce this in the future with HTML from BrowserQuest's index.html, which properly handles the achievements

View file

@ -20,6 +20,8 @@
<hr/>
<h4>Misc</h4>
<button x-bind="click:toggleHeader" class="btn">{#if _user.preferences.hideHeader}Show Header{else}Hide Header{/}</button>
<br/><br/>
<app:avatar:rest />
{{#if _user.auth.local}}
<hr/>