Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflicts

Browse source
This commit is contained in:
Griatch 2019-03-04 22:32:51 +01:00
commit 90b42ca6fb
47 changed files with 1682 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/web/website/templates/website/404.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}404 - Not Found{% endblock %}
@ -10,7 +10,7 @@
<div class="row">
<div class="col">
<div class="card">
<div class="card-block">
<div class="card-body">
<h1 class="card-title">Error 404</h1>
<h4 class="card-subtitle">Page not found</h2>
<hr />

4
evennia/web/website/templates/website/500.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}500 - Internal Server Error{% endblock %}
@ -10,7 +10,7 @@
<div class="row">
<div class="col">
<div class="card">
<div class="card-block">
<div class="card-body">
<h1 class="card-title">Error 500</h1>
<h4 class="card-subtitle">Internal Server Error</h2>
<hr />

4
evennia/web/website/templates/website/evennia_admin.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}Admin{% endblock %}
@ -6,7 +6,7 @@
<div class="row">
<div class="col">
<div class="card">
<div class="card-block p-4">
<div class="card-body">
<h1 class="card-title">Admin</h1>
<p class="card-text">
Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.

4
evennia/web/website/templates/website/flatpages/default.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block header_ext %}
{% endblock %}
@ -7,7 +7,7 @@
<div class="row">
<div class="col">
<div class="card">
<div class="card-block">
<div class="card-body">
<h1 class="card-title">{{flatpage.title}}</h1>
{{flatpage.content}}
</div>

2
evennia/web/website/templates/website/index.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}Home{% endblock %}

2
evennia/web/website/templates/website/registration/logged_out.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block header_ext %}
<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">

2
evennia/web/website/templates/website/registration/login.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}
Login

4
evennia/web/website/templates/website/tbi.html
View file

@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "website/base.html" %}
{% block titleblock %}To Be Implemented{% endblock %}
@ -12,7 +12,7 @@
<div class="col">
<div class="card text-center">
<h1 class="card-header">To Be Implemented...</h1>
<div class="card-block">
<div class="card-body">
This feature has yet to be implemented, but rest assured that it will be!
<br />
<br />