-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #75 from NFM-Studios/develop
- Loading branch information
Showing
29 changed files
with
352 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 2.2.12 on 2020-05-07 17:37 | ||
|
||
from django.db import migrations, models | ||
import django.utils.timezone | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('news', '0002_auto_20190713_1335'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='post', | ||
name='publish', | ||
field=models.DateTimeField(default=django.utils.timezone.now, null=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# Generated by Django 2.2.12 on 2020-05-07 17:41 | ||
|
||
from django.db import migrations, models | ||
import django.utils.timezone | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('news', '0003_auto_20200507_1737'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='post', | ||
name='publish', | ||
field=models.DateTimeField(blank=True, default=django.utils.timezone.now, null=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -156,4 +156,4 @@ | |
LOGIN_REDIRECT_URL = '/' | ||
LOGIN_URL = '/login/' | ||
|
||
SITE_VERSION = "0.8.0" | ||
SITE_VERSION = "0.8.1" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,17 @@ | ||
from django.conf import settings | ||
from django.core.exceptions import ObjectDoesNotExist | ||
|
||
from pages import models as pagesmodels | ||
|
||
try: | ||
SocialInfo = pagesmodels.SocialInfo.objects.get(pk=1) | ||
except ObjectDoesNotExist: | ||
SocialInfo = None | ||
|
||
|
||
def site_info(request): | ||
return {'SITE_NAME': settings.SITE_NAME, | ||
'SITE_SERVER': settings.SITE_SERVER, | ||
'SITE_VERSION': settings.SITE_VERSION, | ||
'SocialInfo': pagesmodels.SocialInfo.objects.get(pk=1), | ||
'SocialInfo': SocialInfo, | ||
'ESPORTS_MODE': settings.ESPORTS_MODE} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# Generated by Django 2.2.12 on 2020-05-07 18:18 | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('profiles', '0009_auto_20190620_1725'), | ||
] | ||
|
||
operations = [ | ||
migrations.DeleteModel( | ||
name='UserGear', | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Generated by Django 2.2.12 on 2020-05-07 18:19 | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('profiles', '0010_delete_usergear'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='userprofile', | ||
name='activisionid', | ||
field=models.CharField(blank=True, default='No Activision ID Linked', max_length=30), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
{% extends "staff/staffbase.html" %} | ||
{% load static %} | ||
<link rel="stylesheet" href="{% static "css/staff.css" %}"> | ||
{% block title %} | ||
Create Slide | ||
{% endblock %} | ||
{% block body %} | ||
<form enctype="multipart/form-data" method="post"> | ||
{% csrf_token %} | ||
|
||
{{ field.errors }} | ||
|
||
<label>Header</label> | ||
<div class="form-group">{{ form.header }}</div> | ||
|
||
<label>Sub header</label> | ||
<div class="form-group">{{ form.subhead }}</div> | ||
|
||
<label>Link</label> | ||
<div class="form-group">{{ form.link }}</div> | ||
|
||
<label>Image</label> | ||
<div class="form-group">{{ form.image }}</div> | ||
|
||
|
||
<button type="submit" class="btn btn-primary">Submit</button> | ||
</form> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{% extends "staff/staffbase.html" %} | ||
{% load static %} | ||
<link rel="stylesheet" href="{% static "css/staff.css" %}"> | ||
{% block title %} | ||
Edit Slide | ||
{% endblock %} | ||
{% block body %} | ||
<form enctype="multipart/form-data" method="post"> | ||
{% csrf_token %} | ||
|
||
{{ field.errors }} | ||
|
||
<label>Header</label> | ||
<div class="form-group">{{ form.header }}</div> | ||
|
||
<label>Sub header</label> | ||
<div class="form-group">{{ form.subhead }}</div> | ||
|
||
<label>Link</label> | ||
<div class="form-group">{{ form.link }}</div> | ||
|
||
<label>Image</label> | ||
<div class="form-group">{{ form.image }}</div> | ||
|
||
|
||
<button type="submit" class="btn btn-primary">Submit</button> | ||
<a href="{% url 'staff:slide_delete' pk=pk %}" onclick="return confirm('Are you sure you want to delete this Slide?')" class="btn btn-danger">Delete</a> | ||
|
||
</form> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
{% extends 'staff/staffbase.html' %} | ||
{% load static %} | ||
<link rel="stylesheet" href="{% static "css/staff.css" %}"> | ||
|
||
{% block title %} | ||
Slides | ||
{% endblock %} | ||
{% block body %} | ||
<div style="overflow-x:auto;"> | ||
<h2><a href="{% url 'staff:slide_create' %}"><i class="fa fa-plus"></i>Create new slide </a></h2> | ||
|
||
<table class="table table-hover"> | ||
<tr id="header"> | ||
<thead> | ||
<th>Header</th> | ||
<th>Subhead</th> | ||
<th>Link</th> | ||
</thead> | ||
</tr> | ||
{% for slide in slides %} | ||
<tbody> | ||
<tr scope=""> | ||
<td> | ||
<a href="{% url 'staff:slide_detail' pk=slide.pk %}">{{ slide.header }}</a> | ||
</td> | ||
<td> | ||
{{ slide.subhead }} | ||
</td> | ||
<td> | ||
{{ slide.link }} | ||
</td> | ||
</tr> | ||
</tbody> | ||
{% endfor %} | ||
</table> | ||
</div> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{% extends "base.html" %} | ||
{% load static %} | ||
|
||
{% block head %} | ||
<title>FAQ #{{ faq.pk }} - {{ SITE_NAME }}</title> | ||
{% endblock %} | ||
|
||
{% block body %} | ||
<h1>{{ faq.category.name }}</h1> | ||
<h2>{{ faq.question }}</h2> | ||
<p>{{ faq.anaswer }}</p> | ||
<p>Creator: {{ faq.creator }}</p> | ||
<p>Created: {{ faq.created }}, Updated: {{ faq.updated }}</p> | ||
|
||
{% endblock %} | ||
|
Oops, something went wrong.