From b286a930061db31009bad91eb4bcbf0e7a6fd606 Mon Sep 17 00:00:00 2001 From: arodang Date: Thu, 19 Nov 2015 23:21:15 -0500 Subject: [PATCH 1/2] removed challenge tag maxlength, reduced tag and prize field size --- website/views/options/social/challenges.jade | 46 ++++++++++---------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index cb0a36e358..d09361b9a7 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -139,32 +139,34 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') placeholder=env.t('challengeTitle'), required='required', ng-disabled='insufficientGemsForTavernChallenge()') - .form-group - input.form-control(type='text', minlength="3", maxlength="16", - ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required - ng-disabled='insufficientGemsForTavernChallenge()') - |  - a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags', - popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right') - =env.t('moreInfo') - .form-group textarea.form-control(cols='3', placeholder=env.t('challengeDescr'), ng-model='newChallenge.description' ng-disabled='insufficientGemsForTavernChallenge()') - .form-group - .input-group - span.input-group-addon - .Pet_Currency_Gem1x - input.form-control(type='number', placeholder=env.t('prize'), - ng-disabled='insufficientGemsForTavernChallenge()' - min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", - max="{{maxPrize}}", ng-model='newChallenge.prize') - a.hint(popover="{{newChallenge.group=='habitrpg' ? env.t('prizePopTavern') : env.t('prizePop')}}", - popover-trigger='mouseenter', popover-placement='right') - =env.t('moreInfo') - .pull-right(ng-show='newChallenge.group=="habitrpg"') - !=env.t('publicChallenges') + .row + .form-group.col-lg-6.col-md-6.col-sm-12 + input.form-control(type='text', minlength="3", + ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required + ng-disabled='insufficientGemsForTavernChallenge()') + |  + a.hint.vertical-20(target='_blank', href='http://habitica.wikia.com/wiki/Tags', + popover=env.t('challengeTagPop'), popover-trigger='mouseenter', popover-placement='right') + =env.t('moreInfo') + + .row + .form-group.col-lg-6.col-md-6.col-sm-12 + .input-group + span.input-group-addon + .Pet_Currency_Gem1x + input.form-control(type='number', placeholder=env.t('prize'), + ng-disabled='insufficientGemsForTavernChallenge()' + min="{{newChallenge.group=='habitrpg' ? 1 : 0}}", + max="{{maxPrize}}", ng-model='newChallenge.prize') + a.hint(popover="{{newChallenge.group=='habitrpg' ? env.t('prizePopTavern') : env.t('prizePop')}}", + popover-trigger='mouseenter', popover-placement='right') + =env.t('moreInfo') + div(ng-show='newChallenge.group=="habitrpg"') + !=env.t('publicChallenges') .form-group(ng-if='user.contributor.admin') .checkbox From 0b1758f5c6a88e0125ed762011ea4eb875fe6c32 Mon Sep 17 00:00:00 2001 From: Arodang Date: Fri, 20 Nov 2015 18:17:51 -0500 Subject: [PATCH 2/2] Removed col-lg-6 class from tags and prize --- website/views/options/social/challenges.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/views/options/social/challenges.jade b/website/views/options/social/challenges.jade index d09361b9a7..5eb4ca9775 100644 --- a/website/views/options/social/challenges.jade +++ b/website/views/options/social/challenges.jade @@ -144,7 +144,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') ng-disabled='insufficientGemsForTavernChallenge()') .row - .form-group.col-lg-6.col-md-6.col-sm-12 + .form-group.col-md-6.col-sm-12 input.form-control(type='text', minlength="3", ng-model='newChallenge.shortName', placeholder=env.t('challengeTag'), required ng-disabled='insufficientGemsForTavernChallenge()') @@ -154,7 +154,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') =env.t('moreInfo') .row - .form-group.col-lg-6.col-md-6.col-sm-12 + .form-group.col-md-6.col-sm-12 .input-group span.input-group-addon .Pet_Currency_Gem1x