sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 20:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1815 from Fandekasp/make_all_gears_hidable

Browse source 
Make all gears hidable
This commit is contained in:
Tyler Renelle 2013-11-18 20:25:32 -08:00
commit 7fac154f4d
25 changed files with 117 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locales/bg/app.json
View file

@ -130,6 +130,10 @@
"hair": "Hair",
"skin": "Skin",
"clothing" : "Clothing",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

4
locales/cs/app.json
View file

@ -131,6 +131,10 @@
"hair": "Hair",
"skin": "Skin",
"clothing" : "Clothing",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

4
locales/cu/app.json
View file

@ -132,6 +132,10 @@
"hair": "Hair",
"skin": "Skin",
"clothing" : "Clothing",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

4
locales/de/app.json
View file

@ -131,6 +131,10 @@
"hair": "Haare",
"skin": "Haut",
"clothing" : "Kleidung",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Bild-Url",
"fullName": "Name",
"blurb": "über dich",

4
locales/el/app.json
View file

@ -135,6 +135,10 @@
"hair": "Μαλλιά",
"skin": "Δέρμα",
"clothing" : "Ρούχα",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Url Φωτογραφίας",
"fullName": "Πλήρες Όνομα",
"blurb": "Κείμενο",

4
locales/en/app.json
View file

@ -137,6 +137,10 @@
"hair": "Hair",
"skin": "Skin",
"clothing" : "Clothing",
"showWeapon": "Show Weapon",
"other" : "Other",
"showShield": "Show Shield",
"showArmor": "Show Armor",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

4
locales/es/app.json
View file

@ -131,6 +131,10 @@
"hair": "Cabello",
"skin": "Piel",
"clothing" : "Ropa",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Url de la Imagen",
"fullName": "Nombre Completo",
"blurb": "Descripción",

6
locales/fr/app.json
View file

@ -128,10 +128,14 @@
"avatar": "Avatar",
"head": "Tête",
"showHelm": "Afficher le casque",
"showHelm": "Montrer le casque",
"hair": "Cheveux",
"skin": "Peau",
"clothing" : "Vêtements",
"showArmor": "Montrer l'armure",
"other": "Autres",
"showWeapon": "Montrer l'arme",
"showShield": "Montrer le bouclier",
"photoUrl": "Lien vers la photo",
"fullName": "Nom complet",
"blurb": "Bio",

4
locales/he/app.json
View file

@ -136,6 +136,10 @@
"hair": "שיער",
"skin": "עור",
"clothing" : "לבוש",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "כתובת תמונה",
"fullName": "שם מלא",
"blurb": "קצת על עצמך",

4
locales/id/app.json
View file

@ -132,6 +132,10 @@
"hair": "Hair",
"skin": "Skin",
"clothing" : "Clothing",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

4
locales/it/app.json
View file

@ -132,6 +132,10 @@
"hair": "Capelli",
"skin": "Pelle",
"clothing" : "Abbigliamento",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Url Foto",
"fullName": "Nome Completo",
"blurb": "Firma",

4
locales/ja/app.json
View file

@ -132,6 +132,10 @@
"hair": "Hair",
"skin": "皮膚",
"clothing" : "衣料",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "写真 URL",
"fullName": "名前",
"blurb": "自己紹介",

4
locales/nl/app.json
View file

@ -132,6 +132,10 @@
"hair": "Haar",
"skin": "Huid",
"clothing" : "Kleding",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Foto URL",
"fullName": "Volledige Naam",
"blurb": "Blurp",

4
locales/no/app.json
View file

@ -137,6 +137,10 @@
"skin": "Hudfarge",
"clothing" : "Klær",
"photoUrl": "Bilde-URL",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"fullName": "Fullt navn",
"blurb": "Kort om deg",
"websites": "Nettsider",

4
locales/pl/app.json
View file

@ -132,6 +132,10 @@
"hair": "Włosy",
"skin": "Karnacja",
"clothing" : "Ubranie",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "URL obrazka",
"fullName": "Imię i nazwisko",
"blurb": "Krótki opis",

4
locales/pt/app.json
View file

@ -132,6 +132,10 @@
"hair": "Cabelo",
"skin": "Pele",
"clothing" : "Vestimentas",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Url da Foto",
"fullName": "Nome Completo",
"blurb": "Sinopse",

4
locales/ru/app.json
View file

@ -132,6 +132,10 @@
"hair": "Волосы",
"skin": "Кожа",
"clothing" : "Одежда",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Ссылка на фото",
"fullName": "Полное имя",
"blurb": "О себе",

8
locales/sl/app.json
View file

@ -136,7 +136,11 @@
"showHelm": "Pokaži čelado",
"hair": "Lasje",
"skin": "Polt",
"clothing" : "Oblačila",
"clothing" : "OblaËila",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Spletni naslov slike",
"fullName": "Polno ime",
"blurb": "O tebi",
@ -410,4 +414,4 @@
"yesterday":"Včeraj",
"daysAgo":"dni nazaj"
}
}

4
locales/uk/app.json
View file

@ -132,6 +132,10 @@
"hair": "Волосся",
"skin": "Кожа",
"clothing" : "Одяг",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Посилання на фото",
"fullName": "Повне ім'я",
"blurb": "Про себе",

4
locales/ur/app.json
View file

@ -131,6 +131,10 @@
"hair": "بال",
"skin": "Skin",
"clothing" : "Clothing",
"showArmor": "Show Armor",
"other": "Other",
"showWeapon": "Show Weapon",
"showShield": "Show Shield",
"photoUrl": "Photo Url",
"fullName": "Full Name",
"blurb": "Blurb",

10
migrations/20131115_update_gear_preferences.js Normal file
View file

@ -0,0 +1,10 @@
//Add defaults to show gears in all users
db.users.update(
{},
{$set:{
'preferences.showWeapon': true,
'preferences.showShield': true,
'preferences.showArmor': true,
}},
{multi:true}
)

3
public/js/controllers/userCtrl.js
View file

@ -6,9 +6,6 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$
$scope.hideUserAvatar = function() {
$(".userAvatar").hide();
};
$scope.toggleHelm = function(val){
User.log({op:'set', data:{'preferences.showHelm':val}});
}
$scope.$watch('_editing.profile', function(value){
if(value === true) $scope.editingProfile = angular.copy(User.user.profile);

3
src/models/user.js
View file

@ -191,6 +191,9 @@ var UserSchema = new Schema({
hair: {type:String, 'default':'blond'},
hideHeader: {type:Boolean, 'default':false},
showHelm: {type:Boolean, 'default':true},
showWeapon: {type:Boolean, 'default':true},
showShield: {type:Boolean, 'default':true},
showArmor: {type:Boolean, 'default':true},
skin: {type:String, 'default':'white'},
timezoneOffset: Number,
language: String

22
views/options/profile.jade
View file

@ -9,14 +9,26 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template')
button.m_head_0.customize-option(type='button', ng-click='set("preferences.gender","m")')
button.f_head_0.customize-option(type='button', ng-click='set("preferences.gender","f")')
label.checkbox
input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='toggleHelm(user.preferences.showHelm)')
input(type='checkbox', ng-model='user.preferences.showHelm', ng-change='set("preferences.showHelm", user.preferences.showHelm?true: false)')
| Show Helm
menu(ng-show='user.preferences.gender=="f"', type='list')
menu(type='list')
li.customize-menu
menu(label='Clothing')
button.f_armor_0_v1.customize-option(type='button', ng-click='set("preferences.armorSet","v1")')
button.f_armor_0_v2.customize-option(type='button', ng-click='set("preferences.armorSet","v2")')
button.f_armor_0_v1.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v1")')
button.f_armor_0_v2.customize-option(ng-show='user.preferences.gender=="f"', type='button', ng-click='set("preferences.armorSet","v2")')
label.checkbox
input(type='checkbox', ng-model='user.preferences.showArmor', ng-change='set("preferences.showArmor", user.preferences.showArmor?true: false)')
| Show Armor
menu(type='list')
li.customize-menu
menu(label='Other')
label.checkbox
input(type='checkbox', ng-model='user.preferences.showWeapon', ng-change='set("preferences.showWeapon", user.preferences.showWeapon?true: false)')
| Show Weapon
label.checkbox
input(type='checkbox', ng-model='user.preferences.showShield', ng-change='set("preferences.showShield", user.preferences.showShield?true: false)')
| Show Shield
.span4
// hair

7
views/shared/header/avatar.jade
View file

@ -11,11 +11,12 @@ figure.herobox(ng-click='clickMember(profile._id)', data-name='{{profile.profile
// Avatar
span(class='{{profile.preferences.gender}}_skin_{{profile.preferences.skin}}')
span(class='{{profile.preferences.gender}}_hair_{{profile.preferences.hair}}')
span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}')
span(class='{{equipped("armor", 0, profile.preferences, profile.backer, profile.contributor)}}')
span(class='{{equipped("armor", profile.items.armor, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showArmor')
span(class='{{profile.preferences.gender}}_head_0', ng-hide='profile.preferences.showHelm')
span(class='{{equipped("head", profile.items.head, profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showHelm')
span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}')
span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}')
span(class='{{equipped("shield",profile.items.shield,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showShield')
span(class='{{equipped("weapon",profile.items.weapon,profile.preferences, profile.backer, profile.contributor)}}', ng-show='profile.preferences.showWeapon')
// Mount Head
span(ng-if='profile.items.currentMount', class='Mount_Head_{{profile.items.currentMount}}')