From 549add08ede0e16fb4e4f06d9f6f6a93b3130720 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 13 Dec 2013 22:39:15 -0700 Subject: [PATCH] classes: 2gems / new hair,beard,stache --- src/models/user.js | 2 +- views/options/profile.jade | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/models/user.js b/src/models/user.js index 65627cc4a8..d37a449226 100644 --- a/src/models/user.js +++ b/src/models/user.js @@ -206,7 +206,7 @@ var UserSchema = new Schema({ base: {type: Number, 'default': 0}, bangs: {type: Number, 'default': 0}, beard: {type: Number, 'default': 0}, - mustach: {type: Number, 'default': 0}, + mustache: {type: Number, 'default': 0}, }, hideHeader: {type:Boolean, 'default':false}, skin: {type:String, 'default':'white'}, diff --git a/views/options/profile.jade b/views/options/profile.jade index 784cb6c96a..ca92fdfb09 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -11,6 +11,8 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') .span4 h3 Hair + small. + 2 / locked menu(type='list') // Color li.customize-menu @@ -24,7 +26,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') // Bangs li.customize-menu menu(label='Bangs') - button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.bangs":0})') + button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.bangs":0})') button(class='hair_bangs_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.bangs":1})') button(class='hair_bangs_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.bangs":2})') button(class='hair_bangs_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.bangs":3})') @@ -32,32 +34,35 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') // Beard li.customize-menu menu(label='Beard') - button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.beard":0})') - button(class='hair_beard_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.beard":1})') - button(class='hair_beard_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.beard":2})') - button(class='hair_beard_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.beard":3})') + button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.beard":0})') + button(class='hair_beard_1_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.beard.1}', ng-click='unlock("hair.beard.1")') + button(class='hair_beard_2_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.beard.2}', ng-click='unlock("hair.beard.2")') + button(class='hair_beard_3_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.beard.3}', ng-click='unlock("hair.beard.3")') // Mustache li.customize-menu menu(label='Mustache') button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.mustache":0})') - button(class='hair_mustache_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.mustache":1})') - button(class='hair_mustache_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.mustache":2})') + button(class='hair_mustache_1_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.mustache.1}', ng-click='unlock("hair.mustache.1")') + button(class='hair_mustache_2_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.mustache.2}', ng-click='unlock("hair.mustache.2")') // Base li.customize-menu menu(label='Base') button(class='head_base_0 customize-option', type='button', ng-click='set({"preferences.hair.base":0})') button(class='hair_base_1_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":1})') - button(class='hair_base_2_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":2})') + button(class='hair_base_2_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.2}', ng-click='unlock("hair.base.2")') button(class='hair_base_3_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":3})') - button(class='hair_base_4_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":4})') - button(class='hair_base_5_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":5})') - button(class='hair_base_6_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":6})') - button(class='hair_base_7_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":7})') - button(class='hair_base_8_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":8})') + button(class='hair_base_4_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.4}', ng-click='unlock("hair.base.4")') + button(class='hair_base_5_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.5}', ng-click='unlock("hair.base.5")') + button(class='hair_base_6_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.6}', ng-click='unlock("hair.base.6")') + button(class='hair_base_7_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.7}', ng-click='unlock("hair.base.7")') + button(class='hair_base_8_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.8}', ng-click='unlock("hair.base.8")') .span4 + h3 Skin + small. + 2 / locked // skin li.customize-menu menu(label='Basic Skins') @@ -72,7 +77,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') // Rainbow Skin h5. - Rainbow Skins - 2/skin + Rainbow Skins //menu(label='Rainbow Skins (2G / skin)') menu button.customize-option(type='button', class='skin_eb052b', ng-class='{locked: !user.purchased.skin.eb052b}', ng-click='unlock("skin.eb052b")')