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

Merge pull request #23 from faulteh/master

Browse source 
site_base.html refactor
This commit is contained in:
Christopher Neugebauer 2016-06-27 11:28:06 +10:00 • committed by GitHub
commit 08c8f23344
14 changed files with 76 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

2
pinaxcon/templates/cms_pages/home_page.html
View file

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

2
pinaxcon/templates/cms_pages/news_index_page.html
View file

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

2
pinaxcon/templates/cms_pages/news_page.html
View file

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

7
pinaxcon/templates/dashboard.html
View file

@ -1,5 +1,5 @@
{% extends "site_base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load proposal_tags %}
{% load review_tags %}
@ -8,6 +8,11 @@
{% block head_title %}Dashboard{% endblock %}
{% block extra_style %}
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
<!-- Latest compiled and minified CSS -->
{% endblock %}
{% block body_class %}auth{% endblock %}
{% block body %}

30
pinaxcon/templates/site_base.html
View file

@ -9,7 +9,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="description" content="">
{% block viewport %}
{% block viewport %}
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
{% endblock %}
<title>{% block head_title_base %}{% if SITE_NAME %}{{ SITE_NAME }} | {% endif %}{% block head_title %}{% endblock %}{% endblock %}</title>
@ -20,6 +20,9 @@
<link href="https://fonts.googleapis.com/css?family=Titillium+Web:700,900|Roboto:400italic,400,700,700italic" rel="stylesheet" type="text/css">
<!--Meta tags-->
<meta name="theme-color" content="#0c486c">
{% block extra_style %}
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
{% endblock %}
{% endblock %}
<!--Twitter-->
<meta name="twitter:card" content="summary">
@ -55,23 +58,31 @@
{% endblock %}
{% 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 %}
{% block content %}
{% endblock %}
{% endblock %}
</div>
<div class="col-md-3">
{% block sidebar %}
{% include "_default_sidebar.html" %}
{% endblock %}
</div>
</div>
</div>
</section>
</div>
{% 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>
</div>
</div>
<!-- https://gist.github.com/geedmo/5682742-->
<footer class="l-footer">
{% block footer %}
@ -83,7 +94,6 @@
<div class="l-footer--logos">
<img src="{% static 'lca2017/images/HPE.jpg' %}" role="presentation">
<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 %}
</footer>
{% endblock %}

20
pinaxcon/templates/site_base_onecolumn.html
View file

@ -1,12 +1,16 @@
{% extends "site_base.html" %}
{% block body_base %}
<section id="content_body">
<div style="height: 100px;" />
<main role="main">
<div class="l-content-page">
<section id="content_body">
<div class="container">
{% include "_messages.html" %}
{% block body %}
{% endblock %}
</div>
</section>
{% include "_messages.html" %}
{% block body %}
{% block content %}
{% endblock %}
{% endblock %}
</div>
</section>
</div>
{% endblock %}

11
pinaxcon/templates/site_base_wagtail.html Normal file
View file

@ -0,0 +1,11 @@
{% 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 %}

5
pinaxcon/templates/symposion/proposals/base.html
View file

@ -1,5 +1,6 @@
{% 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 %}

1
pinaxcon/templates/symposion/proposals/proposal_detail.html
View file

@ -100,6 +100,7 @@
{% endblock %}
{% block extra_script %}
{{ block.super }}
<script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>
<script type="text/javascript">
$(function() {

8
pinaxcon/templates/symposion/reviews/base.html
View file

@ -1,9 +1,11 @@
{% extends "site_base.html" %}
{% load staticfiles %}
{% load i18n %}
{% load sitetree %}
{% block extra_style %}
{{ block.super }}
<style type="text/css">
div.dataTables_length label {
float: left;
@ -51,6 +53,10 @@
{% block body_class %}reviews{% endblock %}
{% block body_outer %}
<div class="l-content-page">
<div class="l-content-page--richtext">
<div class="rich-text">
<div class="row">
<div class="col-md-2">
{% block sidebar %}
@ -88,9 +94,11 @@
{% endblock %}
</div>
</div>
</div></div></div>
{% endblock %}
{% 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>
<script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>

2
pinaxcon/templates/symposion/reviews/result_notification.html
View file

@ -6,6 +6,7 @@
{% block body_class %}{{ block.super }} review-results{% endblock %}
{% block extra_style %}
{{ block.super }}
<style type="text/css">
.table-striped tbody tr.selected td {
background-color: #F7F4E6;
@ -84,6 +85,7 @@
{% endblock %}
{% block extra_script %}
{{ block.super }}
<script type="text/javascript">
(function($) {
$.fn.actions = function(opts) {

1
pinaxcon/templates/symposion/reviews/review_detail.html
View file

@ -168,6 +168,7 @@
{% endblock %}
{% block extra_script %}
{{ block.super }}
<script src="{{ STATIC_URL }}symposion/js/jquery.history.js"></script>
<script type="text/javascript">
$(function() {

9
pinaxcon/templates/symposion/reviews/review_review.html
View file

@ -1,10 +1,17 @@
{% extends "site_base.html" %}
{% load staticfiles %}
{% block extra_style %}
<link rel="stylesheet" href="{% static 'css/site-0a247b924d.css' %}">
{% endblock %}
{% load bootstrap %}
{% block body_class %}review{% endblock %}
{% block body %}
<div class="l-content-page">
<div class="l-content-page--richtext">
<div class="rich-text">
<h1>Proposal Review</h1>
<div class="proposal">
@ -73,5 +80,5 @@
</div>
</fieldset>
</form>
</div></div></div>
{% endblock %}