Adding new basic audio theme rosstavoTheme (#7766)

This commit is contained in:
Ross Hardy
2016-07-12 03:30:44 +01:00
committed by Alys
parent 694cd8e555
commit 2b30c63448
23 changed files with 5 additions and 4 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -3,7 +3,7 @@
"stringNotFound": "String '<%= string %>' not found.",
"titleIndex": "Habitica | Your Life The Role Playing Game",
"habitica": "Habitica",
"titleTasks": "Tasks",
"titleAvatar": "Avatar",
"titleBackgrounds": "Backgrounds",
@@ -24,7 +24,7 @@
"titleTimeTravelers": "Time Travelers",
"titleSeasonalShop": "Seasonal Shop",
"titleSettings": "Settings",
"expandToolbar": "Expand Toolbar",
"collapseToolbar": "Collapse Toolbar",
"markdownBlurb": "Habitica uses markdown for message formatting. See the <a href='http://habitica.wikia.com/wiki/Markdown_Cheat_Sheet' target='_blank'>Markdown Cheat Sheet</a> for more info.",
@@ -116,6 +116,7 @@
"audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gokulTheme": "Gokul Theme",
"audioTheme_luneFoxTheme": "LuneFox's Theme",
"audioTheme_rosstavoTheme": "Rosstavo's Theme",
"askQuestion": "Ask a Question",
"reportBug": "Report a Bug",
"HabiticaWiki": "The Habitica Wiki",

View File

@@ -391,7 +391,7 @@ let schema = new Schema({
skin: {type: String, default: '915533'},
shirt: {type: String, default: 'blue'},
timezoneOffset: {type: Number, default: 0},
sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']},
sound: {type: String, default: 'off', enum: ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme']},
chair: {type: String, default: 'none'},
timezoneOffsetAtLastCron: Number,
language: String,

View File

@@ -222,7 +222,7 @@ nav.toolbar(ng-controller='MenuCtrl')
div
ul.toolbar-submenu
// Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top)
for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme']
for theme in ['off', 'danielTheBard', 'gokulTheme', 'luneFoxTheme', 'wattsTheme', 'rosstavoTheme']
li
a(ng-class="{'bg-primary':user.preferences.sound === '# {theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)
ul.toolbar-controls