Revert "Revert "new GSalvadi audio theme, created by NomindTR""

This reverts commit 30a091e14e.
This commit is contained in:
Alys
2015-06-18 22:19:35 +10:00
parent bcc99791dd
commit 07b41d16b6
23 changed files with 3 additions and 2 deletions

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

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.

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,6 +85,7 @@
"audioTheme_off": "Off", "audioTheme_off": "Off",
"audioTheme_danielTheBard": "Daniel The Bard", "audioTheme_danielTheBard": "Daniel The Bard",
"audioTheme_wattsTheme": "Watts' Theme", "audioTheme_wattsTheme": "Watts' Theme",
"audioTheme_gokulTheme": "Gokul Theme",
"askQuestion": "Ask a Question", "askQuestion": "Ask a Question",
"reportBug": "Report a Bug", "reportBug": "Report a Bug",
"contributeToHRPG": "Contribute to HabitRPG", "contributeToHRPG": "Contribute to HabitRPG",

View File

@@ -311,7 +311,7 @@ var UserSchema = new Schema({
skin: {type:String, 'default':'915533'}, skin: {type:String, 'default':'915533'},
shirt: {type: String, 'default': 'blue'}, shirt: {type: String, 'default': 'blue'},
timezoneOffset: Number, timezoneOffset: Number,
sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme']}, sound: {type:String, 'default':'off', enum: ['off','danielTheBard', 'wattsTheme', 'gokulTheme']},
language: String, language: String,
automaticAllocation: Boolean, automaticAllocation: Boolean,
allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'}, 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 div
ul.toolbar-submenu(ng-click='expandMenu(null)') ul.toolbar-submenu(ng-click='expandMenu(null)')
// Using [{k,v}] instead of {k:v,k:v} to maintain order ('off' at top) // 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 li
a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme) a(ng-class="{'bg-primary':user.preferences.sound=='#{theme}'}", ng-click="set({'preferences.sound':'#{theme}'})")=env.t('audioTheme_'+theme)