Mistake35/Cedar-Django
1
0
Fork 0
mirror of https://github.com/Mistake35/Cedar-Django.git synced 2026-07-18 00:21:14 +10:00
Code Issues Packages Projects Releases Wiki Activity

File sharing update (requires migrations for existing databases)

Browse Source 
There are a bunch of migration files that have been thrown into the repository. Sadly, migrating is a huge pain in the fucking ass, you may need to rollback your database or god knows what.

- did not add change logs too lazy
This commit is contained in:
some weird guy
2023-10-16 15:22:41 -07:00
parent d49ce565ee
commit e5c99e0248
26 changed files with 942 additions and 1070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
closedverse_main/templates/closedverse_main/comment-view.html
+5 -5
View File
@@ -60,13 +60,13 @@
</div>
{% endif %}
<div id="the-post">
{% if comment.drawing %}
<p class="reply-content-memo"><img src="{{ comment.drawing }}" class="post-memo"></p>
{% else %}
<p class="reply-content-text">{{ comment.body|linebreaksbr }}</p>
{% if comment.file %}
{% if comment.file_type == 1 %}<div class="screenshot-container still-image"><img src="{{ comment.file.url }}"></div>
{% elif comment.file_type == 2 %}<div class="screenshot-container video"><video controls src="{{ comment.file.url }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif comment.file_type == 3 %}<div class="screenshot-container audio"><audio controls src="{{ comment.file.url }}"></audio></div>
{% elif comment.file_type == 0 %}<a class="button download-confirm" href="{{ comment.file.url }}">Download {{ comment.file }}</a>
{% endif %}
{% if comment.screenshot %}
<div class="screenshot-container still-image"><img src="{{ comment.screenshot }}"></div>
{% endif %}
<div class="post-meta">
<button type="button"{% if not comment.can_yeah %} disabled{% endif %} class="symbol submit yeah-button
closedverse_main/templates/closedverse_main/elements/comment-form.html
-8
View File
@@ -11,14 +11,6 @@
{% feeling_selector %}
<div class="textarea-with-menu active-text">
<menu class="textarea-menu">
<li><label class="textarea-menu-text">
<input type="radio" name="_post_type" value="body">
</label></li>
<li><label class="textarea-menu-memo">
<input type="radio" name="_post_type" value="painting">
</label></li>
</menu>
<div class="textarea-container">
<textarea name="body" class="textarea-text textarea" maxlength="2200" placeholder="Add a comment here." data-required></textarea>
</div>
closedverse_main/templates/closedverse_main/elements/community_post.html
+11 -15
View File
@@ -21,28 +21,24 @@
<span class="spoiler">Edited</span>·
{% endif %}
<a class="timestamp" {% if post.spoils and not post.is_mine %}data-href-hidden{% else %}href{% endif %}="{% if post.is_reply %}{% url "main:comment-view" post.id %}{% else %}{% url "main:post-view" post.id %}{% endif %}">{% time post.created %}</a>
{% if post.drawing %}
<span class="spoiler">(handwritten)</span>
{% endif %}
</p>
<div class="body post-content">
{% if post.yt_vid %}
{% if post.yt_vid and not post.file_type == 2 %}
<a href="{% url "main:post-view" post.id %}" class="screenshot-container video"><img height="48" src="https://i.ytimg.com/vi/{{ post.yt_vid }}/default.jpg"></a>
{% elif post.discord_vid %}
<div class="screenshot-container video"><video src="{{ post.url }}" height="48"></video></div>
{% endif %}
{% if post.drawing %}
<p class="post-content-memo"><img src="{{ post.drawing }}" class="post-memo"></p>
{% if post.has_line_trun %}
<p class="post-content-text">{{ post.body|truncatechars:200 }}</p>
{% else %}
{% if post.has_line_trun %}
<p class="post-content-text">{{ post.body|truncatechars:200 }}</p>
{% else %}
<p class="post-content-text">{{ post.body|truncatechars:200|linebreaksbr }}</p>
<p class="post-content-text">{{ post.body|truncatechars:200|linebreaksbr }}</p>
{% endif %}
{% if post.file %}
{% if post.file_type == 1 %}<a class="screenshot-container still-image" href="{% if post.is_reply %}{% url "main:comment-view" post.id %}{% else %}{% url "main:post-view" post.id %}{% endif %}"><img src="{{ post.file.url }}"></a>
{% elif post.file_type == 2 %}<div class="screenshot-container still-image"><video controls src="{{ post.file.url }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif post.file_type == 3 %}<div class="screenshot-container audio"><audio controls src="{{ post.file.url }}"></audio></div>
{% else %}<a>File attached</a>
{% endif %}
{% endif %}
{% if post.screenshot %}<a class="screenshot-container still-image" href="{% if post.is_reply %}{% url "main:comment-view" post.id %}{% else %}{% url "main:post-view" post.id %}{% endif %}"><img src="{{ post.screenshot }}"></a>{% endif %}
{% if post.video %}<div class="screenshot-container still-image"><video controls src="{{ post.video }}" style="max-width:100%;max-height: 450px;"></video></div>{% endif %}
{% if post.spoils and not post.is_mine and not post.creator.banned %}
{% if post.spoils and not post.is_mine and not post.creator.banned %}
<div class="hidden-content"><p>This post contains spoilers.</p>
<button type="button" class="hidden-content-button">View Post</button>
</div>
closedverse_main/templates/closedverse_main/elements/file-button.html
+2 -12
View File
@@ -1,13 +1,7 @@
<!-- <div class="file-button-container">
<span class="input-div">Image <span>PNG, JPG, and GIF are allowed.</span></span>
<input type="file" class="file-button" accept="image/png, image/jpeg, image/jpg, image/svg+xml, image/bmp, image/gif">
</div>
-->
<label class="file-button-container">
<span class="input-label">Image <span id="image-dimensions">PNG and JPEG are allowed.</span></span>
<span class="input-label">File <span id="image-dimensions">Images, videos and audio are supported.</span></span>
<span class="button file-upload-button">Upload</span>
<input accept="image/gif, image/png, image/jpeg, image/jpg, image/svg+xml, image/webp, image/bmp" type="file" style="display: none;" id="upload-file" name="screen">
<input type="file" style="display: none;" id="upload-file" name="file">
<div id="upload-preview-container" class="screenshot-container still-image" style="display: none;">
<img id="upload-preview">
<!-- not functional currently
@@ -15,8 +9,4 @@
-->
</div>
</label>
<div class="file-button-container">
<span class="input-label">Video <span>MP4s and WEBMs are allowed.</span></span>
<input type="file" class="file-button" name="video" accept="video/mp4, video/webm">
</div>
closedverse_main/templates/closedverse_main/elements/message-form.html
-8
View File
@@ -3,14 +3,6 @@
{% csrf_token %}
{% feeling_selector %}
<div class="textarea-with-menu active-text">
<menu class="textarea-menu">
<li><label class="textarea-menu-text">
<input type="radio" name="_post_type" value="body">
</label></li>
<li><label class="textarea-menu-memo">
<input type="radio" name="_post_type" value="painting">
</label></li>
</menu>
<div class="textarea-container">
<textarea name="body" class="textarea-text textarea " maxlength="12000" placeholder="Write a message here." data-open-folded-form="" data-required=""></textarea>
</div>
closedverse_main/templates/closedverse_main/elements/message.html
+7 -3
View File
@@ -10,8 +10,12 @@
{% else %}
<div class="post-content-text">{{ message.body }}</div>
{% endif %}
{% if message.screenshot %}
<div class="screenshot-container still-image"><img src="{{ message.screenshot }}"></div>
{% endif %}
{% if message.file %}
{% if message.file_type == 1 %}<div class="screenshot-container still-image"><img src="{{ message.file.url }}"></div>
{% elif message.file_type == 2 %}<div class="screenshot-container"><video controls src="{{ message.file.url }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif message.file_type == 3 %}<div class="screenshot-container"><audio controls src="{{ message.file.url }}"></audio></div>
{% elif message.file_type == 0 %}<a class="button download-confirm" href="{{ message.file.url }}">Download {{ message.file }}</a>
{% endif %}
{% endif %}
</div>
</div>
closedverse_main/templates/closedverse_main/elements/post-comment.html
+5 -8
View File
@@ -5,9 +5,6 @@
<p class="user-name"><a {% if comment.creator.color %}style=color:{{ comment.creator.color }}{% endif %} href="{% url "main:user-view" comment.creator.username %}">{{ comment.creator.nickname }}</a></p>
<p class="timestamp-container">
<a class="timestamp" {% if comment.spoils and not comment.is_mine %}data-href-hidden{% else %}href{% endif %}="{% url "main:comment-view" comment.id %}">{% time comment.created %}</a>
{% if comment.drawing %}
<span class="spoiler">(handwritten)</span>
{% endif %}
{% if comment.has_edit %}
<span class="spoiler">· Edited</span>
{% endif %}
@@ -15,13 +12,13 @@
</p>
</div>
{% if comment.drawing %}
<p class="reply-content-memo"><img src="{{ comment.drawing }}"></p>
{% else %}
<div class="reply-content-text">{{ comment.body|linebreaksbr }}</div>
{% if comment.file %}
{% if comment.file_type == 1 %}<div class="screenshot-container still-image"><img src="{{ comment.file.url }}"></div>
{% elif comment.file_type == 2 %}<div class="screenshot-container"><video controls src="{{ comment.file.url }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif comment.file_type == 3 %}<div class="screenshot-container"><audio controls src="{{ comment.file.url }}"></audio></div>
{% else %}<a>File attached</a>
{% endif %}
{% if comment.screenshot %}
<div class="screenshot-container still-image"><img src="{{ comment.screenshot }}"></div>
{% endif %}
{% if comment.spoils and not comment.is_mine and not comment.creator.banned %}
<div class="hidden-content"><p>This comment contains spoilers.</p>
closedverse_main/templates/closedverse_main/elements/post-form.html
-13
View File
@@ -10,19 +10,6 @@
{% feeling_selector %}
<div class="textarea-with-menu active-text">
<menu class="textarea-menu">
<li><label class="textarea-menu-text">
<input type="radio" name="_post_type" value="body">
</label></li>
<li><label class="textarea-menu-memo">
<input type="radio" name="_post_type" value="painting">
</label></li>
<!--
<li><label class="textarea-menu-poll">
<input type="radio" name="_post_type" value="poll">
</label></li>
-->
</menu>
<div class="textarea-container">
<textarea name="body" class="textarea-text textarea " maxlength="2200" placeholder="{% if community.is_activity %}Share a post to your followers.{% else %}Share your thoughts in a post to {{ community.name }}{% endif %}" data-open-folded-form="" data-required=""></textarea>
</div>
closedverse_main/templates/closedverse_main/elements/profile-post.html
+10 -15
View File
@@ -1,4 +1,4 @@
{% load closedverse_tags %}<div {% if post.spoils and not post.is_mine or post.creator.banned %}data-href-hidden{% else %}data-href{% endif %}="{% url "main:post-view" post.id %}" class="post trigger{% if post.screenshot and not for_announcements %} with-image{% endif %}{% if post.spoils and not post.is_mine or post.creator.banned %} hidden test-hidden{% endif %}" tabindex="0">
{% load closedverse_tags %}<div {% if post.spoils and not post.is_mine or post.creator.banned %}data-href-hidden{% else %}data-href{% endif %}="{% url "main:post-view" post.id %}" class="post trigger{% if post.file_type == 1 and not for_announcements %} with-image{% endif %}{% if post.spoils and not post.is_mine or post.creator.banned %} hidden test-hidden{% endif %}" tabindex="0">
<p class="community-container"><a {% if post.community.clickable %}href="{% url "main:community-view" post.community_id %}"{% endif %}><img src="{{ post.community.icon }}" class="community-icon">{{ post.community.name }}</a></p>
@@ -16,27 +16,22 @@
<span class="spoiler">Edited ({% time post.edited %})</span>·
{% endif %}
<a class="timestamp" {% if post.spoils and not post.is_mine %}data-href-hidden{% else %}href{% endif %}="{% url "main:post-view" post.id %}">{% time post.created %}</a>
{% if post.drawing %}
<span class="spoiler">(handwritten)</span>
{% endif %}
</p>
{% if post.yt_vid %}
{% if post.yt_vid and not post.file_type == 2 %}
<a href="{% url "main:post-view" post.id %}" class="{% if not for_announcements %}screenshot-container {% else %}announcement-container {% endif %}video"><img height="48" src="https://i.ytimg.com/vi/{{ post.yt_vid }}/default.jpg"></a>
{% endif %}
{% if post.file %}
{% if post.file_type == 1 %}
<a href="{% url "main:post-view" post.id %}" class="{% if not for_announcements %}screenshot-container {% else %}announcement-container {% endif %}still-image"><img src="{{ post.file.url }}"></a>
{% elif post.file_type == 2 %}
<div class="{% if not for_announcements %}screenshot-container {% else %}announcement-container {% endif %} video"><video src="{{ post.file.url }}" width="50" height="48"></video></div>
{% else %}<a>File attached</a>
{% endif %}
{% endif %}
{% if post.screenshot %}
<a href="{% url "main:post-view" post.id %}" class="{% if not for_announcements %}screenshot-container {% else %}announcement-container {% endif %}still-image"><img src="{{ post.screenshot }}"></a>
{% endif %}
{% if post.video %}
<div class="{% if not for_announcements %}screenshot-container {% else %}announcement-container {% endif %} video"><video src="{{ post.video }}" width="50" height="48"></video></div>
{% endif %}
{% if post.drawing %}
<p class="post-content-memo"><img src="{{ post.drawing }}" class="post-memo"></p>
{% else %}
{% if post.has_line_trun %}
<p class="post-content-text">{{ post.body|truncatechars:100 }}</p>
{% else %}
<p class="post-content-text">{{ post.body|truncatechars:100|linebreaksbr }}</p>
{% endif %}
{% endif %}
{% if post.spoils and not post.is_mine and not post.creator.banned %}
<div class="hidden-content"><p>This post contains spoilers.
closedverse_main/templates/closedverse_main/elements/user-sidebar.html
+10 -6
View File
@@ -23,9 +23,9 @@
{% endif %}
<div class="sidebar-container">
{% if profile.favorite.screenshot %}
{% if profile.favorite.file %}
<a href="{% url "main:post-view" profile.favorite_id %}" id="sidebar-cover">
<img src="{{ profile.favorite.screenshot }}" class="sidebar-cover-image">
<img src="{{ profile.favorite.file.url }}" class="sidebar-cover-image">
</a>
{% endif %}
{% user_sidebar_info user profile %}
@@ -150,12 +150,14 @@
</div>
{% endif %}
<div class="user-data">
{% if profile.country %}
<div class="data-content">
<h4><span>Region</span></h4>
<div class="note">
<span>{% if profile.country %}{{ profile.country }}{% else %}Not Set{% endif %}</span>
<span>{{ profile.country }}</span>
</div>
</div>
{% endif %}
<div class="data-content">
<h4><span>NNID</span></h4>
<div class="note">
@@ -192,9 +194,9 @@
{% endif %}
{% if profile.pronoun_is %}
<div class="data-content">
<h4><span>Preferred Pronoun</span></h4>
<h4><span>Pronouns</span></h4>
<div class="note">
<span>{{ profile.get_pronoun_is_display }}</span>
<span>{{ profile.pronoun_is }}</span>
</div>
</div>
{% endif %}
@@ -214,12 +216,14 @@
</div>
</div>
{% endif %}
{% if profile.weblink %}
<div class="favorite-game-genre">
<h4><span>Web URL</span></h4>
<div class="note">
<span>{% if profile.weblink %}<a class="link-confirm" href="{% if not profile.got_fullurl %}http://{% endif %}{{ profile.weblink }}">{{ profile.weblink }}</a>{% else %}Not Set{% endif %}</span>
<span><a class="link-confirm" href="{% if not profile.got_fullurl %}http://{% endif %}{{ profile.weblink }}">{{ profile.weblink }}</a></span>
</div>
</div>
{% endif %}
</div>
</div>
{% if user.community_favorites %}
closedverse_main/templates/closedverse_main/messages.html
+1 -1
View File
@@ -32,7 +32,7 @@
</p>
{% if friend.get_latest_msg %}
<span class="timestamp">{% time friend.get_latest_msg.created %}</span>
<p class="text {% if friend.get_latest_msg.drawing or friend.get_latest_msg.is_rm %}type-memo {% endif %}{% if friend.get_latest_msg.mine %}my{% else %}other{% endif %}">{{ friend.get_latest_msg.trun }}</p>
<p class="text {% if friend.get_latest_msg.is_rm %}type-memo {% endif %}{% if friend.get_latest_msg.mine %}my{% else %}other{% endif %}">{{ friend.get_latest_msg.trun }}</p>
{% else %}
<p class="text placeholder">You haven't exchanged messages with this user yet.</p>
{% endif %}
closedverse_main/templates/closedverse_main/post-view.html
+8 -24
View File
@@ -16,7 +16,7 @@
{% if post.is_mine and not post.has_edit %}
<button type="button" class="symbol button edit-button edit-post-button"><span class="symbol-label">Edit</span></button>
{% endif %}
{% if post.is_mine and post.screenshot %}
{% if post.is_mine and post.file_type == 1 %}
<button type="button" class="symbol button edit-button profile-post-button{% if post.is_favorite %} done {% endif %}" data-action="{% if post.is_favorite %}{% url "main:post-unset-profile" post.id %}{% else %}{% url "main:post-set-profile" post.id %}{% endif %}"><span class="symbol-label">Set as profile post</span></button>
{% endif %}
{% if post.can_lock_comments %}
@@ -33,9 +33,6 @@
{% p_username post.creator %}
<p class="timestamp-container">
<span class="timestamp">{% time post.created %}</span>
{% if post.drawing %}
<span class="spoiler">(drawing)</span>
{% endif %}
<span class="spoiler-status{% if post.spoils %} spoiler{% endif %}">·Spoilers</span>
{% if post.has_edit %}
· <span class="spoiler">Edited ({% time post.edited %})</span>
@@ -62,30 +59,17 @@
</div>
{% endif %}
<div id="the-post">
{% if post.drawing %}
<p class="post-content-memo"><img src="{{ post.drawing }}" class="post-memo"></p>
{% else %}
<p class="post-content-text">{{ post.body }}</p>
{% endif %}
{% if post.poll %}
<div class="post-poll{% if post.poll.has_vote %} selected{% endif %}" data-action="{% url "main:poll-vote" post.poll.id %}" data-action-unvote="{% url "main:poll-unvote" post.poll.id %}">
<a class="poll-votes">{{ post.poll.num_votes }} vote{% if not post.poll.num_votes == 1 %}s{% endif %}</a>
<div class="poll-options{% if post.screenshot %} with-background" style="background-image:url('{{ post.screenshot }}')"
<div class="poll-background" style="width:50%"></div>{% else %}">{% endif %}
{% for choice in post.poll.choices %}
<a class="poll-option{% if post.poll.has_vote and post.poll.has_vote.1 == choice %} selected{% endif %}" votes="{{ choice.num_votes }}">
{{ choice }}<span class="percentage">%</span>
</a>
{% endfor %}
</div>
</div>
{% elif post.screenshot %}<div class="screenshot-container still-image"><img src="{{ post.screenshot }}"></div>{% endif %}
{% if post.file %}
{% if post.file_type == 1 %}<div class="screenshot-container still-image"><img src="{{ post.file.url }}"></div>
{% elif post.file_type == 2 %}<div class="screenshot-container video"><video controls src="{{ post.file.url }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif post.file_type == 3 %}<div class="screenshot-container audio"><audio controls src="{{ post.file.url }}"></audio></div>
{% elif post.file_type == 0 %}<a class="button download-confirm" href="{{ post.file.url }}">Download {{ post.file }}</a>
{% endif %}
{% endif %}
{% if post.yt_vid %}
<div class="screenshot-container video"><iframe class="youtube-player" type="text/html" style="max-width:100%;max-height: 450px;" src="https://www.youtube.com/embed/{{ post.yt_vid }}?rel=0&modestbranding=1&iv_load_policy=3" frameborder="0"></iframe></div>
{% elif post.video %}
<div class="screenshot-container video"><video controls src="{{ post.video }}" style="max-width:100%;max-height: 450px;"></video></div>
{% elif post.discord_vid %}
<div class="DiscordCDN-container video">
<video class="discord-player" src="{{ post.url }}" style="max-width:100%;max-height: 450px;" controls></video>
closedverse_main/templates/closedverse_main/profile-settings.html
+15 -61
View File
@@ -7,11 +7,6 @@
<form class="setting-form" method="post" action="{% url "main:user-view" user.username %}">
<ul class="settings-list">
{% if profile.cannot_edit %}
<p>You cannot change user settings for this account</p>
{% endif %}
{% if not profile.cannot_edit %}
<li class="setting-nickname">
<p class="settings-label">Nickname</p>
<div class="center center-input">
@@ -25,20 +20,13 @@
<p class="note">Anything you write here will appear on your profile. Remember to keep it brief. Please don't write anything that'll violate <a href="{% url "main:help-rules" %}">{{ brand_name }}'s rules</a>.</p>
</li>
<!--
<li>
<p class="settings-label"><label for="relationship_visibility">Who should be able to see your friends, followers and following lists?</label></p>
<div class="select-content">
<div class="select-button">
<select name="relationship_visibility" id="relationship_visibility">
<option value="0"{% if profile.relationship_visibility == 0 %} selected{% endif %}>Everyone</option>
<option value="1"{% if profile.relationship_visibility == 1 %} selected{% endif %}>My friends</option>
<option value="2"{% if profile.relationship_visibility == 2 %} selected{% endif %}>Only me</option>
</select>
</div>
</div>
<li class="setting-pronoun">
<p class="settings-label">What are your pronouns?</p>
<div class="center center-input">
<input type="text" name="pronouns" maxlength="16" placeholder="Pronouns" value="{{ profile.pronoun_is }}">
</div>
<p class="note">Enter your pronouns here. </p>
</li>
-->
<li class="setting-country">
<p class="settings-label">Region</p>
<div class="center center-input">
@@ -55,18 +43,6 @@
<input type="text" name="email" maxlength="255" placeholder="Email address" value="{{ user.email|default_if_none:"" }}">
</div>
<p class="note">Please note that your email can be a fake one, however if you need to reset your password, this must be accessible. You can't share emails.</p>
{% if user.email %}
<p class="settings-label"><label for="email_login">Allow logging in to your account with your e-mail address?</label></p>
<div class="select-content">
<div class="select-button">
<select name="email_login" id="email_login">
<option value="0"{% if profile.email_login == 0 %} selected{% endif %}>Do not allow (username login only)</option>
<option value="1"{% if profile.email_login == 1 %} selected{% endif %}>Allow</option>
<option value="2"{% if profile.email_login == 2 %} selected{% endif %}>Only allow (email login only)</option>
</select>
</div>
</div>
{% endif %}
</li>
<li class="setting-website">
<p class="settings-label">Web URL</p>
@@ -98,9 +74,8 @@
<p class="note">This is the color your nickname will appear as. Set it to white (#ffffff) and it will return to the default. It will appear like so.</p>
{% user_sidebar_info user %}
</li>
{% if profile.origin_id %}
<li>
<p class="settings-label"><label for="id_visibility">Who should be able to see your Nintendo Network ID? ({{ profile.origin_id }})</label></p>
<p class="settings-label"><label for="id_visibility">{% if profile.origin_id %}Who should be able to see your Nintendo Network ID? ({{ profile.origin_id }}){% else %}You have not entered a Nintendo Network ID yet, If you do, who should be able to see it?{% endif %}</label></p>
<div class="select-content">
<div class="select-button">
<select name="id_visibility" id="id_visibility">
@@ -111,7 +86,6 @@
</div>
</div>
</li>
{% endif %}
<li>
<p class="settings-label"><label for="let_friendrequest">Who should be able to send you friend requests?</label></p>
<div class="select-content">
@@ -124,21 +98,6 @@
</div>
</div>
</li>
<li>
<p class="settings-label"><label for="pronoun_dot_is">What's your preferred pronoun?</label></p>
<div class="select-content">
<div class="select-button">
<select name="pronoun_dot_is" id="pronoun_dot_is">
<option value="0"{% if profile.pronoun_is == 0 %} selected{% endif %}>I don't know</option>
<option value="1"{% if profile.pronoun_is == 1 %} selected{% endif %}>He/him</option>
<option value="2"{% if profile.pronoun_is == 2 %} selected{% endif %}>She/her</option>
<option value="3"{% if profile.pronoun_is == 3 %} selected{% endif %}>He/she</option>
<option value="4"{% if profile.pronoun_is == 4 %} selected{% endif %}>It</option>
<option value="5"{% if profile.pronoun_is == 5 %} selected{% endif %}>They/Them</option>
</select>
</div>
</div>
</li>
<li>
<p class="settings-label"><label for="yeahs_visibility">Who should be able to see your Yeahs given?</label></p>
<div class="select-content">
@@ -165,16 +124,12 @@
</li>
<li class="setting-background">
<p class="settings-label">Website theme:</p>
<div class="center center-input">
<input type="text" name="bg_url" maxlength="300" placeholder="Background URL" value="{% if user.bg_url %}{{ user.bg_url }}{% endif %}">
</div>
<p class="note">To set an image as the background for this site, paste its URL into the box above. Note: this change will only be visible to you.</p>
<div class="center center-input">
<input type="hidden" name="theme" maxlength="7" placeholder="Enter a hex color value here" value="{{ user.theme }}">
<button class="button color-thing2">Open color picker</button>
</div>
<p class="current-theme" style="color:{{ user.theme }}">Remember to save and refresh the page.</p>
{% if user.theme %}<input type="checkbox" name="reset-theme">Reset to default{% endif %}
{% if user.theme %}<input type="checkbox" name="reset_theme">Reset to default{% endif %}
{% if settings.site_wide_theme_hex %}<p class="note">Default theme: "{{ settings.site_wide_theme_hex }}"</p>{% endif %}
</li>
<li class="setting-background">
@@ -195,18 +150,18 @@
</li>
<li class="setting-avatar">
<div class="icon-container">
<img class="icon nnid-icon mii{% if not user.has_mh %} none{% endif %}" src="{% miionly user.mh %}">
<img class="icon nnid-icon gravatar{% if user.has_mh or user.has_plain_avatar %} none{% endif %}" src="{{ user.gravatar }}">
<img class="icon nnid-icon mii{% if not user.avatar_type == 2 %} none{% endif %}" src="{% miionly user.mh %}">
<img class="icon nnid-icon gravatar{% if not user.avatar_type == 1 %} none{% endif %}" src="{{ user.gravatar }}">
{% if user.has_freedom %}
<img class="icon nnid-icon custom{% if not user.has_plain_avatar %} none{% endif %}" src="{{ user.do_avatar }}">
<img class="icon nnid-icon custom{% if not user.avatar_type == 0 %} none{% endif %}" src="{{ user.do_avatar }}">
{% endif %}
</div>
<p class="settings-label">Do you want the avatar shown beside your content to use the Mii from your Nintendo Network ID or a Gravatar or a custom avatar the way God intended?</p>
<label><input type="radio" name="avatar" value="0"{% if user.has_mh %} checked{% endif %}>Mii</label>
<label><input type="radio" name="avatar" value="1"{% if not user.has_mh %} checked{% endif %}>Gravatar</label>
<label><input type="radio" name="avatar" value="0"{% if user.avatar_type == 2 %} checked{% endif %}>Mii</label>
<label><input type="radio" name="avatar" value="1">Use Gravatar</label>
{% if user.has_freedom %}
<label><input type="radio" name="avatar" value="2"{% if user.has_plain_avatar%} checked{% endif %}>Custom</label>
<span id="upload-thing"{% if not user.has_plain_avatar %} class="none"{% endif %}>{% file_button %}</span>
<label><input type="radio" name="avatar" value="2"{% if user.avatar_type == 0 %} checked{% endif %}>Custom</label>
<span id="upload-thing"{% if not user.avatar_type == 0 %} class="none"{% endif %}>{% file_button %}</span>
<style>
.setting-avatar div.file-button-container { display: none; }
</style>
@@ -220,7 +175,6 @@
<div class="form-buttons">
<input type="submit" class="black-button apply-button" value="Save these settings">
</div>
{% endif %}
</ul></form></div></div>
{% endblock %}