krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a tooltip to make it clear to the user to type something in!

Browse Source
This commit is contained in:
Daniel Hammond
2015-03-22 12:37:32 -04:00
parent 5f726eadbf
commit d3b92a0a6c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,3 +1,3 @@
<a name="">My app - Changelog</a> <a name="">My app - Changelog</a>
# (2015-03-21) # (2015-03-22)

3
common/locales/en/groups.json
View File

@@ -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.", "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", "abuseFlagModalButton": "Report",
"abuseReported": "Thank you for reporting this violation. The moderators have been notified.", "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."
} }

7
website/views/shared/modals/members.jade
View File

@@ -48,7 +48,10 @@ script(type='text/ng-template', id='modals/private-message.html')
.modal-body .modal-body
textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message') textarea.form-control(type='text',rows='5',ui-keydown='{"meta-enter":"sendPrivateMessage(profile._id, _message)"}',ng-model='_message')
.modal-footer .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') button.btn.btn-default(ng-click='$close()')=env.t('cancel')
script(type='text/ng-template', id='modals/send-gift.html') 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') textarea.form-control(type='text',rows='5',placeholder=env.t('optionalMessage'),ng-model='removeMemberData.message')
.modal-footer .modal-footer
button.pull-left.btn.btn-danger(ng-click='confirmRemoveMember(true); $close()')=env.t('yesRemove') 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') button.btn.btn-default(ng-click='confirmRemoveMember(false); $close()')=env.t('cancel')