diff --git a/common/audio/gokulTheme/Achievement_Unlocked.mp3 b/common/audio/gokulTheme/Achievement_Unlocked.mp3 deleted file mode 100755 index 9cf8c038a3..0000000000 Binary files a/common/audio/gokulTheme/Achievement_Unlocked.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Achievement_Unlocked.ogg b/common/audio/gokulTheme/Achievement_Unlocked.ogg deleted file mode 100755 index 158e7a864d..0000000000 Binary files a/common/audio/gokulTheme/Achievement_Unlocked.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Chat.mp3 b/common/audio/gokulTheme/Chat.mp3 deleted file mode 100755 index 9bbfac8a29..0000000000 Binary files a/common/audio/gokulTheme/Chat.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Chat.ogg b/common/audio/gokulTheme/Chat.ogg deleted file mode 100755 index 028d1a314e..0000000000 Binary files a/common/audio/gokulTheme/Chat.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Daily.mp3 b/common/audio/gokulTheme/Daily.mp3 deleted file mode 100755 index a0d712ec85..0000000000 Binary files a/common/audio/gokulTheme/Daily.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Daily.ogg b/common/audio/gokulTheme/Daily.ogg deleted file mode 100755 index 67379261c5..0000000000 Binary files a/common/audio/gokulTheme/Daily.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Death.mp3 b/common/audio/gokulTheme/Death.mp3 deleted file mode 100755 index 91263b7095..0000000000 Binary files a/common/audio/gokulTheme/Death.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Death.ogg b/common/audio/gokulTheme/Death.ogg deleted file mode 100755 index d89825537d..0000000000 Binary files a/common/audio/gokulTheme/Death.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Item_Drop.mp3 b/common/audio/gokulTheme/Item_Drop.mp3 deleted file mode 100755 index e3d461a6c5..0000000000 Binary files a/common/audio/gokulTheme/Item_Drop.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Item_Drop.ogg b/common/audio/gokulTheme/Item_Drop.ogg deleted file mode 100755 index 96e013c8ca..0000000000 Binary files a/common/audio/gokulTheme/Item_Drop.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Level_Up.mp3 b/common/audio/gokulTheme/Level_Up.mp3 deleted file mode 100755 index 66fbc07909..0000000000 Binary files a/common/audio/gokulTheme/Level_Up.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Level_Up.ogg b/common/audio/gokulTheme/Level_Up.ogg deleted file mode 100755 index 5209cfa386..0000000000 Binary files a/common/audio/gokulTheme/Level_Up.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Minus_Habit.mp3 b/common/audio/gokulTheme/Minus_Habit.mp3 deleted file mode 100755 index 38aa4ec050..0000000000 Binary files a/common/audio/gokulTheme/Minus_Habit.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Minus_Habit.ogg b/common/audio/gokulTheme/Minus_Habit.ogg deleted file mode 100755 index ac235dd43b..0000000000 Binary files a/common/audio/gokulTheme/Minus_Habit.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Plus_Habit.mp3 b/common/audio/gokulTheme/Plus_Habit.mp3 deleted file mode 100755 index 2b4f259cdf..0000000000 Binary files a/common/audio/gokulTheme/Plus_Habit.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Plus_Habit.ogg b/common/audio/gokulTheme/Plus_Habit.ogg deleted file mode 100755 index 1b7139fb8b..0000000000 Binary files a/common/audio/gokulTheme/Plus_Habit.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/Reward.mp3 b/common/audio/gokulTheme/Reward.mp3 deleted file mode 100755 index 59b14485af..0000000000 Binary files a/common/audio/gokulTheme/Reward.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/Reward.ogg b/common/audio/gokulTheme/Reward.ogg deleted file mode 100755 index 57e605fda3..0000000000 Binary files a/common/audio/gokulTheme/Reward.ogg and /dev/null differ diff --git a/common/audio/gokulTheme/ToDo.mp3 b/common/audio/gokulTheme/ToDo.mp3 deleted file mode 100755 index 65b6ad70e4..0000000000 Binary files a/common/audio/gokulTheme/ToDo.mp3 and /dev/null differ diff --git a/common/audio/gokulTheme/ToDo.ogg b/common/audio/gokulTheme/ToDo.ogg deleted file mode 100755 index 162e7a4f50..0000000000 Binary files a/common/audio/gokulTheme/ToDo.ogg and /dev/null differ diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json index 9ca0db6eb7..d92d82a524 100644 --- a/common/locales/en/generic.json +++ b/common/locales/en/generic.json @@ -85,7 +85,6 @@ "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 index 7a45250308..44acda07f7 100644 --- 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', 'gokulTheme']}, + sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme']}, 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 index 182227762f..f0dd838f81 100644 --- 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', 'gokulTheme'] + for theme in ['off','danielTheBard', 'wattsTheme'] li a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)