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

Resolve merge conflict

Browse source
This commit is contained in:
TehomCD 2020-03-08 00:10:18 -05:00
commit 1153433a2c
55 changed files with 590 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/web/urls.py
View file

@ -6,9 +6,9 @@
# http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3
#
from django.urls import path
from django.conf.urls import url, include
from django.conf.urls import url
from django.conf import settings
from django.urls import path, include
from django.views.generic import RedirectView
# Setup the root url tree from /

2
evennia/web/webclient/templates/webclient/base.html
View file

@ -6,7 +6,7 @@ with evennia set up automatically and get the Evennia JS lib and
JQuery available.
-->
{% load staticfiles %}
{% load static %}
<html dir="ltr" lang="en">
<head>
<title> {{game_name}} </title>

5
evennia/web/webclient/urls.py
View file

@ -2,8 +2,9 @@
This structures the (simple) structure of the
webpage 'application'.
"""
from django.conf.urls import *
from django.urls import path
from evennia.web.webclient import views as webclient_views
app_name = "webclient"
urlpatterns = [url(r"^$", webclient_views.webclient, name="index")]
urlpatterns = [path("", webclient_views.webclient, name="index")]

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

@ -3,7 +3,7 @@ Allow to customize the menu that appears at the top of every Evennia
webpage. Copy this file to your game dir's web/template_overrides/website
folder and edit it to add/remove links to the menu.
{% endcomment %}
{% load staticfiles %}
{% load static %}
<nav class="navbar navbar-dark font-weight-bold navbar-expand-md">
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#menu-content" aria-controls="menu-content" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>

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

@ -1,4 +1,4 @@
{% load staticfiles sekizai_tags %}
{% load static sekizai_tags %}
<!DOCTYPE html>
<html lang="en">
<head>