mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-05-20 20:58:51 +00:00
disable feature to block chat until use agreed to guidelines; remove unneeded code; adjust last-updated date to today
This commit is contained in:
parent
367ce13ce3
commit
9cd323294a
5 changed files with 17 additions and 27 deletions
|
|
@ -111,10 +111,6 @@ html, body
|
|||
h5
|
||||
font-weight: 700
|
||||
|
||||
.community-guidelines-modal // a .modal-body
|
||||
h5
|
||||
font-weight: 700
|
||||
|
||||
.modal-fixed-height
|
||||
overflow-y: auto
|
||||
max-height: 400px // Taken from Bootstrap 2.3.2 css, may need to change
|
||||
|
|
|
|||
|
|
@ -1,16 +1,18 @@
|
|||
div.chat-form.guidelines-not-accepted(ng-if='!user.flags.communityGuidelinesAccepted')
|
||||
p If you would like to post messages in the Tavern or any party or guild chat, please first read our
|
||||
|
|
||||
a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
|
||||
| and then click the button below to indicate that you accept them.
|
||||
.chat-controls
|
||||
div
|
||||
button.btn.btn-warning(ng-click='acceptCommunityGuidelines()')=env.t('iAcceptCommunityGuidelines')
|
||||
.chat-buttons
|
||||
button(type="button", ng-click='sync(group)', tooltip=env.t('toolTipMsg'))
|
||||
span.glyphicon.glyphicon-refresh
|
||||
//div.chat-form.guidelines-not-accepted(ng-if='!user.flags.communityGuidelinesAccepted')
|
||||
// p If you would like to post messages in the Tavern or any party or guild chat, please first read our
|
||||
// |
|
||||
// a(target='_blank', href='/static/community-guidelines')=env.t('communityGuidelines')
|
||||
// | and then click the button below to indicate that you accept them.
|
||||
// .chat-controls
|
||||
// div
|
||||
// button.btn.btn-warning(ng-click='acceptCommunityGuidelines()')=env.t('iAcceptCommunityGuidelines')
|
||||
// .chat-buttons
|
||||
// button(type="button", ng-click='sync(group)', tooltip=env.t('toolTipMsg'))
|
||||
// span.glyphicon.glyphicon-refresh
|
||||
|
||||
form.chat-form(ng-if='user.flags.communityGuidelinesAccepted' ng-submit='postChat(group,message.content)')
|
||||
//form.chat-form(ng-if='user.flags.communityGuidelinesAccepted' ng-submit='postChat(group,message.content)')
|
||||
//////////// When we want to block the ability to chat until the Community Guidelines have been accepted, delete the one line immediately below this comment and un-comment all lines above.
|
||||
form.chat-form(ng-submit='postChat(group,message.content)')
|
||||
div(ng-controller='AutocompleteCtrl')
|
||||
textarea.form-control(rows=4, ui-keypress='{13:"postChat(group,message.content)"}', ng-model='message.content', updateinterval='250', flag='@', at-user, auto-complete)
|
||||
span.user-list(ng-show='!isAtListHidden')
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
script(type='text/ng-template', id='modals/communityGuidelinesAccept.html')
|
||||
.modal-header
|
||||
h4=env.t('communityGuidelines')
|
||||
.modal-body.community-guidelines-modal.modal-fixed-height
|
||||
// include ../../static/community-guidelines
|
||||
.modal-footer
|
||||
button.btn.btn-default(ng-click='$close()')=env.t('close')
|
||||
|
|
@ -10,4 +10,3 @@ include ./classes
|
|||
include ./quests
|
||||
include ./rebirth
|
||||
include ./limited
|
||||
// include ./community-guidelines-accept
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
extends ./layout
|
||||
|
||||
block extraHead
|
||||
style
|
||||
style.
|
||||
.pull-left { margin-right: 20px }
|
||||
.peopleList { list-style-type: none }
|
||||
.listColumns2 {
|
||||
|
|
@ -27,8 +27,8 @@ block content
|
|||
h1=env.t('communityGuidelines')
|
||||
p.pagemeta
|
||||
|Last updated
|
||||
=env.t('August')
|
||||
| 26, 2014
|
||||
=env.t('September')
|
||||
| 14, 2014
|
||||
h2=env.t('commGuideHeadingWelcome')
|
||||
div(class='clearfix')
|
||||
img(class='pull-left', src='/community-guidelines-images/intro.png', alt='')
|
||||
|
|
|
|||
Loading…
Reference in a new issue