symposion_app Changeset - 0aa48837cffb

Changeset - 0aa48837cffb

Parent rev.

Child rev.

[Not reviewed]

1 4 0

Sachi King - 7 years ago 2017-04-16 06:30:45
nakato@nakato.io

Template simplication: remove site_base_wagtail.html

5 files changed with 16 insertions and 47 deletions:

pinaxcon/templates/403_csrf.html

pinaxcon/templates/404.html

pinaxcon/templates/lca2017/content_page.html

pinaxcon/templates/site_base.html

pinaxcon/templates/site_base_wagtail.html

0 comments (0 inline, 0 general)

pinaxcon/templates/403_csrf.html

➞

Show inline comments

-{% extends "site_base_wagtail.html" %}
+{% extends "site_base.html" %}
 {% load staticfiles %}
 {% load i18n %}

pinaxcon/templates/404.html

➞

Show inline comments

-{% extends "site_base_wagtail.html" %}
+{% extends "site_base.html" %}
 {% load staticfiles %}
 {% load i18n %}

pinaxcon/templates/lca2017/content_page.html

➞

Show inline comments

-{% extends "site_base_wagtail.html" %}
+{% extends "site_base.html" %}
 {% load staticfiles %}
 {% load pyconau2017_tags %}

pinaxcon/templates/site_base.html

➞

Show inline comments

@@ ... / @@ -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 %}

pinaxcon/templates/site_base_wagtail.html

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)