Merge branch 'develop' into blade-Finish_weeklies_pr

Added Sabe's novalidate change to adding a new task

website/views/options/profile.jade

@@ -270,7 +270,7 @@ script(id='partials/options.profile.profile.html', type='text/ng-template')
           input.form-control(type='url', ng-model='editingProfile.imageUrl', placeholder=env.t('imageUrl'))
         .form-group
           label=env.t('displayBlurb')
-          textarea.form-control(rows=5, placeholder=env.t('displayBlurb'), ng-model='editingProfile.blurb')
+          textarea.form-control(rows=5, placeholder=env.t('displayBlurbPlaceholder'), ng-model='editingProfile.blurb')
           include ../shared/formatting-help
 
 mixin backgrounds(mobile)

website/views/shared/modals/classes.jade

@@ -1,18 +1,11 @@
 script(type='text/ng-template', id='modals/chooseClass.html')  
   .modal-header
-    h4 
-      | 
-      =env.t('chooseClass1')
-      |  
-      a(href='http://habitrpg.wikia.com/wiki/Class_System' target='_blank')=env.t('chooseClass2')
-      | 
-      =env.t('chooseClass3')
+    h4=env.t('chooseClassHeading')
   .modal-body.select-class
     .container-fluid
       .row
         .col-md-3(ng-click='selectedClass = "warrior"')
-          h5
-            a(href='http://habitrpg.wikia.com/wiki/Warrior' target='_blank')=env.t('warrior')
+          h5!=env.t('warriorWiki')
           figure.herobox(ng-class='{"selected-class": selectedClass=="warrior"}')
             .character-sprites
               span(class='skin_{{user.preferences.skin}}')
@@ -26,8 +19,7 @@ script(type='text/ng-template', id='modals/chooseClass.html')
               span(class='shield_warrior_5')
               span(class='weapon_warrior_6')
         .col-md-3(ng-click='selectedClass = "wizard"')
-          h5
-            a(href='http://habitrpg.wikia.com/wiki/Mage' target='_blank')=env.t('mage')
+          h5!=env.t('mageWiki')
           figure.herobox(ng-class='{"selected-class": selectedClass=="wizard"}')
             .character-sprites
               span(class='skin_{{user.preferences.skin}}')
@@ -41,8 +33,7 @@ script(type='text/ng-template', id='modals/chooseClass.html')
               span(class='shield_wizard_5')
               span(class='weapon_wizard_6')
         .col-md-3(ng-click='selectedClass = "rogue"')
-          h5
-            a(href='http://habitrpg.wikia.com/wiki/Rogue' target='_blank')=env.t('rogue')
+          h5!=env.t('rogueWiki')
           figure.herobox(ng-class='{"selected-class": selectedClass=="rogue"}')
             .character-sprites
               span(class='skin_{{user.preferences.skin}}')
@@ -56,8 +47,7 @@ script(type='text/ng-template', id='modals/chooseClass.html')
               span(class='shield_rogue_6')
               span(class='weapon_rogue_6')
         .col-md-3(ng-click='selectedClass = "healer"')
-          h5
-            a(href='http://habitrpg.wikia.com/wiki/Healer' target='_blank')=env.t('healer')
+          h5!=env.t('healerWiki')
           figure.herobox(ng-class='{"selected-class": selectedClass=="healer"}')
             .character-sprites
               span(class='skin_{{user.preferences.skin}}')
@@ -77,5 +67,6 @@ script(type='text/ng-template', id='modals/chooseClass.html')
       .well(ng-show='selectedClass=="healer"')=env.t('healerText')
 
   .modal-footer
-    button.btn.btn-sm.btn-danger(ng-click='user.ops.disableClasses({}); $close()', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut')
+    button.btn.btn-danger(ng-click='user.ops.disableClasses({}); $close()', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut')
     button.btn.btn-primary(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select')
+    .pull-left!=env.t('chooseClassLearn')

website/views/shared/tasks/task_view/add_new.jade

@@ -1,4 +1,4 @@
-form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)')
+form.task-add(name='new{{list.type}}form', ng-hide='obj._locked', ng-submit='addTask(obj[list.type+"s"],list)', novalidate)
   textarea(rows='6', task-focus='list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolderBulk}}', ng-if='list.bulk', ui-keydown='{"meta-enter ctrl-enter":"addTask(obj[list.type+\'s\'],list)"}', required)
   input(type='text', task-focus='!list.bulk && list.focus', ng-model='list.newTask', placeholder='{{list.placeHolder}}', ng-if='!list.bulk', required)
   button(type='submit', ng-disabled='new{{list.type}}form.$invalid')