LemmyNet/lemmy-ui
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-22 20:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1366 from sunaurus/main

Browse source 
Don't hide "show NSFW" checkbox on instances that have NSFW disabled
This commit is contained in:
SleeplessOne1917 2023-06-18 13:45:17 +00:00 committed by GitHub
commit 93b05d728a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/shared/components/home/signup.tsx
View file

@ -298,27 +298,22 @@ export class Signup extends Component<any, State> {
</> </>
)} )}
{this.renderCaptcha()} {this.renderCaptcha()}
{siteView.local_site.enable_nsfw && ( <div className="form-group row">
<div className="form-group row"> <div className="col-sm-10">
<div className="col-sm-10"> <div className="form-check">
<div className="form-check"> <input
<input className="form-check-input"
className="form-check-input" id="register-show-nsfw"
id="register-show-nsfw" type="checkbox"
type="checkbox" checked={this.state.form.show_nsfw}
checked={this.state.form.show_nsfw} onChange={linkEvent(this, this.handleRegisterShowNsfwChange)}
onChange={linkEvent(this, this.handleRegisterShowNsfwChange)} />
/> <label className="form-check-label" htmlFor="register-show-nsfw">
<label {i18n.t("show_nsfw")}
className="form-check-label" </label>
htmlFor="register-show-nsfw"
>
{i18n.t("show_nsfw")}
</label>
</div>
</div> </div>
</div> </div>
)} </div>
<input <input
tabIndex={-1} tabIndex={-1}
autoComplete="false" autoComplete="false"

29
src/shared/components/person/settings.tsx
View file

@ -21,7 +21,6 @@ import {
debounce, debounce,
elementUrl, elementUrl,
emDash, emDash,
enableNsfw,
fetchCommunities, fetchCommunities,
fetchThemeList, fetchThemeList,
fetchUsers, fetchUsers,
@ -642,22 +641,20 @@ export class Settings extends Component<any, SettingsState> {
/> />
</div> </div>
</form> </form>
{enableNsfw(this.state.siteRes) && ( <div className="form-group">
<div className="form-group"> <div className="form-check">
<div className="form-check"> <input
<input className="form-check-input"
className="form-check-input" id="user-show-nsfw"
id="user-show-nsfw" type="checkbox"
type="checkbox" checked={this.state.saveUserSettingsForm.show_nsfw}
checked={this.state.saveUserSettingsForm.show_nsfw} onChange={linkEvent(this, this.handleShowNsfwChange)}
onChange={linkEvent(this, this.handleShowNsfwChange)} />
/> <label className="form-check-label" htmlFor="user-show-nsfw">
<label className="form-check-label" htmlFor="user-show-nsfw"> {i18n.t("show_nsfw")}
{i18n.t("show_nsfw")} </label>
</label>
</div>
</div> </div>
)} </div>
<div className="form-group"> <div className="form-group">
<div className="form-check"> <div className="form-check">
<input <input