replace minus Habit and To-Do sounds, rename NomindTR's theme, rename keys for theme since they aren't live yet

This commit is contained in:
Alys 2015-06-16 13:10:49 +10:00
parent b6b2873faf
commit 14983cb996
27 changed files with 3 additions and 3 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
common/audio/gokulTheme/ToDo.mp3 Executable file

Binary file not shown.

BIN
common/audio/gokulTheme/ToDo.ogg Executable file

Binary file not shown.

View file

@ -85,7 +85,7 @@
"audioTheme_off": "Off",
"audioTheme_danielTheBard": "Daniel The Bard",
"audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gSalvadi": "GSalvadi",
"audioTheme_gokulTheme": "Gokul Theme",
"askQuestion": "Ask a Question",
"reportBug": "Report a Bug",
"contributeToHRPG": "Contribute to HabitRPG",

View file

@ -310,7 +310,7 @@ var UserSchema = new Schema({
skin: {type:String, 'default':'915533'},
shirt: {type: String, 'default': 'blue'},
timezoneOffset: Number,
sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gSalvadi']},
sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
language: String,
automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},

View file

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