Merge pull request HabitRPG#5407 from Alys/GSalvadi-audio-NOMINDTR-20…

…15-06-15 new GSalvadi audio theme, created by NomindTR
rustyautoparts · Jun 17, 2015 · 910fc2f · 910fc2f
2 parents 63e1bdf + 14983cb
commit 910fc2f
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 2 deletions.
diff --git a/common/audio/gokulTheme/Achievement_Unlocked.mp3 b/common/audio/gokulTheme/Achievement_Unlocked.mp3
diff --git a/common/audio/gokulTheme/Achievement_Unlocked.ogg b/common/audio/gokulTheme/Achievement_Unlocked.ogg
diff --git a/common/audio/gokulTheme/Chat.mp3 b/common/audio/gokulTheme/Chat.mp3
diff --git a/common/audio/gokulTheme/Chat.ogg b/common/audio/gokulTheme/Chat.ogg
diff --git a/common/audio/gokulTheme/Daily.mp3 b/common/audio/gokulTheme/Daily.mp3
diff --git a/common/audio/gokulTheme/Daily.ogg b/common/audio/gokulTheme/Daily.ogg
diff --git a/common/audio/gokulTheme/Death.mp3 b/common/audio/gokulTheme/Death.mp3
diff --git a/common/audio/gokulTheme/Death.ogg b/common/audio/gokulTheme/Death.ogg
diff --git a/common/audio/gokulTheme/Item_Drop.mp3 b/common/audio/gokulTheme/Item_Drop.mp3
diff --git a/common/audio/gokulTheme/Item_Drop.ogg b/common/audio/gokulTheme/Item_Drop.ogg
diff --git a/common/audio/gokulTheme/Level_Up.mp3 b/common/audio/gokulTheme/Level_Up.mp3
diff --git a/common/audio/gokulTheme/Level_Up.ogg b/common/audio/gokulTheme/Level_Up.ogg
diff --git a/common/audio/gokulTheme/Minus_Habit.mp3 b/common/audio/gokulTheme/Minus_Habit.mp3
diff --git a/common/audio/gokulTheme/Minus_Habit.ogg b/common/audio/gokulTheme/Minus_Habit.ogg
diff --git a/common/audio/gokulTheme/Plus_Habit.mp3 b/common/audio/gokulTheme/Plus_Habit.mp3
diff --git a/common/audio/gokulTheme/Plus_Habit.ogg b/common/audio/gokulTheme/Plus_Habit.ogg
diff --git a/common/audio/gokulTheme/Reward.mp3 b/common/audio/gokulTheme/Reward.mp3
diff --git a/common/audio/gokulTheme/Reward.ogg b/common/audio/gokulTheme/Reward.ogg
diff --git a/common/audio/gokulTheme/ToDo.mp3 b/common/audio/gokulTheme/ToDo.mp3
diff --git a/common/audio/gokulTheme/ToDo.ogg b/common/audio/gokulTheme/ToDo.ogg
diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json
@@ -85,6 +85,7 @@
     "audioTheme_off": "Off",
     "audioTheme_danielTheBard": "Daniel The Bard",
     "audioTheme_wattsTheme": "Watts' Theme",
+    "audioTheme_gokulTheme": "Gokul Theme",
     "askQuestion": "Ask a Question",
     "reportBug": "Report a Bug",
     "contributeToHRPG": "Contribute to HabitRPG",

diff --git a/website/src/models/user.js b/website/src/models/user.js
@@ -311,7 +311,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']},
+    sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
     language: String,
     automaticAllocation: Boolean,
     allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},

diff --git a/website/views/shared/header/menu.jade b/website/views/shared/header/menu.jade
@@ -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']
+              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)