Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Template simplication: remove site_base_wagtail.html

Browse source
This commit is contained in:
Sachi King 2017-04-10 21:31:04 +10:00
parent 2642c03115
commit 0aa48837cf
5 changed files with 16 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/templates/403_csrf.html
View file

@ -1,4 +1,4 @@
{% extends "site_base_wagtail.html" %}
{% extends "site_base.html" %}
{% load staticfiles %}
{% load i18n %}

2
pinaxcon/templates/404.html
View file

@ -1,4 +1,4 @@
{% extends "site_base_wagtail.html" %}
{% extends "site_base.html" %}
{% load staticfiles %}
{% load i18n %}

2
pinaxcon/templates/lca2017/content_page.html
View file

@ -1,4 +1,4 @@
{% extends "site_base_wagtail.html" %}
{% extends "site_base.html" %}
{% load staticfiles %}
{% load pyconau2017_tags %}

23
pinaxcon/templates/site_base.html
View file

@ -3,6 +3,7 @@
{% load metron_tags %}
{% load i18n %}
{% load sitetree %}
{% load staticfiles %}
<!DOCTYPE html>
<html lang="en" class="no-js" manifest="{% static 'manifest.appcache' %}">
@ -15,11 +16,12 @@
{% block styles %}
<link href="{% static 'pyconau2017/css/bootstrap.css' %}" rel="stylesheet">
<link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
<!--<link rel="stylesheet" href="{% static 'pyconau2017/css/app.css' %}">
<link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
<link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
<link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">-->
<link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}">
{% block extra_style %}{% endblock %}
{% endblock %}
{% block extra_head_base %}
@ -28,13 +30,8 @@
</head>
<body class="{% block body_class %}{% endblock %}">
<div class="container">
{% block topbar_base %}
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
{% block nav %}
{% sitetree_menu from "main" include "trunk" template "sitetree_header.html" %}
{% endblock %}
{% endblock %}
<!-- site_base block body_base -->
{% block body_base %}
@ -69,8 +66,14 @@
{% endblock %}
{% block scripts %}
{% block extra_script %}
{% endblock %}
<script src="{% static 'pyconau2017/js/app.js' %}" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="{% static 'pyconau2017/js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'pyconau2017/js/load_editors.js' %}" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
<script src="{{ STATIC_URL }}js/jquery.formset.js"></script>
{% block scripts_extra %}{% endblock %}
{% endblock %}
{% block extra_body_base %}

34
pinaxcon/templates/site_base_wagtail.html
View file

@ -1,34 +0,0 @@
<!-- site_base_wagtail.html -->
{% extends "site_base.html" %}
{% load staticfiles %}
{% block extra_style %}{% endblock %}
{% comment %}
{% block body_base %}
{% include "_messages.html" %}
<!-- site_base_wagtail.html block body -->
{% block body %}
<!-- begin content -->
{% block content %}
{% endblock %}
<!-- end content -->
{% endblock %}
<!-- site_base_wagtail.html enblock body -->
{% endblock %}
{% endcomment %}
{% block scripts %}
<script src="{% static 'pyconau2017/js/app.js' %}" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
<script src="{% static 'pyconau2017/js/bootstrap.js' %}" type="text/javascript"></script>
<script src="{% static 'pyconau2017/js/load_editors.js' %}" type="text/javascript"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
<script src="{{ STATIC_URL }}js/jquery.formset.js"></script>
{% block scripts_extra %}
{% endblock %}
<!-- end site_base_wagtail.html -->
{% endblock %}