From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 13 Feb 2017 16:22:40 +0000 (+0100)
Subject: Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2ab7bd13e2281d31af92ba503b8628a9012140f9;p=mastodon.git

Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5
---

2ab7bd13e2281d31af92ba503b8628a9012140f9
diff --cc app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 273ebd83f,8019382cd..166c5fdce
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@@ -173,20 -175,31 +173,27 @@@ const ComposeForm = React.createClass(
            <Toggle checked={this.props.private} onChange={this.handleChangeVisibility} />
            <span className='compose-form__label__text'><FormattedMessage id='compose_form.private' defaultMessage='Mark as private' /></span>
          </label>
+        
+         <Motion defaultStyle={{ opacity: 0, height: 0 }}, style={{ opacity: spring((this.props.private || reply_to_other) ? 0 : 100), height: spring((this.props.private || reply_to_other) ? 0 : 39.5) }}>
+             <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
+               <span className='compose-form__label__text'><FormattedMessage id='compose_form.privacy_disclaimer' defaultMessage='Warning: Private posts are not encrypted, and could be read or boosted by instances or people who do not respect post privacy. This is not true privacy. Do not post senstive information.' /></span>
+             </label>
+           }
+         </Motion>
  
 -        <Motion defaultStyle={{ opacity: (this.props.private || reply_to_other) ? 0 : 100, height: (this.props.private || reply_to_other) ? 39.5 : 0 }} style={{ opacity: spring((this.props.private || reply_to_other) ? 0 : 100), height: spring((this.props.private || reply_to_other) ? 0 : 39.5) }}>
 -          {({ opacity, height }) =>
 -            <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
 -              <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />
 -              <span className='compose-form__label__text'><FormattedMessage id='compose_form.unlisted' defaultMessage='Do not display in public timeline' /></span>
 -            </label>
 -          }
 -        </Motion>
 -
 -        <Motion defaultStyle={{ opacity: 0, height: 0 }} style={{ opacity: spring(this.props.media_count === 0 ? 0 : 100), height: spring(this.props.media_count === 0 ? 0 : 39.5) }}>
 -          {({ opacity, height }) =>
 -            <label className='compose-form__label' style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
 -              <Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
 -              <span className='compose-form__label__text'><FormattedMessage id='compose_form.sensitive' defaultMessage='Mark media as sensitive' /></span>
 -            </label>
 -          }
 -        </Motion>
 +        <Collapsable isVisible={!(this.props.private || reply_to_other)} fullHeight={39.5}>
 +          <label className='compose-form__label'>
 +            <Toggle checked={this.props.unlisted} onChange={this.handleChangeListability} />
 +            <span className='compose-form__label__text'><FormattedMessage id='compose_form.unlisted' defaultMessage='Do not display in public timeline' /></span>
 +          </label>
 +        </Collapsable>
 +
 +        <Collapsable isVisible={this.props.media_count > 0} fullHeight={39.5}>
 +          <label className='compose-form__label'>
 +            <Toggle checked={this.props.sensitive} onChange={this.handleChangeSensitivity} />
 +            <span className='compose-form__label__text'><FormattedMessage id='compose_form.sensitive' defaultMessage='Mark media as sensitive' /></span>
 +          </label>
 +        </Collapsable>
        </div>
      );
    }