diff --git a/CHANGELOG.md b/CHANGELOG.md index 1064a7c09a..caee7d0227 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ My app - Changelog -# (2015-03-21) +# (2015-03-22) diff --git a/common/locales/en/groups.json b/common/locales/en/groups.json index 94f6ca73a3..fdbad09d14 100644 --- a/common/locales/en/groups.json +++ b/common/locales/en/groups.json @@ -94,5 +94,6 @@ "abuseFlagModalBody": "Are you sure you want to report this post? You should ONLY report a post that violates the <%= firstLinkStart %>Community Guidelines<%= linkEnd %> and/or <%= secondLinkStart %>Terms of Service<%= linkEnd %>. Inappropriately reporting a post is a violation of the Community Guidelines and may give you an infraction.", "abuseFlagModalButton": "Report", "abuseReported": "Thank you for reporting this violation. The moderators have been notified.", - "abuseAlreadyReported": "You have already reported this message." + "abuseAlreadyReported": "You have already reported this message.", + "needsText": "Type something in the box, then click this button." } diff --git a/website/views/shared/modals/members.jade b/website/views/shared/modals/members.jade index bfb57ac814..dffce21a7f 100644 --- a/website/views/shared/modals/members.jade +++ b/website/views/shared/modals/members.jade @@ -48,7 +48,10 @@ script(type='text/ng-template', id='modals/private-message.html') .modal-body textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message') .modal-footer - button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") + //- Due to a quirk in Bootstrap UI, we need to wrap this so the tooltip can + //- appear when disabled. + div(style='display:inline-block',tooltip="{{_message ? '' : env.t('needsText')}}") + button.btn.btn-primary(ng-disabled='!_message',ng-click='sendPrivateMessage(profile._id, _message)')=env.t("send") button.btn.btn-default(ng-click='$close()')=env.t('cancel') script(type='text/ng-template', id='modals/send-gift.html') @@ -109,4 +112,4 @@ script(type='text/ng-template', id='modals/remove-member.html') textarea.form-control(type='text',rows='5',placeholder=env.t('optionalMessage'),ng-model='removeMemberData.message') .modal-footer button.pull-left.btn.btn-danger(ng-click='confirmRemoveMember(true); $close()')=env.t('yesRemove') - button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel') \ No newline at end of file + button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel')