Invite only setting, stolen code, bunch of other random shit.

closedverse_main/templates/closedverse_main/community_all.html

@@ -19,29 +19,20 @@
 	<div class="community-main">
 		<br>
 			<div class="community-switcher">
-				<a class="community-switcher-tab gen selected" href="#">General</a>
-				<a class="community-switcher-tab game" href="#">Game</a>
-				<a class="community-switcher-tab special" href="#">Special</a>
-				<a class="community-switcher-tab usr" href="#">User</a>
+				<a class="community-switcher-tab gen {% if category == "gen" %}selected{% endif %}" href="{% url "main:community-viewall" "gen" %}">General</a>
+				<a class="community-switcher-tab game {% if category == "game" %}selected{% endif %}" href="{% url "main:community-viewall" "game" %}">Game</a>
+				<a class="community-switcher-tab special {% if category == "special" %}selected{% endif %}" href="{% url "main:community-viewall" "special" %}">Special</a>
+				<a class="community-switcher-tab usr {% if category == "usr" %}selected{% endif %}" href="{% url "main:community-viewall" "usr" %}">User</a>
 			</div>
-			<div class="communities gen">
-				{% community_page_element general "General Communities" %}
-			</div>
-			<div class="communities game none">
-				{% community_page_element game "Game Communities" %}
-			</div>
-			<div class="communities special none">
-				{% community_page_element special "Special Communities" %}
-			</div>
-			<div class="communities usr none">
-				{% community_page_element user_communities "User Communities" %}
+			<div class="communities">
+				{% community_page_element communities text %}
 			</div>
 			{% if has_next %}
-				<a href="{% url "main:community-viewall" %}?offset={{ next }}" class="big-button">Next</a>
+				<a href="{% url "main:community-viewall" category %}?offset={{ next }}" class="big-button">Next</a>
 			{% endif %}
 		{% if has_back %}
 			<p>&nbsp</p>
-			<a href="{% url "main:community-viewall" %}?offset={{ back }}" class="big-button">Back</a>
+			<a href="{% url "main:community-viewall" category %}?offset={{ back }}" class="big-button">Back</a>
 		{% endif %}
 	</div>
-{% endblock %}
+{% endblock %}

closedverse_main/templates/closedverse_main/community_list.html

@@ -23,7 +23,7 @@
 	<div class="Announcements">
 		{% for announcements in announcements %}
 		<div class='Announcement-content'>
-		{% user_icon_container announcements.creator post.feeling %}
+		{% user_icon_container announcements.creator announcements.feeling %}
 		<a class='user-name' href={% url "main:user-view" announcements.creator.username %} {% if announcements.creator.color %}style=color:{{ announcements.creator.color }}{% endif %}>{{ announcements.creator }}</a><a class='timestamp"'> - {{ announcements.created }}</a>
 		<p>{{ announcements.body|linebreaksbr|urlize }}</p>
 		{% if announcements.screenshot %}<image class='Announcement-image' src={{ announcements.screenshot }}></image>{% endif %}
@@ -32,13 +32,13 @@
 	</div>
 	{% endif %}
 		
-	{% if welmes and not request.user.is_authenticated %}
+	{% if WelcomeMSG and not request.user.is_authenticated %}
 	<div class="post-list-outline index-memo">
 		<h2 class="label">Welcome to Cedar!</h2>
-		{% for welmes in welmes %}
-		<h2>{{ welmes.Title }}</h2>
-		<p>{{ welmes.message|linebreaksbr|urlize }}</p>
-		{% if welmes.image %}<image src={{ welmes.image.url }}></image>{% endif %}
+		{% for WelcomeMSG in WelcomeMSG %}
+		<h2>{{ WelcomeMSG.Title }}</h2>
+		<p>{{ WelcomeMSG.message|linebreaksbr|urlize }}</p>
+		{% if WelcomeMSG.image %}<image src={{ WelcomeMSG.image.url }}></image>{% endif %}
 		{% endfor %}
 	</div>
 	{% endif %}
@@ -78,17 +78,18 @@
 			{% community_page_element game "Game Communities" %}
 			{% community_page_element special "Special Communities" %}
 			{% community_page_element user_communities "User owned Communities" %}
-			<a href="{% url "main:community-viewall" %}" class="big-button">Show more</a>
+			<a href="{% url "main:community-viewall" "gen" %}" class="big-button">Show more</a>
 	</div>
 	<div id="community-guide-footer">
 		<div id="guide-menu">
 			<a class="arrow-button" href="{% url "main:help-why" %}"><span>Why join?</span></a>
-			<a class="arrow-button" href="{% url "main:help-rules" %}"><span>Cedar Rules</span></a>
-			<!--<a class="arrow-button" href="{% url "main:active-clones" %}"><span>Active clones</span></a>-->
+			<a class="arrow-button" href="{% url "main:help-rules" %}"><span>{{ brand_name }} Rules</span></a>
 			<a class="arrow-button" href="{% url "main:help-faq" %}"><span>Frequently Asked Questions (FAQ)</span></a>
 			<a class="arrow-button" href="{% url "main:what-ads" %}"><span>What are user-generated ads?</span></a>
-			{% if settings.PROD %}
+			{% if settings.CLOSEDVERSE_PROD %}
+			<a class="arrow-button" href="{% url "main:help-contact" %}"><span>Contact information</span></a>
 			{% endif %}
+			<a class="arrow-button" href="https://pf2m.com/openverse/"><span>Info about Openverse</span></a>
 		</div>
 	</div>
 {% endblock %}

closedverse_main/templates/closedverse_main/elements/community_post.html

@@ -32,9 +32,7 @@
 		{% if post.yt_vid %}
 		<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="DiscordCDN-container video">
-      <video class="discord-player" src="{{ post.url }}" controls></video>
-      </div>
+      <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>

closedverse_main/templates/closedverse_main/elements/user-sidebar.html

@@ -48,7 +48,7 @@
 		<button type="button" data-action="{% url "main:user-fr-delete" user.username %}" data-screen-name="{{ user.nickname }}" class="friend-button unf delete button symbol">Friends</button>
 		{% endif %}
 	{% endif %}
-	{% if request.user.can_manage %}
+	{% if not has_authority and request.user.can_manage %}
 	<button class="button" data-href="{% url "main:user-tools" user.username %}">User Settings</button>
 	{% endif %}
 </div>

closedverse_main/templates/closedverse_main/invites.html

@@ -0,0 +1,35 @@
+{% extends "closedverse_main/layout.html" %}
+{% block main-body %}{% load closedverse_user %}
+{% user_sidebar request user user.profile 0 True %}
+<div id="help" class="main-column">
+	<div class="post-list-outline">
+		<h2 class="label">My invites</h2>
+			<div class="help-content">
+			<p>You can create invite keys here. Simply copy a key and send it to whoever you want to invite.</p>
+			{% if invites %}
+				<p class="label">Invites you've created:</p>
+				<table class='user-data' style="width:100%">
+				<tr>
+					<th>Date created</th>
+					<th>Code</th>
+				</tr>
+				{% for invites in invites %}
+				<tr>
+					<td>{{ invites.created }}</td>
+					<td>{{ invites.code }}</td>
+				</tr>
+				{% endfor %}
+				</table>
+				{% else %}
+				<p class="label">No invites to show.</p>
+				{% endif %}
+    <form class="setting-form" method="post" action={% url "main:create_invite" %}>
+    {% csrf_token %}
+    <div class="form-buttons">
+			<input type="submit" class="black-button apply-button" value="Create new invite">
+		</div>
+    </form>
+			</div>
+		</div>
+	</div>
+{% endblock %}

closedverse_main/templates/closedverse_main/layout.html

@@ -27,8 +27,9 @@
 	<link id="darkness" {% if request.session.lights %}disabled {% endif %}rel="stylesheet" type="text/css" href="{% static "blueness.css" %}">
 	<script src="{% static "jslibs.js" %}"></script>
     <script src="{% static "closedverse.js" %}"></script>
-		{% if request.user.ColorTheme %}<script>
-  var mainColor = "{{ request.user.ColorTheme }}";
+    {% color_theme request as theme %}
+		{% if theme %}<script>
+  var mainColor = "{{ theme }}";
   var darkColor;
   var slightlyDarkColor;
   var darkerColor;
@@ -90,7 +91,7 @@
         </script>{% endif %}
 		<style>
 			:root {
-			{% if request.user.bg_url %}--background: url({{ request.user.bg_url }});{% endif %}
+			{% if request.user.bg_url %}--background: url({{ request.user.bg_url }});{% elif not theme %}--background: url({% static 'img/Background.png' %}){% endif %}
 			}
 		</style>
   </head>
@@ -114,6 +115,7 @@
                 <menu id="global-my-menu" class="invisible none">
                   <li><a href="{% url "main:profile-settings" %}" class="symbol my-menu-profile-setting"><span>Profile settings</span></a></li>
                   <li><a href="#" class="symbol my-menu-account-setting"><span>Account preferences</span></a></li>
+                   {% if settings.invite_only %}<li><a href="{% url "main:invites" %}" class="symbol my-menu-guide"><span>Invites</span></a></li>{% endif %}
                   <li><a href="{% url "main:special-community-tag" "announcements" %}" class="symbol my-menu-openman"><span>Cedar Announcements</span></a></li>
                   <li><a href="{% url "main:help-faq" %}" class="symbol my-menu-guide"><span>Frequently Asked Questions (FAQ)</span></a></li>
 				  <li><a href="{% url "main:help-rules" %}" class="symbol my-menu-guide"><span>Cedar Rules</span></a></li>

closedverse_main/templates/closedverse_main/post-view.html

@@ -86,7 +86,7 @@
 			<div class="screenshot-container video"><iframe class="youtube-player" type="text/html" width="490" height="276" src="https://www.youtube.com/embed/{{ post.yt_vid }}?rel=0&modestbranding=1&iv_load_policy=3" frameborder="0"></iframe></div>
       {% elif post.discord_vid %}
       <div class="DiscordCDN-container video">
-      <video class="discord-player" src="{{ post.url }}" controls></video>
+      <video class="discord-player" src="{{ post.url }}" style='max-width:100%;' controls></video>
       </div>
       <a>Discord embedded video</a>
 			{% elif post.url %}

closedverse_main/templates/closedverse_main/profile-settings.html

@@ -186,7 +186,7 @@
                 <div class="icon-container">
                     <img class="icon nnid-icon mii" src="{% miionly user.mh %}">
                 </div>
-                  <input type="text" name="origin_id" minlength="6" maxlength="16" placeholder="Nintendo Network ID{% if not profile.origin_id %} (None){% endif %}" value="{% if profile.origin_id %}{{ profile.origin_id }}{% endif %}" data-action="{% url "main:origin-id-get" %}">
+                <input type="text" name="origin_id" minlength="6" maxlength="16" placeholder="Nintendo Network ID{% if not profile.origin_id %} (None){% endif %}" value="{% if profile.origin_id %}{{ profile.origin_id }}{% endif %}" data-mii-domain="{{ mii_domain }}" data-action="{{ mii_endpoint }}">
 				  <input type="hidden" name="mh" value="{{ user.mh }}">
                 <p class="error"></p>
                 <p class="note">Enter your Nintendo Network ID here. It'll appear on your profile if you set it to be visible.</p>

closedverse_main/templates/closedverse_main/signup_page.html

@@ -7,9 +7,10 @@
 			<p class="lh">Sign Up</p>
 			<p>Create a Cedar account on this instance to access this instance.</p><br>
 			<p>Please follow <a href="{% url "main:help-rules" %}">our rules</a>. If you don't, be careful with your behavior.<br><br>You <strong>must</strong> be {{ age }} years of age or older to join, no exceptions.<br>If you are suspected to be younger than {{ age }} years old, we will ban you until you're {{ age }}.</p>
+			{% if invite_only %}<h3 class="label"><label><span class="red">*</span> Invite code: <input type="text" class="auth-input" name="invite_code" maxlength="64" minlength="4" placeholder="Invite code"></label></h3>{% endif %}
 			<h3 class="label"><label><span class="red">*$</span> User ID: <input type="text" class="auth-input" name="username" maxlength="32" minlength="4" placeholder="ID"></label></h3>
 			<h3 class="label"><label>Nickname: <input type="text" class="auth-input" name="nickname" maxlength="32" placeholder="Nick/Mii name?"></label></h3>
-			<h3 class="label nnid"><label>Nintendo Network ID: <input type="text" class="auth-input" name="origin_id" maxlength="16" minlength="6" placeholder="NNID" data-action="{% url "main:origin-id-get" %}">
+			<h3 class="label nnid"><label>Nintendo Network ID: <input type="text" class="auth-input" name="origin_id" maxlength="16" minlength="6" placeholder="NNID" data-mii-domain="{{ mii_domain }}" data-action="{{ mii_endpoint }}">
 				<img class="none">
 			</label></h3>
 			<h3 class="label"><label><span class="red">%</span> E-mail address: <input type="email" class="auth-input" name="email" maxlength="254" minlength="6" placeholder="Email"></label></h3>