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

add 'options' menu item back, more obvious toggling between panes

Browse source
This commit is contained in:
Tyler Renelle 2013-05-02 17:26:20 +01:00
parent 77bd61c244
commit bdb4a08f9e
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/app/profile.coffee
View file

@ -19,12 +19,18 @@ module.exports.app = (appExports, model) ->
sites.splice(i,1)
user.set 'profile.websites', sites
appExports.profileChangeActive = (e, el) ->
uid = $(el).attr('data-uid')
model.ref '_profileActive', model.at("users.#{uid}")
browser.setupTooltips(model)
appExports.toggleGamePane = ->
toggleGamePane = ->
model.set '_gamePane', !model.get('_gamePane'), ->
browser.setupTooltips()
appExports.profileChangeActive = (e, el) ->
uid = $(el).attr('data-uid')
if uid is model.get('_userId') # clicked self
toggleGamePane()
else
model.ref '_profileActive', model.at("users.#{uid}")
$('#avatar-modal').modal('show')
appExports.toggleGamePane = -> toggleGamePane()

2
views/app/avatar.html
View file

@ -12,7 +12,7 @@
data-level="{@profile.stats.lvl}"
data-checkpet="{#if @profile.items.pet}hasPet{/}"
data-checkuser="{{#if equal(@profile.id, _user.id)}}isUser{{/}}"
data-toggle='modal' data-target='#avatar-modal' data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
data-uid="{{@profile.id}}" x-bind="click:profileChangeActive"
rel="popover" data-placement="bottom" data-trigger="hover" data-html="true" data-content="
<div>
<div class='progress progress-danger' style='height:5px;'>

40
views/app/settings.html
View file

@ -129,27 +129,21 @@
<menu:>
<div class="user-menu">
<table>
<tr style='vertical-align:top;'>
<td>
<a class="pull-left btn {#if _gamePane}active{/}" style='cursor:pointer' x-bind='click:toggleGamePane' rel=tooltip title="Toggle Tasks / Game Options" data-placement=bottom>
{#if _user.party.invitation}<i class='icon-bell'></i> {/}<img src="/favicon.ico" />
</a>
</td>
<td>
{{#unless _loggedIn}}
<button class="task-action-btn tile solid" style='cursor:pointer' data-target="#login-modal" data-toggle="modal">Login / Register</button>
{{else}}
<ul class="nav site-nav">
<li class="flyout">
<h1 class="task-action-btn tile solid user-reporter">{{username(_user.auth, _user.profile.name)}}</h1>
<ul class="flyout-content nav stacked">
<li><a class="task-action-btn tile solid" href="/logout">Logout</a></li>
</ul>
</li>
</ul>
{{/}}
</td>
</tr>
</table>
{{#unless _loggedIn}}
<button class="task-action-btn tile solid" style='cursor:pointer' data-target="#login-modal" data-toggle="modal">Login / Register</button>
{{else}}
<ul class="nav site-nav">
<li class="flyout">
<h1 class="task-action-btn tile solid user-reporter">{#if _user.party.invitation}<i class='icon-bell'></i> {/}{{username(_user.auth, _user.profile.name)}}</h1>
<ul class="flyout-content nav stacked">
<li>
<a class="task-action-btn tile solid" x-bind='click:toggleGamePane'>
{#if _gamePane}Tasks{else}{#if _user.party.invitation}<i class='icon-bell'></i> {/}Options{/}
</a>
</li>
<li><a class="task-action-btn tile solid" href="/logout">Logout</a></li>
</ul>
</li>
</ul>
{{/}}
</div>