symposion_app Changeset - 08c8f23344a3

Changeset - 08c8f23344a3

Parent rev.

Child rev.

[Not reviewed]

Merge

0 13 1

Christopher Neugebauer - 8 years ago 2016-06-27 01:28:06
_@chrisjrn.com

Merge pull request #23 from faulteh/master

site_base.html refactor

14 files changed with 68 insertions and 18 deletions:

pinaxcon/templates/cms_pages/content_page.html

pinaxcon/templates/cms_pages/home_page.html

pinaxcon/templates/cms_pages/news_index_page.html

pinaxcon/templates/cms_pages/news_page.html

pinaxcon/templates/dashboard.html

pinaxcon/templates/site_base.html

pinaxcon/templates/site_base_onecolumn.html

pinaxcon/templates/site_base_wagtail.html

pinaxcon/templates/symposion/proposals/base.html

pinaxcon/templates/symposion/proposals/proposal_detail.html

pinaxcon/templates/symposion/reviews/base.html

pinaxcon/templates/symposion/reviews/result_notification.html

pinaxcon/templates/symposion/reviews/review_detail.html

pinaxcon/templates/symposion/reviews/review_review.html

0 comments (0 inline, 0 general)

pinaxcon/templates/cms_pages/content_page.html

➞

Show inline comments

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

pinaxcon/templates/cms_pages/home_page.html

➞

Show inline comments

		{% extends "~~site_base~~.html" %}
		{% extends "site_base_wagtail.html" %}

pinaxcon/templates/cms_pages/news_index_page.html

➞

Show inline comments

		{% extends "~~site_base~~.html" %}
		{% extends "site_base_wagtail.html" %}

pinaxcon/templates/cms_pages/news_page.html

➞

Show inline comments

		{% extends "~~site_base~~.html" %}
		{% extends "site_base_wagtail.html" %}

pinaxcon/templates/dashboard.html

➞

Show inline comments

 {% extends "site_base.html" %}
+{% load staticfiles %}
 {% load i18n %}
@@ ... / @@ -10,2 +10,7 @@ @@
 {% block extra_style %}
 <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
 <!-- Latest compiled and minified CSS -->
 {% endblock %}
 {% block body_class %}auth{% endblock %}

pinaxcon/templates/site_base.html

➞

Show inline comments

@@ ... / @@ -22,2 +22,5 @@ @@
     <meta name="theme-color" content="#0c486c">
     {% block extra_style %}
     <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
     {% endblock %}
 {% endblock %}
@@ ... / @@ -57,3 +60,10 @@ @@
 {% block body_base %}
     <div style="height: 100px;" />
     <main role="main">
 <div class="l-content-page">
         <section id="content_body">
         <div class="container">
             {% include "_messages.html" %}
             <div class="row">
                 <div class="col-md-9">
     {% block body %}
@@ ... / @@ -63,10 +73,6 @@ @@
                 </div>
                 <div class="col-md-3">
                     {% block sidebar %}
                         {% include "_default_sidebar.html" %}
                     {% endblock %}
 {% block footer_base %}
       <div class="panel panel__compact panel__bg">
         <div style="background-image: url('');" class="panel--bg"></div>
         <div class="panel--content">
           <div class="panel--2-3">
             <!-- TODO: put something here. -->
                 </div>
@@ ... / @@ -74,2 +80,7 @@ @@
         </div>
     </section>
 </div>
 {% endblock %}
 {% block footer_base %}
       <!-- https://gist.github.com/geedmo/5682742-->
@@ ... / @@ -85,3 +96,2 @@ @@
           <img src="{% static 'lca2017/images/IBM.jpg' %}" role="presentation"></div>
         <p class="lede">© 2016 linux.conf.au 2017 and Linux Australia. Linux is a registered trademark of Linus Torvalds. Site design by <a href="http://takeflight.com.au" >Takeflight</a>. <a href="/colophon">Colophon</a>.</p>
         {% endblock %}

pinaxcon/templates/site_base_onecolumn.html

➞

Show inline comments

 {% extends "site_base.html" %}
 {% block body_base %}
     <div style="height: 100px;" />
     <main role="main">
 <div class="l-content-page">
         <section id="content_body">
@@ ... / @@ -8,2 +9,4 @@ @@
     {% block body %}
       {% block content %}
       {% endblock %}
     {% endblock %}
@@ ... / @@ -11,2 +14,3 @@ @@
 </section>
 </div>
 {% endblock %}

pinaxcon/templates/site_base_wagtail.html

➞

Show inline comments

 new file 100644
 {% extends "site_base.html" %}
 {% block extra_style %}{% endblock %}
 {% block body_base %}
     <div style="height: 100px;" />
     <main role="main">
     {% include "_messages.html" %}
     {% block body %}
       {% block content %}
       {% endblock %}
     {% endblock %}
 {% endblock %}

pinaxcon/templates/symposion/proposals/base.html

➞

Show inline comments

 {% extends "site_base.html" %}
 {% load staticfiles %}
 {% block body_outer %}
     {% block body %}{% endblock %}
 {% block extra_script %}
 <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
 {% endblock %}

pinaxcon/templates/symposion/proposals/proposal_detail.html

➞

Show inline comments

@@ ... / @@ -102,2 +102,3 @@ @@
 {% block extra_script %}
 {{ block.super }}
     <script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>

pinaxcon/templates/symposion/reviews/base.html

➞

Show inline comments

 {% extends "site_base.html" %}
 {% load staticfiles %}
@@ ... / @@ -6,2 +7,3 @@ @@
 {% block extra_style %}
 {{ block.super }}
     <style type="text/css">
@@ ... / @@ -53,2 +55,6 @@ @@
 {% block body_outer %}
 <div class="l-content-page">
 <div class="l-content-page--richtext">
 <div class="rich-text">
     <div class="row">
@@ ... / @@ -90,2 +96,3 @@ @@
     </div>
 </div></div></div>
 {% endblock %}
@@ ... / @@ -93,2 +100,3 @@ @@
 {% block extra_script %}
     <script src="{% static 'js/site-92ae8d0d6c.js' %}" type="text/javascript"></script>
     <script src="{{ STATIC_URL }}datatables/js/jquery.dataTables.min.js" type="text/javascript"></script>

pinaxcon/templates/symposion/reviews/result_notification.html

➞

Show inline comments

@@ ... / @@ -8,2 +8,3 @@ @@
 {% block extra_style %}
 {{ block.super }}
     <style type="text/css">
@@ ... / @@ -86,2 +87,3 @@ @@
 {% block extra_script %}
 {{ block.super }}
     <script type="text/javascript">

pinaxcon/templates/symposion/reviews/review_detail.html

➞

Show inline comments

@@ ... / @@ -170,2 +170,3 @@ @@
 {% block extra_script %}
 {{ block.super }}
     <script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>

pinaxcon/templates/symposion/reviews/review_review.html

➞

Show inline comments

 {% extends "site_base.html" %}
 {% load staticfiles %}
 {% block extra_style %}
 <link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
 {% endblock %}
@@ ... / @@ -7,2 +11,5 @@ @@
 {% block body %}
 <div class="l-content-page">
 <div class="l-content-page--richtext">
 <div class="rich-text">
     <h1>Proposal Review</h1>
@@ ... / @@ -75,3 +82,3 @@ @@
     </form>
+</div></div></div>
 {% endblock %}

0 comments (0 inline, 0 general)