From 2101fe255fc7f195e77dfa8271a5fef17b6123e2 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 24 Nov 2013 07:35:12 -0600 Subject: [PATCH 1/6] Place link to Markdown help prominently in Tavern chat (fix #1906) --- views/options/social/group.jade | 7 +++---- views/options/social/tavern.jade | 6 ++++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 905a4e0a3e..fe66734e9c 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -19,9 +19,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' label.control-label Group Name input.option-content(type='text', ng-model='group.name', placeholder='Group Name') .control-group.option-large - label.control-label Description + label.control-label Description (Markdown OK) textarea.option-content(style='height:15em;', placeholder='Description', ng-model='group.description') - include ../../shared/formatting-help .control-group.option-large label.control-label Logo URL input.option-content(type='url', placeholder='Logo URL', ng-model='group.logo') @@ -87,8 +86,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' .span8 div.blah-options(ng-show='group._editing') .option-large - textarea.option-content(style='height:15em;', placeholder='Message from group leader', ng-model='group.leaderMessage') - include ../../shared/formatting-help + textarea.option-content(style='height:15em;', placeholder='Message from group leader (Markdown OK)', ng-model='group.leaderMessage') table(ng-show='group.leaderMessage') tr td @@ -100,6 +98,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' div(ng-controller='ChatCtrl') h3 Chat include ./chat-box + include ../../shared/formatting-help ul.unstyled.tavern-chat include ./chat-message diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index eded297e3a..b0bb7b9b40 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -104,7 +104,9 @@ .span8(ng-controller='ChatCtrl') h3 Tavern Talk include ./chat-box - small.alert.alert-info. - Note: if you're reporting a bug, the developers won't see it here. Follow these instructions instead. + small + include ../../shared/formatting-help + alert.alert-info. + Note: if you're reporting a bug, the developers won't see it here. Follow these instructions instead. ul.unstyled.tavern-chat include ./chat-message From 9086ccffcd06f64d82478a5e7e294f99cdcb880f Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 24 Nov 2013 07:41:41 -0600 Subject: [PATCH 2/6] Consistent formatting of markdown hint in group edit fields --- views/options/social/group.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index fe66734e9c..9371e3567d 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -19,8 +19,8 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title='Guild Bank' label.control-label Group Name input.option-content(type='text', ng-model='group.name', placeholder='Group Name') .control-group.option-large - label.control-label Description (Markdown OK) - textarea.option-content(style='height:15em;', placeholder='Description', ng-model='group.description') + label.control-label Description + textarea.option-content(style='height:15em;', placeholder='Description shown in public Guilds list (Markdown OK)', ng-model='group.description') .control-group.option-large label.control-label Logo URL input.option-content(type='url', placeholder='Logo URL', ng-model='group.logo') From c51a34730dd680765bda9e9db298d5f803e5e49b Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 24 Nov 2013 08:53:48 -0600 Subject: [PATCH 3/6] Tweak shop wording to remove "yet": eggs/potions/food might be used up or sold off. --- views/options/inventory/inventory.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/options/inventory/inventory.jade b/views/options/inventory/inventory.jade index af97b0596e..4f56dd6671 100644 --- a/views/options/inventory/inventory.jade +++ b/views/options/inventory/inventory.jade @@ -7,7 +7,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') li.customize-menu menu.pets-menu(label='Eggs ({{eggCount}})') - p(ng-show='eggCount < 1') You don't have any eggs yet. + p(ng-show='eggCount < 1') You don't have any eggs. div(ng-repeat='(egg,points) in ownedItems(user.items.eggs)') //TODO move positioning this styling to css button.customize-option(popover='{{Items.eggs[egg].notes}}', popover-title='{{Items.eggs[egg].text}} Egg', popover-trigger='mouseenter', popover-placement='right', ng-click='chooseEgg(egg)', class='Pet_Egg_{{egg}}', ng-class='{selectableInventory: selectedPotion && !user.items.pets[egg+"-"+selectedPotion.name]}') @@ -16,7 +16,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') li.customize-menu menu.hatchingPotion-menu(label='Hatching Potions ({{potCount}})') - p(ng-show='potCount < 1') You don't have any hatching potions yet. + p(ng-show='potCount < 1') You don't have any hatching potions. div(ng-repeat='(pot,points) in ownedItems(user.items.hatchingPotions)') button.customize-option(popover='{{Items.hatchingPotions[pot].notes}}', popover-title='{{Items.hatchingPotions[pot].text}} Potion', popover-trigger='mouseenter', popover-placement='right', ng-click='choosePotion(pot)', class='Pet_HatchingPotion_{{pot}}', ng-class='{selectableInventory: selectedEgg && !user.items.pets[selectedEgg.name+"-"+pot]}') .badge.badge-info.stack-count {{points}} @@ -24,7 +24,7 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html') //-li.customize-menu menu.pets-menu(label='Food ({{foodCount}})') - p(ng-show='foodCount < 1') You don't have any food yet. + p(ng-show='foodCount < 1') You don't have any food. div(ng-repeat='(food,points) in ownedItems(user.items.food)') button.customize-option(popover='{{Items.food[food].notes}}', popover-title='{{Items.food[food].text}}', popover-trigger='mouseenter', popover-placement='right', ng-click='chooseFood(food)', class='Pet_Food_{{food}}') .badge.badge-info.stack-count {{points}} From f7908ddbcb38bfe6b6115758c1159f17ebb28ea9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 24 Nov 2013 09:50:21 -0600 Subject: [PATCH 4/6] Correct and clarify some details on contributor rewards --- views/options/social/tavern.jade | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index b0bb7b9b40..93dfd533e9 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -59,10 +59,10 @@ a.label.label-contributor-1(ng-click='toggleUserTier($event)') Friend (1-2) div(style='display:none;') p. - When your first submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. + When your first submission is deployed, you will receive the HabitRPG Contributor's badge. Your name in Tavern chat will proudly display that you are a contributor. As a bounty for your work, you will also receive 2 Gems. hr p. - When your second submission is deployed, the Crystal Armor will be available for purchase in the Rewards shop after the Golden Armor. As a bounty for your great work, you will also receive 2 Gems. + When your second submission is deployed, the Crystal Armor will be available for purchase in the Rewards shop after the Golden Armor. As a bounty for your continued work, you will also receive 2 Gems. tr td a.label.label-contributor-3(ng-click='toggleUserTier($event)') Elite (3-4) @@ -71,23 +71,23 @@ When your third submission is deployed, the Crystal Helmet will be available for purchase in the Rewards shop after the Golden Helmet. As a bounty for your great work, you will also receive 2 Gems. hr p. - When your fourth submission is deployed, the Crystal Sword will be available for purchase in the Rewards shop after the Golden Sword. As a bounty for your great work, you will also receive 2 Gems. + When your fourth submission is deployed, the Crystal Sword will be available for purchase in the Rewards shop after the Golden Sword. You will once again receive a bounty of 2 Gems. tr td a.label.label-contributor-5(ng-click='toggleUserTier($event)') Champion (5-6) div(style='display:none;') p. - When your fifth submission is deployed, the Crystal Shield will be available for purchase in the Reward shop after the Golden Shield. As a bounty for your great work, you will also receive 2 Gems. + When your fifth submission is deployed, the Crystal Shield will be available for purchase in the Reward shop after the Golden Shield. You will also receive 2 Gems. hr p. -
When your sixth submission is deployed, you will receive a Hydra Pet. As a bounty for your great work, you will also receive 2 Gems. +
When your sixth submission is deployed, you will receive a Hydra Pet. You will also receive 2 Gems. tr td a.label.label-contributor-7(ng-click='toggleUserTier($event)') Legendary (7) div(style='display:none;') p. - When your seventh submission is deployed, you will receive 2 Gems and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! + When your seventh submission is deployed, you will receive 2 Gems and become a member of the honored Contributor's Guild and be privy to the behind-the-scenes details of HabitRPG! Further contributions do not increase your level, but you may continue to earn Gem bounties and titles. tr td a.label.label-contributor-8(ng-click='toggleUserTier($event)') Heroic From 780b0a3593430380314c129f07a0800c7873f99d Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 24 Nov 2013 13:13:21 -0600 Subject: [PATCH 5/6] Change Markdown help link to point at HabitRPG wiki --- views/shared/formatting-help.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/shared/formatting-help.jade b/views/shared/formatting-help.jade index 0de22cf962..80c74be7c3 100644 --- a/views/shared/formatting-help.jade +++ b/views/shared/formatting-help.jade @@ -1,2 +1,2 @@ small - a(target='_blank', href='http://daringfireball.net/projects/markdown/') Use Markdown form formatting \ No newline at end of file + a(target='_blank', href='http://habitrpg.wikia.com/wiki/Markdown_Cheat_Sheet') Markdown formatting allowed \ No newline at end of file From 91a0b094701c3e113baa1f335571c693b7f581f5 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 25 Nov 2013 22:10:50 -0600 Subject: [PATCH 6/6] Fix a few typos/inaccuracies in English app.json --- locales/en/app.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en/app.json b/locales/en/app.json index 607e721ff9..38d94fa446 100644 --- a/locales/en/app.json +++ b/locales/en/app.json @@ -47,7 +47,7 @@ "reward1" : "1 Episode of Game of Thrones", "reward1comment": "-- Rewards: Treat Yourself! -- As you complete goals, you earn gold to buy rewards. Buy them liberally - rewards are integral in forming good habits.", "reward2" : "Cake", - "reward2comment" : "But only buy if you have enough gold - you lose HP otherwise.", + "reward2comment" : "But only buy if you have enough gold!", "_commentdefaulttags" : "DEFAULT TAGS", "morning" : "morning", @@ -104,7 +104,7 @@ "S": "S", "todos": "To-Dos", "Todos": "To-Dos", - "newTodo": "New Todo", + "newTodo": "New To-Do", "dueDate": "Due Date", "remaining": "Remaining", "complete": "Complete", @@ -124,7 +124,7 @@ "dropsEnabled" : "Drops Enabled!", "dropsEnabledText1" : "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. And guess what, you just found a", "dropsEnabledText2" : "egg", - "itemDropped" : "An items has dropped", + "itemDropped" : "An item has dropped",