Merge branch 'blurbs' into develop

common/locales/en/contrib.json

@@ -61,5 +61,10 @@
     "surveysSingle": "Helped HabitRPG grow by filling out a survey. There are no active surveys.",
     "surveysMultiple": "Helped HabitRPG grow by filling out <%= surveys %> surveys. There are no active surveys.",
     "currentSurvey": "Current Survey",
-    "surveyWhen": "The badge will be awarded to all participants when surveys have been processed, in late March."
+    "surveyWhen": "The badge will be awarded to all participants when surveys have been processed, in late March.",
+    "blurbInbox": "This is where your private messages are stored! You can send someone a message by clicking on the envelope icon next to their name in Tavern, Party, or Guild Chat.",
+    "blurbGuildsPage": "Guilds are common-interest chat groups created by the players, for players. Browse through the list and join the Guilds that interest you!",
+    "blurbChallenges": "Challenges are created by your fellow players. Joining a Challenge will add its tasks to your task dashboard, and winning a Challenge will give you an achievement and often a gem prize!",
+    "blurbHallPatrons": "This is the Hall of Patrons, where we honor the noble adventurers who backed HabitRPG's original Kickstarter. We thank them for helping us bring Habitica to life!",
+    "blurbHallHeroes": "This is the Hall of Heroes, where open-source contributors to HabitRPG are honored. Whether through code, art, music, writing, or even just helpfulness, they have earned <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'> gems, exclusive equipment</a>, and <a href='http://habitrpg.wikia.com/wiki/Contributor_Titles' target='_blank'>prestigious titles</a>. You can contribute to HabitRPG, too! <a href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG' target='_blank'> Find out more here. </a>"
 }

website/public/css/global-colors.styl

@@ -19,6 +19,7 @@ $color-mp = $best
 $color-toolbar = lighten($color-herobox, 70%)
 $color-options-menu = lighten($color-herobox, 85%)
 $color-options-submenu = lighten($color-herobox, 75%)
+$color-options-blurb = $color-options-submenu
 // Button colors
 $color-button-highlight = $best
 // Task background

website/public/css/options.styl

@@ -9,18 +9,27 @@
 .options-menu
   @media screen and (min-width:768px)
     background-color: $color-options-menu
+
   li
     @extend $hrpg-button
     hrpg-button-color-mixin($color-options-menu)  
+
 .options-submenu
   margin-top: -1.618em
   background-color: $color-options-submenu
+
   li
     @extend $hrpg-button
     hrpg-button-color-mixin($color-options-submenu)
+
+.options-blurbmenu
+  margin: -1.618em 0 1.618em
+  border-bottom: 1px solid darken($color-options-menu, 12%)
+  padding: .5em
+
   @media screen and (max-width:768px)
     padding: 1em 0.618em 0 0.618em
     border: 1px solid darken($color-options-menu, 12%)
     border-top: none
     
-  
+  

website/views/options/social/challenges.jade

@@ -65,6 +65,9 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht
           div(ui-view)
 
 script(type='text/ng-template', id='partials/options.social.challenges.html')
+  .options-blurbmenu
+    small.muted=env.t('blurbChallenges')
+
   .container-fluid
     .row
       .col-md-2

website/views/options/social/hall.jade

@@ -7,6 +7,10 @@ script(type='text/ng-template', id='partials/options.social.hall.html')
       a(ui-sref='options.social.hall.patrons')
         =env.t('hallPatrons')
 
+  .options-blurbmenu
+    small.muted(ng-if="$state.includes('options.social.hall.heroes')")!=env.t('blurbHallHeroes')
+    small.muted(ng-if="$state.includes('options.social.hall.patrons')")=env.t('blurbHallPatrons')
+
   .tab-content
     .tab-pane.active
       div(ui-view)

website/views/options/social/index.jade

@@ -7,6 +7,9 @@ include ./quests/index
 include ./chat-message
 
 script(type='text/ng-template', id='partials/options.social.inbox.html')
+  .options-blurbmenu
+    small.muted=env.t('blurbInbox')
+
   .container-fluid
     .row
       .col-md-12
@@ -41,6 +44,9 @@ script(type='text/ng-template', id='partials/options.social.party.html')
       include ./create-group
 
 script(type='text/ng-template', id='partials/options.social.guilds.public.html')
+  .options-blurbmenu
+    small.muted=env.t('blurbGuildsPage')
+
   div.col-xs-12(ng-repeat='invitation in user.invitations.guilds' style='margin-bottom: 1.5em')
     h3=env.t('invitedTo', {name: '{{invitation.name}}'})
     a.btn.btn-success(data-type='guild', ng-click='join(invitation)')=env.t('accept')