Merge pull request #5407 from Alys/GSalvadi-audio-NOMINDTR-2015-06-15

new GSalvadi audio theme, created by NomindTR
This commit is contained in:
Alys
2015-06-17 21:39:39 +10:00
23 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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'},
+1 -1
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']
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)