clean branch from develop to add audio

This commit is contained in:
Adrien Lemaire
2014-08-08 23:03:52 +09:00
parent b19649ce37
commit 3d2d8fbfef
27 changed files with 58 additions and 6 deletions
+13 -1
View File
@@ -139,6 +139,18 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
li.toolbar-sync
a(ng-click='User.sync()', popover=env.t('sync'),popover-placement='bottom',popover-trigger='mouseenter')
span.glyphicon.glyphicon-refresh
li.toolbar-audio
a(ng-if='user.preferences.sound', ng-click='set("preferences.sound",false)')
i.icon-volume-up(tooltip='Turn Sound Off')
a(ng-if='!user.preferences.sound', ng-click='set("preferences.sound",true)')
i.icon-volume-off(tooltip='Turn Sound On')
select#audioTheme(
style='width:140px',
ng-controller='SettingsCtrl',
ng-model='user.preferences.soundTheme',
ng-options='k as v for (k , v) in soundThemes',
ng-change='set("preferences.soundTheme", user.preferences.soundTheme)'
)
li.toolbar-settings
a(ng-click='expandMenu("settings")')
span.glyphicon.glyphicon-cog
@@ -181,4 +193,4 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}')
span {{Shared.silver(user.stats.gp)}}
ul.toolbar-bailey(ng-class='{inactive: !_expandedMenu}')
li.toolbar-bailey-container(ng-if='user.flags.newStuff')
.npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")')
.npc_bailey.npc_bailey_head(popover=env.t('psst'), popover-trigger='mouseenter', popover-placement='right', ng-click='openModal("newStuff")')