From 11396d4756be58a284d7e34fc8f51df07af6763e Mon Sep 17 00:00:00 2001 From: Alys Date: Sun, 28 Jun 2015 19:32:46 +1000 Subject: [PATCH 1/2] make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204 --- common/locales/en/character.json | 4 ++++ website/public/css/inventory.styl | 3 +++ website/views/options/inventory/inventory.jade | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index f648ded61e..10bb1e3531 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -54,6 +54,10 @@ "costume": "Costume", "costumeText": "If you prefer the look of other gear to what you have equipped, check the \"Use Costume\" box to visually don a costume while wearing your battle gear underneath.", "useCostume": "Use Costume", + "useCostumeInfo1": "Click \"Use Costume\" to equip items to your avatar without affecting the stats from your Battle Gear! This means that you can equip for the best stats on the left, and dress up your avatar with your equipment on the right.", + "useCostumeInfo2": "(show more)", + "useCostumeInfo3": "(show less)", + "useCostumeInfo4": "Once you click \"Use Costume\" your avatar will look pretty basic... but don't worry! If you look on the left, you'll see that your Battle Gear is still equipped. Next, you can make things fancy! Anything you equip on the right won't affect your stats, but can make you look super awesome. Try out different combos, mixing sets, and coordinating your Costume with your pets, mounts, and backgrounds.

Got more questions? Check out the Costume page on the wiki. Find the perfect ensemble? Show it off in the Costume Carnival guild or brag in the Tavern!", "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:", "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!", "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.", diff --git a/website/public/css/inventory.styl b/website/public/css/inventory.styl index a8ced56dfd..9024c8d070 100644 --- a/website/public/css/inventory.styl +++ b/website/public/css/inventory.styl @@ -20,6 +20,9 @@ vertical-align: bottom margin-right: 20px +.well.use-costume-info + margin-top: 10px + .stable .static-popover max-width: 550px diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index 22bb1e0001..8ad8a3d741 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -19,6 +19,11 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') div button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}} button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}} + li.customize-menu(ng-if='!user.preferences.costume') + .well.use-costume-info=env.t('useCostumeInfo1') + p + a(ng-click='showUseCostumeInfo = !showUseCostumeInfo') {{!showUseCostumeInfo ? env.t('useCostumeInfo2') : env.t('useCostumeInfo3')}} + p(ng-if='showUseCostumeInfo')!=env.t('useCostumeInfo4') li.customize-menu(ng-if='user.preferences.costume') menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("armoireText")}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]') From a946f2b5a5fbf4537f91399adedf4192f3c4a8f4 Mon Sep 17 00:00:00 2001 From: Alys Date: Mon, 29 Jun 2015 21:49:54 +1000 Subject: [PATCH 2/2] rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section --- common/locales/en/character.json | 4 +--- common/locales/en/generic.json | 2 ++ common/locales/en/settings.json | 2 -- website/public/css/inventory.styl | 2 ++ website/views/options/inventory/inventory.jade | 8 ++++---- website/views/options/settings.jade | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 10bb1e3531..17e609c752 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -55,9 +55,7 @@ "costumeText": "If you prefer the look of other gear to what you have equipped, check the \"Use Costume\" box to visually don a costume while wearing your battle gear underneath.", "useCostume": "Use Costume", "useCostumeInfo1": "Click \"Use Costume\" to equip items to your avatar without affecting the stats from your Battle Gear! This means that you can equip for the best stats on the left, and dress up your avatar with your equipment on the right.", - "useCostumeInfo2": "(show more)", - "useCostumeInfo3": "(show less)", - "useCostumeInfo4": "Once you click \"Use Costume\" your avatar will look pretty basic... but don't worry! If you look on the left, you'll see that your Battle Gear is still equipped. Next, you can make things fancy! Anything you equip on the right won't affect your stats, but can make you look super awesome. Try out different combos, mixing sets, and coordinating your Costume with your pets, mounts, and backgrounds.

Got more questions? Check out the Costume page on the wiki. Find the perfect ensemble? Show it off in the Costume Carnival guild or brag in the Tavern!", + "useCostumeInfo2": "Once you click \"Use Costume\" your avatar will look pretty basic... but don't worry! If you look on the left, you'll see that your Battle Gear is still equipped. Next, you can make things fancy! Anything you equip on the right won't affect your stats, but can make you look super awesome. Try out different combos, mixing sets, and coordinating your Costume with your pets, mounts, and backgrounds.

Got more questions? Check out the Costume page on the wiki. Find the perfect ensemble? Show it off in the Costume Carnival guild or brag in the Tavern!", "gearAchievement": "You have earned the \"Ultimate Gear\" Achievement for upgrading to the maximum gear set for a class! You have attained the following complete sets:", "moreGearAchievements": "To attain more Ultimate Gear badges, change classes on your stats page and buy up your new class's gear!", "armoireUnlocked": "You've also unlocked the Enchanted Armoire! Click on the Enchanted Armoire Reward for a random chance at special Equipment! It may also give you random XP or food items.", diff --git a/common/locales/en/generic.json b/common/locales/en/generic.json index 9ca0db6eb7..3c2b262b4c 100644 --- a/common/locales/en/generic.json +++ b/common/locales/en/generic.json @@ -54,6 +54,8 @@ "gems": "Gems", "gemButton": "You have <%= number %> Gems.", "moreInfo": "More Info", + "showMoreMore": "(show more)", + "showMoreLess": "(show less)", "gemsWhatFor": "Click to buy Gems! Gems let you purchase special items like Quests, avatar customizations, and seasonal equipment.", "veteran": "Veteran", "veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.", diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index 26c252902b..d4ac07344f 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -42,8 +42,6 @@ "customDayStart": "Custom Day Start", "24HrClock": "24Hr Clock", "customDayStartInfo1": "HabitRPG defaults to check and reset your Dailies at midnight in your own time zone each day. It is recommended that you read the following information before changing it: ", - "customDayStartInfo2": "(show more)", - "customDayStartInfo3": "(show less)", "customDayStartInfo4": "Complete all your Dailies before changing the Custom Day Start or Rest in the Inn that day. Changing your Custom Day Start may cause Cron to run immediately, but after the first day it works as expected.

Allow a window of two hours for the change to take effect. For example, if it is currently set to 0 (midnight), change it before 10pm; if you want to set it to 9pm, change it before 7pm.

Enter an hour from 0 to 23 (it uses a 24 hour clock). Typing is more effective than arrow keys. Once set, reload the page to confirm that the new value is being displayed.", "misc": "Misc", "showHeader": "Show Header", diff --git a/website/public/css/inventory.styl b/website/public/css/inventory.styl index 9024c8d070..bcd297268d 100644 --- a/website/public/css/inventory.styl +++ b/website/public/css/inventory.styl @@ -22,6 +22,8 @@ .well.use-costume-info margin-top: 10px + p:first-child + margin-bottom: 20px .stable .static-popover max-width: 550px diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade index 8ad8a3d741..0e6e108869 100644 --- a/website/views/options/inventory/inventory.jade +++ b/website/views/options/inventory/inventory.jade @@ -20,10 +20,10 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html') button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}} button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}} li.customize-menu(ng-if='!user.preferences.costume') - .well.use-costume-info=env.t('useCostumeInfo1') - p - a(ng-click='showUseCostumeInfo = !showUseCostumeInfo') {{!showUseCostumeInfo ? env.t('useCostumeInfo2') : env.t('useCostumeInfo3')}} - p(ng-if='showUseCostumeInfo')!=env.t('useCostumeInfo4') + .well.use-costume-info + p=env.t('useCostumeInfo1') + p(ng-if='showUseCostumeInfo')!=env.t('useCostumeInfo2') + p: a(ng-click='showUseCostumeInfo = !showUseCostumeInfo') {{!showUseCostumeInfo ? env.t('showMoreMore') : env.t('showMoreLess')}} li.customize-menu(ng-if='user.preferences.costume') menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery"), armoire:env.t("armoireText")}', ng-show='gear[klass]') div(ng-repeat='item in gear[klass]') diff --git a/website/views/options/settings.jade b/website/views/options/settings.jade index 5fd030669c..05a206f1dc 100644 --- a/website/views/options/settings.jade +++ b/website/views/options/settings.jade @@ -79,7 +79,7 @@ script(type='text/ng-template', id='partials/options.settings.settings.html') div.alert.alert-warning(style='padding:2px;margin-top:7px') h5=env.t('customDayStart') h5=env.t('customDayStartInfo1') - a(ng-click='showCustomDayStartInfo = !showCustomDayStartInfo') {{!showCustomDayStartInfo ? env.t('customDayStartInfo2') : env.t('customDayStartInfo3')}} + a(ng-click='showCustomDayStartInfo = !showCustomDayStartInfo') {{!showCustomDayStartInfo ? env.t('showMoreMore') : env.t('showMoreLess')}} h5(ng-if='showCustomDayStartInfo')!=env.t('customDayStartInfo4') .form-group .input-group